Merge ignite-3477 into ignite-db-x
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca373d78 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca373d78 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca373d78 Branch: refs/heads/ignite-3477 Commit: ca373d78694db25f0c6d233f4802d77fb3a7f654 Parents: 6f258b9 e7e0d87 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Tue Jan 17 13:43:42 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Jan 17 13:43:42 2017 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 2 +- .../internal/managers/GridManagerAdapter.java | 3 +- .../processors/cache/GridCacheAdapter.java | 7 +- .../cache/GridCacheConcurrentMapImpl.java | 7 +- .../processors/cache/GridCacheMapEntry.java | 8 ++ .../GridCachePartitionExchangeManager.java | 115 +++++++++---------- .../cache/GridCacheSharedContext.java | 23 +++- .../distributed/dht/GridDhtCacheEntry.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 9 +- .../dht/GridDhtPartitionTopologyImpl.java | 8 +- .../dht/GridPartitionedGetFuture.java | 4 +- .../dht/GridPartitionedSingleGetFuture.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 60 +++++----- .../dht/preloader/GridDhtForceKeysFuture.java | 10 +- .../GridDhtPartitionsExchangeFuture.java | 30 ++--- .../dht/preloader/GridDhtPreloader.java | 2 +- .../extras/GridCacheAttributesEntryExtras.java | 4 +- .../GridCacheAttributesMvccEntryExtras.java | 2 +- ...dCacheAttributesMvccObsoleteEntryExtras.java | 2 +- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 4 +- .../GridCacheAttributesMvccTtlEntryExtras.java | 4 +- .../GridCacheAttributesObsoleteEntryExtras.java | 2 +- ...idCacheAttributesObsoleteTtlEntryExtras.java | 4 +- .../GridCacheAttributesTtlEntryExtras.java | 4 +- .../GridCacheMvccObsoleteEntryExtras.java | 2 +- .../GridCacheMvccObsoleteTtlEntryExtras.java | 4 +- .../extras/GridCacheMvccTtlEntryExtras.java | 3 +- .../extras/GridCacheObsoleteTtlEntryExtras.java | 3 +- .../cache/extras/GridCacheTtlEntryExtras.java | 2 +- .../util/GridCursorIteratorWrapper.java | 24 +++- .../cache/CacheConfigurationLeakTest.java | 4 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 28 ++--- .../GridCacheValueBytesPreloadingSelfTest.java | 17 +-- ...CacheLoadingConcurrentGridStartSelfTest.java | 2 + ...tractPartitionedByteArrayValuesSelfTest.java | 1 + ...GridCachePreloadRestartAbstractSelfTest.java | 12 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 6 +- .../GridCacheReplicatedPreloadSelfTest.java | 25 ++-- .../testsuites/IgniteCacheTestSuite2.java | 15 +-- .../testsuites/IgniteCacheTestSuite3.java | 13 ++- ...niteCachePartitionedFieldsQuerySelfTest.java | 8 +- ...gniteCacheReplicatedFieldsQuerySelfTest.java | 6 +- .../query/h2/opt/GridH2TableSelfTest.java | 6 +- .../IgniteCacheQuerySelfTestSuite2.java | 5 +- modules/yardstick/config/ignite-base-config.xml | 2 +- .../yardstick/cache/IgniteGetAllBenchmark.java | 42 +++++++ .../yardstick/cache/IgniteGetBenchmark.java | 38 +++++- .../cache/jdbc/JdbcAbstractBenchmark.java | 17 +++ .../yardstick/cache/jdbc/JdbcPutBenchmark.java | 17 +++ .../cache/jdbc/JdbcPutGetBenchmark.java | 17 +++ .../jdbc/JdbcPutIndexedValue8Benchmark.java | 17 +++ .../cache/jdbc/JdbcSqlQueryBenchmark.java | 17 +++ .../cache/jdbc/JdbcSqlQueryJoinBenchmark.java | 17 +++ 53 files changed, 472 insertions(+), 218 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca373d78/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca373d78/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca373d78/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ----------------------------------------------------------------------