You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/08/22 07:37:09 UTC
[13/32] ignite git commit: Merge branch 'ignite-1.6.5' into
ignite-1.7.2
Merge branch 'ignite-1.6.5' into ignite-1.7.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1de9c0f4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1de9c0f4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1de9c0f4
Branch: refs/heads/ignite-3220-1
Commit: 1de9c0f43c238cb0dc150a0aea0500fdf6396d68
Parents: 7307d8d f5a040a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Aug 15 13:38:21 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Aug 15 13:38:21 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 10 +
.../internal/binary/BinaryClassDescriptor.java | 43 ++-
.../ignite/internal/binary/BinaryContext.java | 21 +-
.../binary/BinaryMethodWriteReplacer.java | 59 ++++
.../ignite/internal/binary/BinaryTreeMap.java | 96 ++++++
.../binary/BinaryTreeMapWriteReplacer.java | 34 ++
.../ignite/internal/binary/BinaryTreeSet.java | 93 +++++
.../binary/BinaryTreeSetWriteReplacer.java | 34 ++
.../ignite/internal/binary/BinaryUtils.java | 37 +-
.../internal/binary/BinaryWriteReplacer.java | 33 ++
.../internal/binary/BinaryWriterExImpl.java | 35 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 19 ++
.../internal/binary/BinaryTreeSelfTest.java | 341 +++++++++++++++++++
.../IgniteBinaryObjectsTestSuite.java | 2 +
.../ClientReconnectAfterClusterRestartTest.java | 225 ++++++++++++
...eLockPartitionOnAffinityRunAbstractTest.java | 17 +
.../IgniteCacheWithIndexingTestSuite.java | 5 +-
17 files changed, 1062 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1de9c0f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1de9c0f4/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1de9c0f4/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
index a264a2f,4528b30..7949214
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
@@@ -21,9 -21,9 +21,10 @@@ import junit.framework.TestSuite
import org.apache.ignite.internal.processors.cache.CacheBinaryKeyConcurrentQueryTest;
import org.apache.ignite.internal.processors.cache.CacheConfigurationP2PTest;
import org.apache.ignite.internal.processors.cache.CacheIndexStreamerTest;
+import org.apache.ignite.internal.processors.cache.CacheIndexingOffheapCleanupTest;
import org.apache.ignite.internal.processors.cache.CacheOperationsWithExpirationTest;
import org.apache.ignite.internal.processors.cache.CacheRandomOperationsMultithreadedTest;
+ import org.apache.ignite.internal.processors.cache.ClientReconnectAfterClusterRestartTest;
import org.apache.ignite.internal.processors.cache.GridCacheOffHeapAndSwapSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheOffHeapSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheOffheapIndexEntryEvictTest;
@@@ -79,8 -79,9 +80,10 @@@ public class IgniteCacheWithIndexingTes
suite.addTestSuite(IgniteCacheStarvationOnRebalanceTest.class);
suite.addTestSuite(CacheOperationsWithExpirationTest.class);
suite.addTestSuite(CacheBinaryKeyConcurrentQueryTest.class);
+ suite.addTestSuite(CacheIndexingOffheapCleanupTest.class);
+ suite.addTestSuite(ClientReconnectAfterClusterRestartTest.class);
+
return suite;
}
- }
+ }