You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/05 13:25:47 UTC
[11/14] ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-gc-opts
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gc-opts
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c9b44cf0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c9b44cf0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c9b44cf0
Branch: refs/heads/ignite-2329-1
Commit: c9b44cf057e5e6fba10ae0049f3eca02fe3ae0f1
Parents: f095126 e2be94e
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Feb 4 17:08:42 2016 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Feb 4 17:08:42 2016 +0300
----------------------------------------------------------------------
.../jmh/cache/JmhCacheAbstractBenchmark.java | 3 +
.../benchmarks/jmh/cache/JmhCacheBenchmark.java | 145 ++
.../jmh/cache/JmhCachePutBenchmark.java | 124 --
.../jmh/runner/JmhIdeBenchmarkRunner.java | 20 +-
.../org/apache/ignite/cache/CacheEntry.java | 9 +-
.../apache/ignite/cache/CacheInterceptor.java | 5 +
.../org/apache/ignite/internal/IgnitionEx.java | 3 +-
.../internal/binary/BinaryClassDescriptor.java | 6 +-
.../internal/binary/BinaryFieldAccessor.java | 45 +-
.../internal/binary/BinaryMarshaller.java | 5 +-
.../binary/BinaryObjectOffheapImpl.java | 34 +-
.../internal/binary/BinaryPrimitives.java | 117 +-
.../streams/BinaryAbstractInputStream.java | 53 +-
.../streams/BinaryAbstractOutputStream.java | 90 +-
.../binary/streams/BinaryAbstractStream.java | 34 -
.../binary/streams/BinaryHeapInputStream.java | 43 +-
.../binary/streams/BinaryHeapOutputStream.java | 86 +-
.../streams/BinaryMemoryAllocatorChunk.java | 9 +-
.../streams/BinaryOffheapInputStream.java | 42 +-
.../streams/BinaryOffheapOutputStream.java | 94 +-
.../internal/direct/DirectMessageReader.java | 2 +-
.../internal/direct/DirectMessageWriter.java | 2 +-
.../stream/v1/DirectByteBufferStreamImplV1.java | 106 +-
.../stream/v2/DirectByteBufferStreamImplV2.java | 351 ++++-
.../processors/cache/GridCacheAdapter.java | 100 +-
.../cache/GridCacheEvictionManager.java | 7 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../cache/GridCacheOffheapSwapEntry.java | 24 +-
.../cache/GridCacheSwapEntryImpl.java | 61 +-
.../cache/GridCacheUpdateAtomicResult.java | 4 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 8 +-
.../dht/atomic/GridDhtAtomicCache.java | 13 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +-
.../local/atomic/GridLocalAtomicCache.java | 9 +-
.../continuous/CacheContinuousQueryHandler.java | 9 +
.../IgniteCacheObjectProcessorImpl.java | 7 +-
.../platform/memory/PlatformAbstractMemory.java | 6 +-
.../PlatformBigEndianOutputStreamImpl.java | 14 +-
.../memory/PlatformInputStreamImpl.java | 53 +-
.../platform/memory/PlatformMemoryUtils.java | 108 +-
.../memory/PlatformOutputStreamImpl.java | 58 +-
.../ignite/internal/util/GridHandleTable.java | 17 +-
.../ignite/internal/util/GridJavaProcess.java | 3 -
.../internal/util/GridSpinReadWriteLock.java | 10 +-
.../apache/ignite/internal/util/GridUnsafe.java | 1483 +++++++++++++++++-
.../ignite/internal/util/IgniteUtils.java | 99 +-
.../internal/util/io/GridUnsafeDataInput.java | 145 +-
.../internal/util/io/GridUnsafeDataOutput.java | 165 +-
.../ignite/internal/util/nio/GridNioServer.java | 28 +-
.../util/offheap/unsafe/GridUnsafeMap.java | 75 +-
.../util/offheap/unsafe/GridUnsafeMemory.java | 106 +-
.../optimized/OptimizedClassDescriptor.java | 22 +-
.../optimized/OptimizedMarshaller.java | 5 +-
.../optimized/OptimizedMarshallerUtils.java | 44 +-
.../optimized/OptimizedObjectInputStream.java | 10 +-
.../java/org/apache/ignite/GridTestIoUtils.java | 117 +-
.../ignite/internal/GridAffinitySelfTest.java | 2 +-
.../binary/BinaryFieldsOffheapSelfTest.java | 13 +-
.../BinaryFooterOffsetsOffheapSelfTest.java | 13 +-
.../binary/BinaryMarshallerSelfTest.java | 17 +-
...naryObjectBuilderDefaultMappersSelfTest.java | 24 +-
.../mutabletest/GridBinaryTestClasses.java | 3 +-
.../AbstractBinaryStreamByteOrderSelfTest.java | 464 ++++++
.../BinaryHeapStreamByteOrderSelfTest.java | 29 +
.../BinaryOffheapStreamByteOrderSelfTest.java | 31 +
...ByteBufferStreamImplV2ByteOrderSelfTest.java | 244 +++
.../cache/GridCacheConcurrentMapSelfTest.java | 13 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 6 +
...ntinuousQueryPartitionAtomicOneNodeTest.java | 37 +
...heContinuousQueryPartitionTxOneNodeTest.java | 37 +
...tinuousQueryReplicatedAtomicOneNodeTest.java | 31 +
...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 --
...eContinuousQueryReplicatedTxOneNodeTest.java | 193 +++
...dUnsafeDataInputOutputByteOrderSelfTest.java | 249 +++
.../ignite/lang/GridBasicPerformanceTest.java | 11 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../IgniteBinaryObjectsTestSuite.java | 6 +
.../IgniteMarshallerSelfTestSuite.java | 4 +
.../hadoop/shuffle/HadoopShuffleJob.java | 5 +-
.../hadoop/shuffle/HadoopShuffleMessage.java | 10 +-
.../shuffle/streams/HadoopDataOutStream.java | 6 +-
.../HadoopConcurrentHashMultimapSelftest.java | 6 +-
.../collections/HadoopSkipListSelfTest.java | 5 +-
.../IgniteCacheQuerySelfTestSuite.java | 10 +-
.../org/apache/ignite/spark/IgniteContext.scala | 11 +-
.../ignite/internal/GridFactorySelfTest.java | 2 +-
87 files changed, 4450 insertions(+), 1402 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c9b44cf0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 3356052,2c3a197..ed768f2
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@@ -100,6 -101,8 +101,7 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
import org.apache.ignite.internal.util.F0;
-import org.apache.ignite.internal.util.GridLeanMap;
+ import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridEmbeddedFuture;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c9b44cf0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c9b44cf0/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c9b44cf0/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------