ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [06/11] ignite git commit: IGNITE-1770: Optimized schema tracking during write.
Date Tue, 27 Oct 2015 14:32:11 GMT
IGNITE-1770: Optimized schema tracking during write.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d9dea39
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d9dea39
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d9dea39

Branch: refs/heads/ignite-1770
Commit: 6d9dea39b92184cf1206df267808775ca840072e
Parents: 92c6b29
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Oct 27 16:28:37 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Oct 27 16:28:37 2015 +0300

----------------------------------------------------------------------
 .../internal/portable/PortableWriterExImpl.java | 110 +++++++++++++++----
 .../java/org/apache/ignite/MyBenchmark.java     |  10 +-
 2 files changed, 94 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6d9dea39/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
index 6e4c430..a629010 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
@@ -32,11 +32,9 @@ import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.IdentityHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -94,6 +92,9 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
     /** */
     private static final int INIT_CAP = 1024;
 
+    /** Thread-local schema. */
+    private static final ThreadLocal<SchemaHolder> SCHEMA = new ThreadLocal<>();
+
     /** */
     private final PortableContext ctx;
 
@@ -121,9 +122,11 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
     /** Output stream. */
     private PortableOutputStream out;
 
-    /** Field infos. */
-    // TODO: Optimize.
-    private List<Integer> schema;
+    /** Schema. */
+    private SchemaHolder schema;
+
+    /** Amount of written fields. */
+    private int fieldCnt;
 
     /**
      * @param ctx Context.
@@ -325,8 +328,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
             out.writeInt(start + SCHEMA_OR_RAW_OFF_POS, out.position() - start);
 
             // Write the schema.
-            for (Integer val : schema)
-                out.writeInt(val);
+            schema.writeAndPop(this, fieldCnt);
 
             // Write raw offset if needed.
             if (rawOffPos != 0)
@@ -1694,23 +1696,21 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
      * @param fieldId Field ID.
      */
     public void writeFieldId(int fieldId) {
-        int off = out.position() - start;
+        int fieldOff = out.position() - start;
 
-        saveFieldInfo(fieldId, off);
-    }
+        if (schema == null) {
+            schema = SCHEMA.get();
 
-     /**
-      * Save field info.
-      *
-      * @param id Field ID.
-      * @param off Offset starting from object head.
-      */
-    private void saveFieldInfo(int id, int off) {
-        if (schema == null)
-            schema = new ArrayList<>(2);
+            if (schema == null) {
+                schema = new SchemaHolder();
+
+                SCHEMA.set(schema);
+            }
+        }
 
-        schema.add(id);
-        schema.add(off);
+        schema.push(fieldId, fieldOff);
+
+        fieldCnt++;
     }
 
      /**
@@ -1751,4 +1751,72 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
     public PortableContext context() {
         return ctx;
     }
+
+    /**
+     * Schema holder.
+     */
+    private static class SchemaHolder {
+        /** Grow step. */
+        private static final int GROW_STEP = 16;
+
+        /** Maximum stable size. */
+        private static final int MAX_SIZE = 256;
+
+        /** Data. */
+        private int[] data;
+
+        /** Index. */
+        private int idx;
+
+        /**
+         * Constructor.
+         */
+        public SchemaHolder() {
+            data = new int[GROW_STEP];
+        }
+
+        /**
+         * Push another frame.
+         *
+         * @param id Field ID.
+         * @param off Field offset.
+         */
+        public void push(int id, int off) {
+            if (idx == data.length) {
+                int[] data0 = new int[data.length + GROW_STEP];
+
+                System.arraycopy(data, 0, data0, 0, data.length);
+
+                data = data0;
+            }
+
+            data[idx] = id;
+            data[idx + 1] = off;
+
+            idx += 2;
+        }
+
+        /**
+         * Write collected frames and pop them.
+         *
+         * @param writer Writer.
+         * @param cnt Count.
+         */
+        public void writeAndPop(PortableWriterExImpl writer, int cnt) {
+            int startIdx = idx - cnt * 2;
+
+            assert startIdx >= 0;
+
+            for (int idx0 = startIdx; idx0 < idx;) {
+                writer.writeInt(data[idx0++]);
+                writer.writeInt(data[idx0++]);
+            }
+
+            idx = startIdx;
+
+            // Shrink data array if needed.
+            if (idx == 0 && data.length > MAX_SIZE)
+                data = new int[MAX_SIZE];
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6d9dea39/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java b/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java
index 030342d..2c5deb1 100644
--- a/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java
+++ b/modules/microbench/src/main/java/org/apache/ignite/MyBenchmark.java
@@ -123,12 +123,12 @@ public class MyBenchmark {
     private static final Address addr = new Address();
 
     public static void main(String[] args) throws Exception {
-        setup();
-        while (true)
-            marsh.unmarshal(marshAddrBytes, null);
+//        setup();
+//        while (true)
+//            marsh.unmarshal(marshAddrBytes, null);
 
-//        Options opts = new OptionsBuilder().include(MyBenchmark.class.getSimpleName()).build();
-//        new Runner(opts).run();
+        Options opts = new OptionsBuilder().include(MyBenchmark.class.getSimpleName()).build();
+        new Runner(opts).run();
     }
 
     enum Sex { MALE, FEMALE }


Mime
View raw message