commit c8cf6ad329d7e109c58d2d6a1b759fab3de31205
author cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Wed Jan 14 23:52:52 2009 +0000
committer cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Wed Jan 14 23:52:52 2009 +0000
tree 77dcff10333711d0c22e6246c3d6ba28c3c225ae
parent 2cb33d4c0c5ba92eb6e37a22e5a126e67e128e0c

Implemented [JACKSON-24], some testing improvements.

src/perf/TestCopyPerf.java

diff --git a/src/perf/TestCopyPerf.java b/src/perf/TestCopyPerf.java
index 73e5c84..d81cace 100644
--- a/src/perf/TestCopyPerf.java
+++ b/src/perf/TestCopyPerf.java
@@ -1,7 +1,7 @@
 import java.io.*;
 
 import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.JsonTypeMapper;
+import org.codehaus.jackson.map.TreeMapper;
 import org.codehaus.jackson.map.JsonNode;
 
 public final class TestCopyPerf
@@ -17,9 +17,9 @@
     {
         mJsonFactory = new JsonFactory();
         FileInputStream fis = new FileInputStream(f);
-        JsonTypeMapper mapper = new JsonTypeMapper();
+        TreeMapper mapper = new TreeMapper();
         JsonParser jp = mJsonFactory.createJsonParser(fis);
-        mTree = mapper.read(jp);
+        mTree = mapper.readTree(jp);
         jp.close();
     }
 

src/perf/TestJsonPerf.java

diff --git a/src/perf/TestJsonPerf.java b/src/perf/TestJsonPerf.java
index e37b561..4c6ebc5 100644
--- a/src/perf/TestJsonPerf.java
+++ b/src/perf/TestJsonPerf.java
@@ -33,8 +33,8 @@
         mJsonFactory = new JsonFactory();
         mData = readData(f);
 
-        // Let's try to guestimate suitable size... to get to 100 megs parsed
-        REPS = (int) ((double) (100 * 1000 * 1000) / (double) mData.length);
+        // Let's try to guestimate suitable size... to get to 50 megs parsed
+        REPS = (int) ((double) (50 * 1000 * 1000) / (double) mData.length);
 
         System.out.println("Read "+mData.length+" bytes from '"+f+"'; will do "+REPS+" reps");
         System.out.println();
@@ -49,7 +49,7 @@
         while (true) {
             try {  Thread.sleep(100L); } catch (InterruptedException ie) { }
             // Use 9 to test all...
-            int round = (i++ % 7);
+            int round = (i++ % 2);
 
             long curr = System.currentTimeMillis();
             String msg;
@@ -226,7 +226,13 @@
         int sum = 0;
         for (int i = 0; i < reps; ++i) {
             // note: fast is not used any more
-            JsonParser jp = mJsonFactory.createJsonParser(new ByteArrayInputStream(mData));
+            JsonParser jp;
+
+            if (fast) {
+                jp = mJsonFactory.createJsonParser(mData, 0, mData.length);
+            } else {
+                jp = mJsonFactory.createJsonParser(new ByteArrayInputStream(mData));
+            }
             JsonToken t;
             while ((t = jp.nextToken()) != null) {
                 // Field names are always constructed