IGNITE-471 - Marshalling fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f1b482a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f1b482a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f1b482a Branch: refs/heads/ignite-471 Commit: 2f1b482aa02e522207a56c82428b210a85f39ce9 Parents: bac08bf Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Sat Mar 14 17:35:22 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Sat Mar 14 17:35:22 2015 -0700 ---------------------------------------------------------------------- .../internal/util/io/GridUnsafeDataOutput.java | 8 -------- .../optimized/OptimizedMarshaller.java | 21 +++++++++++++++----- 2 files changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1b482a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java index 68451f8..573b92b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridUnsafeDataOutput.java @@ -23,8 +23,6 @@ import sun.misc.*; import java.io.*; -import static org.apache.ignite.IgniteSystemProperties.*; - /** * Data output based on {@code Unsafe} operations. */ @@ -33,9 +31,6 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput private static final Unsafe UNSAFE = GridUnsafe.unsafe(); /** */ - private static final Long CHECK_FREQ = Long.getLong(IGNITE_MARSHAL_BUFFERS_RECHECK, 10000); - - /** */ private static final long byteArrOff = UNSAFE.arrayBaseOffset(byte[].class); /** */ @@ -71,9 +66,6 @@ public class GridUnsafeDataOutput extends OutputStream implements GridDataOutput /** Underlying output stream. */ private OutputStream out; - /** Last length check timestamp. */ - private long lastCheck = U.currentTimeMillis(); - /** * */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1b482a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java index cad066b..6da89de 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java @@ -76,9 +76,8 @@ import java.nio.*; * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ public class OptimizedMarshaller extends AbstractMarshaller { - /** Initial buffer size. */ - // TODO: IGNITE-471 - Make configurable - private static final int INIT_BUF_SIZE = 64; + /** Default initial buffer size. */ + private static final int DFLT_INIT_BUF_SIZE = 4 * 1024; /** Default class loader. */ private final ClassLoader dfltClsLdr = getClass().getClassLoader(); @@ -86,6 +85,9 @@ public class OptimizedMarshaller extends AbstractMarshaller { /** Whether or not to require an object to be serializable in order to be marshalled. */ private boolean requireSer = true; + /** Initial buffer size. */ + private int initBufSize = DFLT_INIT_BUF_SIZE; + /** ID mapper. */ private OptimizedMarshallerIdMapper mapper; @@ -122,6 +124,15 @@ public class OptimizedMarshaller extends AbstractMarshaller { } /** + * Sets initial buffer size. + * + * @param initBufSize Initial buffer size. + */ + public void setInitialBufferSize(int initBufSize) { + this.initBufSize = initBufSize; + } + + /** * Sets ID mapper. * * @param mapper ID mapper. @@ -138,7 +149,7 @@ public class OptimizedMarshaller extends AbstractMarshaller { try { // TODO: IGNITE-471 - Need adaptive initial size. - objOut = new OptimizedObjectOutputStream(new GridUnsafeDataOutput(INIT_BUF_SIZE)); + objOut = new OptimizedObjectOutputStream(new GridUnsafeDataOutput(initBufSize)); objOut.context(ctx, mapper, requireSer); @@ -160,7 +171,7 @@ public class OptimizedMarshaller extends AbstractMarshaller { try { // TODO: IGNITE-471 - Need adaptive initial size. - objOut = new OptimizedObjectOutputStream(new GridUnsafeDataOutput(INIT_BUF_SIZE)); + objOut = new OptimizedObjectOutputStream(new GridUnsafeDataOutput(initBufSize)); objOut.context(ctx, mapper, requireSer);
