fix bug

gunnarmorling · Jan 30, 2024 · dd6460b · dd6460b
1 parent 428faeb
commit dd6460b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/dev/morling/onebrc/CalculateAverage_merykitty.java b/src/main/java/dev/morling/onebrc/CalculateAverage_merykitty.java
@@ -227,11 +227,11 @@ private static long iterate(PoorManMap aggrMap, MemorySegment data, long offset)
 
         // Find the delimiter ';'
         long semicolons = line.compare(VectorOperators.EQ, ';').toLong();
-        int keySize = Long.numberOfTrailingZeros(semicolons);
 
         // If we cannot find the delimiter in the vector, that means the key is
         // longer than the vector, fall back to scalar processing
-        if (keySize == BYTE_SPECIES.vectorByteSize()) {
+        if (semicolons == 0) {
+            int keySize = BYTE_SPECIES.length();
             while (data.get(ValueLayout.JAVA_BYTE, offset + keySize) != ';') {
                 keySize++;
             }
@@ -240,6 +240,7 @@ private static long iterate(PoorManMap aggrMap, MemorySegment data, long offset)
         }
 
         // We inline the searching of the value in the hash map
+        int keySize = Long.numberOfTrailingZeros(semicolons);
         int x;
         int y;
         if (keySize >= Integer.BYTES) {

diff --git a/src/main/java/dev/morling/onebrc/CalculateAverage_merykittyunsafe.java b/src/main/java/dev/morling/onebrc/CalculateAverage_merykittyunsafe.java
@@ -356,18 +356,18 @@ private static PoorManMap processFile(MemorySegment data, long offset, long limi
             long end0 = base + limit0;
             long end1 = base + limit1;
             while (true) {
-                boolean finishes = false;
+                boolean finish = false;
                 if (begin0 < end0) {
                     begin0 = iterate(aggrMap, begin0);
                 }
                 else {
-                    finishes = true;
+                    finish = true;
                 }
                 if (begin1 < end1 - mainLoopMinWidth) {
                     begin1 = iterate(aggrMap, begin1);
                 }
                 else {
-                    if (finishes) {
+                    if (finish) {
                         break;
                     }
                 }