optimize skip

taowen · taowen · commit 4b8c71b6bd96 · 2017-01-18T23:32:51.000+08:00
diff --git a/src/main/java/com/jsoniter/IterImpl.java b/src/main/java/com/jsoniter/IterImpl.java
@@ -198,13 +198,13 @@ public static Any readAny(JsonIterator iter) throws IOException {
                     return Any.lazyLong(iter.buf, start, iter.head);
                 }
             case 't':
-                skipUntilBreak(iter);
+                skipFixedBytes(iter, 3);
                 return Any.wrap(true);
             case 'f':
-                skipUntilBreak(iter);
+                skipFixedBytes(iter, 4);
                 return Any.wrap(false);
             case 'n':
-                skipUntilBreak(iter);
+                skipFixedBytes(iter, 3);
                 return Any.wrap((Object) null);
             case '[':
                 skipArray(iter);
diff --git a/src/main/java/com/jsoniter/IterImplForStreaming.java b/src/main/java/com/jsoniter/IterImplForStreaming.java
@@ -336,15 +336,15 @@ public static Any readAny(JsonIterator iter) throws IOException {
                     return Any.lazyLong(copied, 0, copied.length);
                 }
             case 't':
-                skipUntilBreak(iter);
+                skipFixedBytes(iter, 3);
                 iter.skipStartedAt = -1;
                 return Any.wrap(true);
             case 'f':
-                skipUntilBreak(iter);
+                skipFixedBytes(iter, 4);
                 iter.skipStartedAt = -1;
                 return Any.wrap(false);
             case 'n':
-                skipUntilBreak(iter);
+                skipFixedBytes(iter, 3);
                 iter.skipStartedAt = -1;
                 return Any.wrap((Object) null);
             case '[':
diff --git a/src/main/java/com/jsoniter/IterImplSkip.java b/src/main/java/com/jsoniter/IterImplSkip.java
@@ -33,10 +33,14 @@ public static final void skip(JsonIterator iter) throws IOException {
             case '7':
             case '8':
             case '9':
+                IterImpl.skipUntilBreak(iter);
+                return;
             case 't':
-            case 'f':
             case 'n':
-                IterImpl.skipUntilBreak(iter);
+                IterImpl.skipFixedBytes(iter, 3); // true or null
+                return;
+            case 'f':
+                IterImpl.skipFixedBytes(iter, 4); // false
                 return;
             case '[':
                 IterImpl.skipArray(iter);
diff --git a/src/main/java/com/jsoniter/IterImplString.java b/src/main/java/com/jsoniter/IterImplString.java
@@ -69,7 +69,7 @@ public static final String readString(JsonIterator iter) throws IOException {
             return IterImpl.readStringSlowPath(iter, j);
         }
         if (c == 'n') {
-            IterImpl.skipUntilBreak(iter);
+            IterImpl.skipFixedBytes(iter, 3);
             return null;
         }
         throw iter.reportError("readString", "expect n or \"");
diff --git a/src/main/java/com/jsoniter/JsonIterator.java b/src/main/java/com/jsoniter/JsonIterator.java
@@ -213,7 +213,7 @@ public final String readObject() throws IOException {
         byte c = IterImpl.nextToken(this);
         switch (c) {
             case 'n':
-                IterImpl.skipUntilBreak(this);
+                IterImpl.skipFixedBytes(this, 3);
                 return null;
             case '{':
                 c = IterImpl.nextToken(this);
@@ -279,7 +279,7 @@ public final Object read() throws IOException {
             case NUMBER:
                 return readDouble();
             case NULL:
-                IterImpl.skipUntilBreak(this);
+                IterImpl.skipFixedBytes(this, 3);
                 return null;
             case BOOLEAN:
                 return readBoolean();
diff --git a/src/test/java/com/jsoniter/TestDemo.java b/src/test/java/com/jsoniter/TestDemo.java
@@ -142,5 +142,13 @@ public void test_any_is_fun() throws IOException {
         assertEquals(Long.class, any.get(0, "score").object().getClass());
         any = JsonIterator.deserialize("[{'score':100}, {'score':102}]".replace('\'', '"'));
         assertEquals(ValueType.INVALID, any.get(0, "score", "number").valueType());
+        any = JsonIterator.deserialize("[{'score':100}, {'score':102}]".replace('\'', '"'));
+        for (Any record : any) {
+            Any.EntryIterator entries = record.entries();
+            while (entries.next()) {
+                System.out.println(entries.key());
+                System.out.println(entries.value());
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static final String readString(JsonIterator iter) throws IOException {`
`69`	`69`	`return IterImpl.readStringSlowPath(iter, j);`
`70`	`70`	`}`
`71`	`71`	`if (c == 'n') {`
`72`		`- IterImpl.skipUntilBreak(iter);`
	`72`	`+ IterImpl.skipFixedBytes(iter, 3);`
`73`	`73`	`return null;`
`74`	`74`	`}`
`75`	`75`	`throw iter.reportError("readString", "expect n or \"");`
Original file line number	Diff line number	Diff line change
`@@ -142,5 +142,13 @@ public void test_any_is_fun() throws IOException {`
`142`	`142`	`assertEquals(Long.class, any.get(0, "score").object().getClass());`
`143`	`143`	`any = JsonIterator.deserialize("[{'score':100}, {'score':102}]".replace('\'', '"'));`
`144`	`144`	`assertEquals(ValueType.INVALID, any.get(0, "score", "number").valueType());`
	`145`	`+ any = JsonIterator.deserialize("[{'score':100}, {'score':102}]".replace('\'', '"'));`
	`146`	`+ for (Any record : any) {`
	`147`	`+ Any.EntryIterator entries = record.entries();`
	`148`	`+ while (entries.next()) {`
	`149`	`+ System.out.println(entries.key());`
	`150`	`+ System.out.println(entries.value());`
	`151`	`+ }`
	`152`	`+ }`
`145`	`153`	`}`
`146`	`154`	`}`