Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e799b781 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e799b781 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e799b781 Branch: refs/heads/ignite-sprint-3 Commit: e799b7813a03e4060e201dff676b00559d1557f2 Parents: 3ec2279 d173f37 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 3 11:37:59 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Apr 3 11:37:59 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 19 +- examples/pom-standalone.xml | 1 - ipc/shmem/README.txt | 2 +- .../apache/ignite/cache/CacheTypeMetadata.java | 4 +- .../apache/ignite/cache/CachingProvider.java | 2 +- .../configuration/CacheConfiguration.java | 29 - .../processors/cache/CacheMetricsImpl.java | 1 + .../cache/CacheStorePartialUpdateException.java | 2 +- .../processors/cache/GridCacheAdapter.java | 19 +- .../processors/cache/GridCacheAttributes.java | 8 - .../cache/GridCacheConcurrentMap.java | 34 +- .../processors/cache/GridCacheContext.java | 9 +- .../processors/cache/GridCacheMapEntry.java | 56 +- .../cache/GridCacheMapEntryFactory.java | 2 - .../processors/cache/GridCacheProcessor.java | 16 +- .../processors/cache/GridCacheStoreManager.java | 1202 ------------------ .../cache/GridCacheWriteBehindStore.java | 1015 --------------- .../distributed/GridDistributedCacheEntry.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 22 +- .../distributed/dht/GridDhtCacheEntry.java | 8 +- .../distributed/dht/GridDhtLocalPartition.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridNoStorageCacheMap.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 11 +- .../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +- .../dht/colocated/GridDhtColocatedCache.java | 5 +- .../colocated/GridDhtColocatedCacheEntry.java | 4 +- .../colocated/GridDhtDetachedCacheEntry.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 3 +- .../distributed/near/GridNearCacheEntry.java | 4 +- .../processors/cache/local/GridLocalCache.java | 3 +- .../cache/local/GridLocalCacheEntry.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 7 +- .../cache/store/CacheOsStoreManager.java | 59 + .../cache/store/CacheStoreManager.java | 182 +++ .../store/GridCacheStoreManagerAdapter.java | 1111 ++++++++++++++++ .../cache/store/GridCacheWriteBehindStore.java | 1015 +++++++++++++++ .../cache/transactions/IgniteTxAdapter.java | 5 +- .../transactions/IgniteTxLocalAdapter.java | 43 +- .../cacheobject/IgniteCacheObjectProcessor.java | 14 +- .../IgniteCacheObjectProcessorImpl.java | 175 ++- .../datastreamer/DataStreamerImpl.java | 21 +- .../processors/plugin/CachePluginManager.java | 8 +- .../processors/query/GridQueryProcessor.java | 143 ++- .../messages/GridQueryNextPageResponse.java | 34 +- .../visor/cache/VisorCacheConfiguration.java | 81 +- .../cache/VisorCacheDefaultConfiguration.java | 21 - .../cache/VisorCacheNearConfiguration.java | 11 +- .../visor/node/VisorGridConfiguration.java | 28 +- .../internal/visor/util/VisorMimeTypes.java | 4 +- .../resources/META-INF/classnames.properties | 93 +- .../ignite/IgniteCacheAffinitySelfTest.java | 2 + ...idCacheConfigurationConsistencySelfTest.java | 3 - .../GridCacheOnCopyFlagAbstractSelfTest.java | 16 +- .../cache/GridCachePartitionedWritesTest.java | 3 +- ...idCacheWriteBehindStoreAbstractSelfTest.java | 189 --- .../GridCacheWriteBehindStoreAbstractTest.java | 349 ----- .../GridCacheWriteBehindStoreLocalTest.java | 30 - ...heWriteBehindStoreMultithreadedSelfTest.java | 163 --- ...BehindStorePartitionedMultiNodeSelfTest.java | 215 ---- ...ridCacheWriteBehindStorePartitionedTest.java | 30 - ...GridCacheWriteBehindStoreReplicatedTest.java | 30 - .../GridCacheWriteBehindStoreSelfTest.java | 267 ---- .../IgniteCacheStoreValueAbstractTest.java | 92 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 8 +- .../distributed/dht/GridCacheDhtTestUtils.java | 2 +- ...idCacheWriteBehindStoreAbstractSelfTest.java | 191 +++ .../GridCacheWriteBehindStoreAbstractTest.java | 350 +++++ .../GridCacheWriteBehindStoreLocalTest.java | 30 + ...heWriteBehindStoreMultithreadedSelfTest.java | 163 +++ ...BehindStorePartitionedMultiNodeSelfTest.java | 216 ++++ ...ridCacheWriteBehindStorePartitionedTest.java | 30 + ...GridCacheWriteBehindStoreReplicatedTest.java | 30 + .../GridCacheWriteBehindStoreSelfTest.java | 268 ++++ .../processors/igfs/IgsfStartCacheTest.java | 115 ++ .../loadtests/hashmap/GridCacheTestContext.java | 8 +- .../loadtests/hashmap/GridHashMapLoadTest.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../IgniteCacheWriteBehindTestSuite.java | 3 +- .../query/h2/twostep/GridMapQueryExecutor.java | 86 +- .../query/h2/twostep/GridResultPage.java | 9 +- .../cache/ttl/CacheTtlAbstractSelfTest.java | 368 ++++++ .../ttl/CacheTtlOffheapAbstractSelfTest.java | 29 + .../CacheTtlOffheapAtomicAbstractSelfTest.java | 29 + .../ttl/CacheTtlOffheapAtomicLocalSelfTest.java | 34 + ...acheTtlOffheapAtomicPartitionedSelfTest.java | 34 + ...TtlOffheapTransactionalAbstractSelfTest.java | 29 + ...cheTtlOffheapTransactionalLocalSelfTest.java | 34 + ...OffheapTransactionalPartitionedSelfTest.java | 34 + .../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 + .../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 + .../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 + ...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 + ...eTtlOnheapTransactionalAbstractSelfTest.java | 29 + ...acheTtlOnheapTransactionalLocalSelfTest.java | 34 + ...lOnheapTransactionalPartitionedSelfTest.java | 34 + .../IgniteCacheWithIndexingTestSuite.java | 51 + .../IgniteH2IndexingSpiTestSuite.java | 7 - .../GridUriDeploymentFileResourceLoader.java | 2 +- .../commands/cache/VisorCacheCommand.scala | 4 +- parent/pom.xml | 10 +- 102 files changed, 5290 insertions(+), 4071 deletions(-) ----------------------------------------------------------------------
