fix filename

gunnarmorling · Jan 31, 2024 · be4c3bc · be4c3bc
1 parent 2fe2adb
commit be4c3bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/calculate_average_ijuren.sh → calculate_average_JurenIvan.sh b/calculate_average_ijuren.sh → calculate_average_JurenIvan.sh
@@ -16,4 +16,4 @@
 #
 
 JAVA_OPTS="--enable-preview"
-java $JAVA_OPTS --class-path target/average-1.0.0-SNAPSHOT.jar dev.morling.onebrc.CalculateAverage_ijuren
+java $JAVA_OPTS --class-path target/average-1.0.0-SNAPSHOT.jar dev.morling.onebrc.CalculateAverage_JurenIvan
diff --git a/...rling/onebrc/CalculateAverage_ijuren.java → ...ng/onebrc/CalculateAverage_JurenIvan.java b/...rling/onebrc/CalculateAverage_ijuren.java → ...ng/onebrc/CalculateAverage_JurenIvan.java
@@ -31,11 +31,12 @@
 import static java.nio.channels.FileChannel.MapMode.READ_ONLY;
 import static java.nio.file.StandardOpenOption.READ;
 
-public class CalculateAverage_ijuren {
+public class CalculateAverage_JurenIvan {
 
     private static final String FILE_NAME = "./measurements.txt";
 
     public static void main(String[] args) throws IOException {
+        long start = System.currentTimeMillis();
         long[] segments = getSegments(Runtime.getRuntime().availableProcessors());
 
         var result = IntStream.range(0, segments.length - 1)
@@ -45,10 +46,13 @@ public static void main(String[] args) throws IOException {
                 .collect(Collectors.toMap(m -> new String(m.city), m -> m, Measurement::merge, TreeMap::new));
 
         System.out.println(result);
+        long end = System.currentTimeMillis();
+
+        System.out.println(end - start);
     }
 
     private static LinearProbingHashMap processSegment(long start, long end) {
-        var results = new LinearProbingHashMap(1 << 22);
+        var results = new LinearProbingHashMap(1 << 19);
 
         try (var fileChannel = (FileChannel) Files.newByteChannel(Path.of(FILE_NAME), READ)) {
             var bb = fileChannel.map(READ_ONLY, start, end - start);
@@ -132,11 +136,11 @@ public LinearProbingHashMap(int slots) {
 
         void put(int hash, byte[] key, int len, int temperature) {
             hash = Math.abs(hash);
-            int index = hash % slots;
+            int index = hash & (slots - 1);
 
             int i = index;
             while (hashTable[i] != null) {
-                if (keyIsEqual(key, hashTable[index].city, len)) {
+                if (keyIsEqual(key, hashTable[index].city, len)) { //handling hash collisions
                     hashTable[i].add(temperature);
                     return;
                 }