http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- diff --cc modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java index 185448a,9551680..7a5bc14 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java @@@ -18,6 -18,8 +18,7 @@@ package org.apache.ignite.codegen; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.query.h2.twostep.messages.*; + import org.apache.ignite.internal.processors.datastreamer.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.plugin.extensions.communication.*; @@@ -281,13 -312,8 +282,16 @@@ public class MessageCodeGenerator if (cls.isInterface()) return; - if (cls.isAnnotationPresent(IgniteCodeGeneratingFail.class)) - throw new IllegalStateException("@IgniteCodeGeneratingFail is provided for class: " + cls.getName()); ++ if (cls.isInterface()) ++ return; ++ + if (cls.isAnnotationPresent(IgniteCodeGeneratingFail.class)) { + System.out.println(" @IgniteCodeGeneratingFail is provided for class: " + cls.getName()); + + return; + +// throw new IllegalStateException("@IgniteCodeGeneratingFail is provided for class: " + cls.getName()); + } write.clear(); read.clear();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java index 2cd9306,2e80b6f..dbfb8dc --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java @@@ -32,11 -32,10 +32,11 @@@ import org.apache.ignite.lang.* import org.apache.ignite.marshaller.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.checkpoint.*; - import org.jdk8.backport.*; import org.jetbrains.annotations.*; + import org.jsr166.*; import java.io.*; +import java.nio.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 2e97cf1,f0d595b..5c7bd83 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@@ -35,11 -35,10 +35,11 @@@ import org.apache.ignite.marshaller.* import org.apache.ignite.plugin.extensions.communication.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.communication.*; - import org.jdk8.backport.*; import org.jetbrains.annotations.*; + import org.jsr166.*; import java.io.*; +import java.nio.*; import java.util.*; import java.util.Map.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java index ed91690,e8c9396..59e8af0 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java @@@ -33,10 -34,9 +34,10 @@@ import org.apache.ignite.marshaller.* import org.apache.ignite.plugin.security.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.eventstorage.*; - import org.jdk8.backport.*; import org.jetbrains.annotations.*; + import org.jsr166.*; +import java.nio.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 48c1f71,26091f3..404cd89 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@@ -40,19 -42,26 +42,26 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.query.continuous.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; + import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.lang.*; + import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; + import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; + import org.apache.ignite.marshaller.*; + import org.apache.ignite.marshaller.jdk.*; import org.apache.ignite.spi.*; import org.jetbrains.annotations.*; import javax.cache.configuration.*; import javax.cache.integration.*; import javax.management.*; + import java.io.*; +import java.nio.*; import java.util.*; + import java.util.concurrent.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index e4a52c3,58b8367..b1f3983 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@@ -29,10 -30,9 +30,10 @@@ import org.apache.ignite.internal.util. import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; - import org.jdk8.backport.*; import org.jetbrains.annotations.*; + import org.jsr166.*; +import java.nio.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 0abc20f,0574f17..a007090 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@@ -59,10 -60,10 +60,10 @@@ public class GridDhtLockRequest extend private Map<KeyCacheObject, GridCacheVersion> owned; /** Owner mapped version bytes. */ - private byte[] ownedBytes; + private ByteBuffer ownedBytes; /** Topology version. */ - private long topVer; + private AffinityTopologyVersion topVer; /** Subject ID. */ private UUID subjId; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 996deba,8256274..5e20e23 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@@ -43,10 -44,10 +44,10 @@@ public class GridDhtPartitionsFullMessa private Map<Integer, GridDhtPartitionFullMap> parts = new HashMap<>(); /** */ - private byte[] partsBytes; + private ByteBuffer partsBytes; /** Topology version. */ - private long topVer; + private AffinityTopologyVersion topVer; /** * Required by {@link Externalizable}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java index 88c7ea0,87fe976..8dcc944 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java @@@ -369,6 -374,9 +369,9 @@@ public class GridCacheRawVersionedEntry /** {@inheritDoc} */ @Override public String toString() { - return S.toString(GridCacheRawVersionedEntry.class, this); + return S.toString(GridCacheRawVersionedEntry.class, this, - "keyBytesLen", keyBytes != null ? keyBytes.length : "n/a", - "valBytesLen", valBytes != null ? valBytes.length : "n/a", ++ "keyBytesLen", keyBytes != null ? keyBytes.limit() : "n/a", ++ "valBytesLen", valBytes != null ? valBytes.limit() : "n/a", + "super", super.toString()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java index 6ed9df4,42586d2..949ea72 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java @@@ -18,14 -18,14 +18,16 @@@ package org.apache.ignite.internal.processors.cacheobject; import org.apache.ignite.*; - import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; + import org.apache.ignite.configuration.*; + import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.*; import org.apache.ignite.internal.processors.cache.*; + import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import java.nio.*; + /** * Cache objects processor. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index c6e975b,54da8e6..74a8cf9 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@@ -37,11 -38,10 +38,11 @@@ import org.apache.ignite.lang.* import org.apache.ignite.marshaller.*; import org.apache.ignite.plugin.extensions.communication.*; import org.apache.ignite.thread.*; - import org.jdk8.backport.*; import org.jetbrains.annotations.*; + import org.jsr166.*; import java.io.*; +import java.nio.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.locks.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index 432c6bf,7d5bff2..5aaa3ae --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@@ -38,10 -38,11 +38,12 @@@ import org.apache.ignite.internal.util. import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; - import org.jdk8.backport.*; + import org.apache.ignite.stream.*; import org.jetbrains.annotations.*; + import org.jsr166.*; + import javax.cache.*; +import java.nio.*; import java.util.*; import java.util.Map.*; import java.util.concurrent.*; @@@ -56,14 -57,14 +58,14 @@@ import static org.apache.ignite.interna */ @SuppressWarnings("unchecked") public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed { - /** Isolated updater. */ - private static final Updater ISOLATED_UPDATER = new IsolatedUpdater(); + /** Isolated receiver. */ + private static final StreamReceiver ISOLATED_UPDATER = new IsolatedUpdater(); - /** Cache updater. */ - private Updater<K, V> updater = ISOLATED_UPDATER; + /** Cache receiver. */ + private StreamReceiver<K, V> rcvr = ISOLATED_UPDATER; /** */ - private byte[] updaterBytes; + private ByteBuffer updaterBytes; /** Max remap count before issuing an error. */ private static final int DFLT_MAX_REMAP_CNT = 32; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java index 4d1d84d,ebedadb..6e1972c --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java @@@ -27,10 -27,9 +27,10 @@@ import org.apache.ignite.internal.util. import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; - import org.jdk8.backport.*; import org.jetbrains.annotations.*; + import org.jsr166.*; +import java.nio.*; import java.util.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index ede8ca0,5f6da0f..4a43dee --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@@ -44,10 -43,9 +43,10 @@@ import org.apache.ignite.plugin.extensi import org.apache.ignite.spi.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.transactions.*; - import org.jdk8.backport.*; import org.jetbrains.annotations.*; + import org.jsr166.*; import sun.misc.*; +import sun.nio.ch.*; import javax.management.*; import javax.naming.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java index 500df8b,e62951e..35cf1ae --- 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 @@@ -26,7 -26,7 +27,8 @@@ import org.jsr166.* import sun.misc.*; import java.io.*; +import java.nio.*; + import java.util.concurrent.*; /** * Optimized implementation of {@link org.apache.ignite.marshaller.Marshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.JdkMarshaller}, @@@ -148,10 -153,9 +153,10 @@@ public class OptimizedMarshaller extend OptimizedObjectOutputStream objOut = null; try { - objOut = OptimizedObjectStreamRegistry.out(); + // TODO: IGNITE-471 - Need adaptive initial size. + objOut = new OptimizedObjectOutputStream(new GridUnsafeDataOutput(initBufSize)); - objOut.context(ctx, mapper, requireSer); + objOut.context(clsMap, ctx, mapper, requireSer); objOut.out().outputStream(out); @@@ -170,10 -174,9 +175,10 @@@ OptimizedObjectOutputStream objOut = null; try { - objOut = OptimizedObjectStreamRegistry.out(); + // TODO: IGNITE-471 - Need adaptive initial size. + objOut = new OptimizedObjectOutputStream(new GridUnsafeDataOutput(initBufSize)); - objOut.context(ctx, mapper, requireSer); + objOut.context(clsMap, ctx, mapper, requireSer); objOut.writeObject(obj); @@@ -195,9 -198,9 +200,9 @@@ OptimizedObjectInputStream objIn = null; try { - objIn = OptimizedObjectStreamRegistry.in(); + objIn = new OptimizedObjectInputStream(new GridUnsafeDataInput()); - objIn.context(ctx, mapper, clsLdr != null ? clsLdr : dfltClsLdr); + objIn.context(clsMap, ctx, mapper, clsLdr != null ? clsLdr : dfltClsLdr); objIn.in().inputStream(in); @@@ -225,12 -227,11 +230,12 @@@ OptimizedObjectInputStream objIn = null; try { - objIn = OptimizedObjectStreamRegistry.in(); + objIn = new OptimizedObjectInputStream(new GridUnsafeDataInput()); - objIn.context(ctx, mapper, clsLdr != null ? clsLdr : dfltClsLdr); + objIn.context(clsMap, ctx, mapper, clsLdr != null ? clsLdr : dfltClsLdr); - objIn.in().bytes(arr, arr.length); + // TODO: IGNITE-471 - Position is not moved. + objIn.in().bytes(buf.array(), buf.position(), buf.remaining()); return (T)objIn.readObject(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java index 5c1ef11,78190ea..17082ae --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java @@@ -125,7 -120,11 +129,9 @@@ class OptimizedObjectInputStream extend /** {@inheritDoc} */ @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod") @Override public void reset() throws IOException { + in.reset(); - handles.clear(); + - curObj = null; - curFields = null; + handles.clear(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java index 55f45c8,3d0df7c..1587d19 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java @@@ -22,9 -22,13 +22,14 @@@ import org.apache.ignite.cluster.* import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.processors.task.*; +import org.apache.ignite.internal.util.typedef.internal.*; + import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.lang.*; import org.apache.ignite.messaging.*; + import org.apache.ignite.spi.discovery.tcp.*; + import org.apache.ignite.spi.discovery.tcp.ipfinder.*; + import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; + import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java index eea9a32,954c053..e8ef215 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java @@@ -985,19 -1024,19 +989,19 @@@ public class OptimizedObjectStreamSelfT OptimizedObjectInputStream in = null; try { - out = OptimizedObjectStreamRegistry.out(); + out = new OptimizedObjectOutputStream(new GridUnsafeDataOutput(512)); - out.context(CTX, null, true); + out.context(clsMap, CTX, null, true); out.writeObject(obj); byte[] arr = out.out().array(); - in = OptimizedObjectStreamRegistry.in(); + in = new OptimizedObjectInputStream(new GridUnsafeDataInput()); - in.context(CTX, null, getClass().getClassLoader()); + in.context(clsMap, CTX, null, getClass().getClassLoader()); - in.in().bytes(arr, arr.length); + in.in().bytes(arr, 0, arr.length); Object obj0 = in.readObject(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java index df91a98,10afe10..a118a6a --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java @@@ -37,6 -38,9 +37,8 @@@ public class IgniteMarshallerSelfTestSu suite.addTest(new TestSuite(OptimizedMarshallerSelfTest.class)); suite.addTest(new TestSuite(OptimizedMarshallerTest.class)); suite.addTest(new TestSuite(OptimizedObjectStreamSelfTest.class)); - suite.addTest(new TestSuite(GridUnsafeDataOutputArraySizingSelfTest.class)); + suite.addTest(new TestSuite(OptimizedMarshallerNodeFailoverTest.class)); + suite.addTest(new TestSuite(OptimizedMarshallerSerialPersistentFieldsSelfTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 592f3b3,a484a10..ec34d8f --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@@ -1200,85 -1157,12 +1158,12 @@@ public class IgniteH2Indexing implement } /** - * @param p2pEnabled If peer-deployment is enabled. * @return Serializer. */ - protected JavaObjectSerializer h2Serializer(boolean p2pEnabled) { - return p2pEnabled ? - new JavaObjectSerializer() { - /** */ - private volatile Map<ClassLoader, Byte> ldr2id = Collections.emptyMap(); - - /** */ - private volatile Map<Byte, ClassLoader> id2ldr = Collections.emptyMap(); - - /** */ - private byte ldrIdGen = Byte.MIN_VALUE; - - /** */ - private final Lock lock = new ReentrantLock(); - - @Override public byte[] serialize(Object obj) throws Exception { - ClassLoader ldr = obj.getClass().getClassLoader(); - - Byte ldrId = ldr2id.get(ldr); - - if (ldrId == null) { - lock.lock(); - - try { - ldrId = ldr2id.get(ldr); - - if (ldrId == null) { - ldrId = ldrIdGen++; - - if (id2ldr.containsKey(ldrId)) // Overflow. - throw new IgniteException("Failed to add new peer-to-peer class loader."); - - Map<Byte, ClassLoader> id2ldr0 = new HashMap<>(id2ldr); - Map<ClassLoader, Byte> ldr2id0 = new IdentityHashMap<>(ldr2id); - - id2ldr0.put(ldrId, ldr); - ldr2id0.put(ldr, ldrId); - - ldr2id = ldr2id0; - id2ldr = id2ldr0; - } - } - finally { - lock.unlock(); - } - } - - byte[] bytes = U.toArray(marshaller.marshal(obj)); - - int len = bytes.length; - - bytes = Arrays.copyOf(bytes, len + 1); // The last byte is for ldrId. - - bytes[len] = ldrId; - - return bytes; - } - - @Override public Object deserialize(byte[] bytes) throws Exception { - int last = bytes.length - 1; - - byte ldrId = bytes[last]; - - ClassLoader ldr = id2ldr.get(ldrId); - - if (ldr == null) - throw new IllegalStateException("Class loader was not found: " + ldrId); - - bytes = Arrays.copyOf(bytes, last); // Trim the last byte. - - return marshaller.unmarshal(ByteBuffer.wrap(bytes), ldr); - } - } : - new JavaObjectSerializer() { + protected JavaObjectSerializer h2Serializer() { + return new JavaObjectSerializer() { @Override public byte[] serialize(Object obj) throws Exception { - return marshaller.marshal(obj); + return U.toArray(marshaller.marshal(obj)); } @Override public Object deserialize(byte[] bytes) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bfb8c10b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ----------------------------------------------------------------------
