fix

Author: jimeng

src/jmh/java/org/simdjson/ParseAndSelectFixPathBenchMark.java

@@ -1,12 +1,9 @@
 package org.simdjson;
 
 import java.io.IOException;
-import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.checkerframework.checker.units.qual.A;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
@@ -15,8 +12,6 @@
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -30,7 +25,7 @@ public class ParseAndSelectFixPathBenchMark {
     private byte[] buffer;
     private final SimdJsonParser parser = new SimdJsonParser();
     private final ObjectMapper objectMapper = new ObjectMapper();
-    private final SimdJsonParser2 parser2 = new SimdJsonParser2(
+    private final SimdJsonParserWithFixPath parser2 = new SimdJsonParserWithFixPath(
             "statuses.0.user.default_profile", "statuses.0.user.screen_name",
             "statuses.1.user.default_profile", "statuses.1.user.screen_name",
             "statuses.2.user.default_profile", "statuses.2.user.screen_name",

src/main/java/org/simdjson/SimdJsonParser2.java renamed to src/main/java/org/simdjson/SimdJsonParserWithFixPath.java

@@ -6,7 +6,7 @@
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
-public class SimdJsonParser2 {
+public class SimdJsonParserWithFixPath {
 
     @Data
     @RequiredArgsConstructor
@@ -33,9 +33,8 @@ static class JsonNode {
     // every time json string is processed, currentVersion will be incremented by 1
     private long currentVersion = 0;
     // pruning, when alreadyProcessedCols == NUM
-    private long parseCols = 0;
 
-    public SimdJsonParser2(String... args) {
+    public SimdJsonParserWithFixPath(String... args) {
         parser = new SimdJsonParser();
         expectParseCols = args.length;
         row = new JsonNode[expectParseCols];
@@ -66,7 +65,6 @@ public String[] parse(byte[] buffer, int len) {
         if (buffer == null || buffer.length == 0) {
             return emptyResult;
         }
-        this.parseCols = 0;
         this.currentVersion++;
         this.ptr = root;
         this.buffer = buffer;
@@ -100,9 +98,6 @@ private String parseField() {
     }
 
     private void parseElement(String expectFieldName) {
-        if (parseCols >= expectParseCols) {
-            return;
-        }
         // if expectFieldName is null, parent is map, else is list
         if (expectFieldName == null) {
             expectFieldName = parseField();
@@ -123,7 +118,6 @@ private void parseElement(String expectFieldName) {
             default -> {
                 ptr.setValue(skip(true));
                 ptr.setVersion(currentVersion);
-                ++parseCols;
             }
         }
         ptr = ptr.getParent();
@@ -133,12 +127,11 @@ private void parseMap() {
         if (ptr.getChildren() == null) {
             ptr.setValue(skip(true));
             ptr.setVersion(currentVersion);
-            ++parseCols;
             return;
         }
         ptr.setStart(bitIndexes.peek());
         bitIndexes.advance();
-        while (bitIndexes.hasNext() && buffer[bitIndexes.peek()] != '}' && parseCols <= expectParseCols) {
+        while (bitIndexes.hasNext() && buffer[bitIndexes.peek()] != '}') {
             parseElement(null);
             if (buffer[bitIndexes.peek()] == ',') {
                 bitIndexes.advance();
@@ -148,7 +141,6 @@ private void parseMap() {
         if (ptr.isLeaf()) {
             ptr.setValue(new String(buffer, ptr.getStart(), ptr.getEnd() - ptr.getStart() + 1));
             ptr.setVersion(currentVersion);
-            ++parseCols;
         }
         bitIndexes.advance();
     }
@@ -157,13 +149,12 @@ private void parseList() {
         if (ptr.getChildren() == null) {
             ptr.setValue(skip(true));
             ptr.setVersion(currentVersion);
-            ++parseCols;
             return;
         }
         ptr.setStart(bitIndexes.peek());
         bitIndexes.advance();
         int i = 0;
-        while (bitIndexes.hasNext() && buffer[bitIndexes.peek()] != ']' && parseCols <= expectParseCols) {
+        while (bitIndexes.hasNext() && buffer[bitIndexes.peek()] != ']') {
             parseElement("" + i);
             if (buffer[bitIndexes.peek()] == ',') {
                 bitIndexes.advance();
@@ -174,7 +165,6 @@ private void parseList() {
         if (ptr.isLeaf()) {
             ptr.setValue(new String(buffer, ptr.getStart(), ptr.getEnd() - ptr.getStart() + 1));
             ptr.setVersion(currentVersion);
-            ++parseCols;
         }
         bitIndexes.advance();
     }

src/test/java/org/simdjson/JsonMultiValueParsingTest.java

@@ -9,7 +9,7 @@ public class JsonMultiValueParsingTest {
     @Test
     public void testParseMultiValue() {
         byte[] json = toUtf8("{\"field1\":{\"field2\":\"value2\",\"field3\":3},\"field4\":[\"value4\",\"value5\"],\"field5\":null}");
-        SimdJsonParser2 parser = new SimdJsonParser2("field1.field2", "field1.field3", "field4", "field4.0", "field5");
+        SimdJsonParserWithFixPath parser = new SimdJsonParserWithFixPath("field1.field2", "field1.field3", "field4", "field4.0", "field5");
         String[] result = parser.parse(json, json.length);
         assertThat(result[0]).isEqualTo("value2");
         assertThat(result[1]).isEqualTo("3");
@@ -21,7 +21,7 @@ public void testParseMultiValue() {
     @Test
     public void testNonAsciiCharacters() {
         byte[] json = toUtf8("{\"ąćśńźż\": 1, \"\\u20A9\\u0E3F\": 2, \"αβγ\": 3, \"😀abc😀\": 4}");
-        SimdJsonParser2 parser = new SimdJsonParser2("ąćśńźż", "\\u20A9\\u0E3F", "αβγ", "😀abc😀");
+        SimdJsonParserWithFixPath parser = new SimdJsonParserWithFixPath("ąćśńźż", "\\u20A9\\u0E3F", "αβγ", "😀abc😀");
         // when
         String[] result = parser.parse(json, json.length);
         // then