compare with moshi

Author: taowen

demo/pom.xml

@@ -86,6 +86,11 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.22</version>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.moshi</groupId>
+            <artifactId>moshi</artifactId>
+            <version>1.3.1</version>
+        </dependency>
 
     </dependencies>
 

demo/src/test/java/com/jsoniter/demo/ModelTest.java

@@ -7,6 +7,8 @@
 import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.spi.TypeLiteral;
+import com.squareup.moshi.JsonAdapter;
+import com.squareup.moshi.Moshi;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.*;
@@ -29,6 +31,7 @@ public class ModelTest {
     private TypeLiteral<Model> modelTypeLiteral; // this is thread-safe can reused
     private ObjectMapper jackson;
     private TypeReference<Model> modelTypeReference;
+    private JsonAdapter<Model> moshiAdapter;
 
     @Setup(Level.Trial)
     public void benchSetup(BenchmarkParams params) {
@@ -43,6 +46,8 @@ public void benchSetup(BenchmarkParams params) {
         jackson.registerModule(new AfterburnerModule());
         modelTypeReference = new TypeReference<Model>() {
         };
+        Moshi moshi = new Moshi.Builder().build();
+        moshiAdapter = moshi.adapter(Model.class);
     }
 
     public static void main(String[] args) throws IOException, RunnerException {
@@ -60,6 +65,7 @@ public void test() throws IOException {
         benchSetup(null);
         iter.reset(inputBytes);
         System.out.println(iter.read(modelTypeLiteral).name);
+        System.out.println(moshiAdapter.fromJson(input).name);
     }
 
 //    public static void main(String[] args) throws Exception {
@@ -90,14 +96,19 @@ public void jsoniter_easy_mode(Blackhole bh) throws IOException {
         bh.consume(JsonIterator.deserialize(inputBytes, Model.class));
     }
 
-    @Benchmark
+//    @Benchmark
     public void fastjson(Blackhole bh) throws IOException {
         // this is not a exactly fair comparison,
         // as string => object is not
         // bytes => object
         bh.consume(JSON.parseObject(input, Model.class));
     }
 
+    @Benchmark
+    public void moshi(Blackhole bh) throws IOException {
+        bh.consume(moshiAdapter.fromJson(input));
+    }
+
 //    @Benchmark
     public void jackson(Blackhole bh) throws IOException {
         bh.consume(jackson.readValue(inputBytes, modelTypeReference));

src/main/java/com/jsoniter/IterImpl.java

@@ -181,22 +181,6 @@ public static Any readAny(JsonIterator iter) throws IOException {
             case '"':
                 skipString(iter);
                 return Any.lazyString(iter.buf, start, iter.head);
-            case '-':
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-                if (skipNumber(iter)) {
-                    return Any.lazyDouble(iter.buf, start, iter.head);
-                } else {
-                    return Any.lazyLong(iter.buf, start, iter.head);
-                }
             case 't':
                 skipFixedBytes(iter, 3);
                 return Any.wrap(true);
@@ -213,7 +197,11 @@ public static Any readAny(JsonIterator iter) throws IOException {
                 skipObject(iter);
                 return Any.lazyObject(iter.buf, start, iter.head);
             default:
-                throw iter.reportError("IterImplSkip", "do not know how to skip: " + c);
+                if (skipNumber(iter)) {
+                    return Any.lazyDouble(iter.buf, start, iter.head);
+                } else {
+                    return Any.lazyLong(iter.buf, start, iter.head);
+                }
         }
     }
 

src/main/java/com/jsoniter/IterImplForStreaming.java

@@ -320,24 +320,6 @@ public static Any readAny(JsonIterator iter) throws IOException {
                 skipString(iter);
                 byte[] copied = copySkippedBytes(iter);
                 return Any.lazyString(copied, 0, copied.length);
-            case '-':
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-                if (skipNumber(iter)) {
-                    copied = copySkippedBytes(iter);
-                    return Any.lazyDouble(copied, 0, copied.length);
-                } else {
-                    copied = copySkippedBytes(iter);
-                    return Any.lazyLong(copied, 0, copied.length);
-                }
             case 't':
                 skipFixedBytes(iter, 3);
                 iter.skipStartedAt = -1;
@@ -359,7 +341,13 @@ public static Any readAny(JsonIterator iter) throws IOException {
                 copied = copySkippedBytes(iter);
                 return Any.lazyObject(copied, 0, copied.length);
             default:
-                throw iter.reportError("IterImplSkip", "do not know how to skip: " + c);
+                if (skipNumber(iter)) {
+                    copied = copySkippedBytes(iter);
+                    return Any.lazyDouble(copied, 0, copied.length);
+                } else {
+                    copied = copySkippedBytes(iter);
+                    return Any.lazyLong(copied, 0, copied.length);
+                }
         }
     }
 

src/main/java/com/jsoniter/any/ObjectLazyAny.java

@@ -163,6 +163,8 @@ public EntryIterator entries() {
         return new LazyIterator();
     }
 
+
+    // TODO: lastParsedPos can not share with underlying Any, as it might be changed during iteration
     private class LazyIterator implements EntryIterator {
 
         private Iterator<Map.Entry<Object, Any>> mapIter;