Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7d1aa6e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7d1aa6e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7d1aa6e Branch: refs/heads/ignite-218 Commit: b7d1aa6ef9910ae4a796ef2057ee441c595e9c8e Parents: bfebbaf e15f4b9 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Tue Apr 14 17:24:32 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Tue Apr 14 17:24:32 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheProjection.java | 298 ++-------- .../internal/processors/cache/GridCache.java | 1 - .../processors/cache/GridCacheAdapter.java | 544 ++++++------------- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheMapAdapter.java | 238 -------- .../processors/cache/GridCacheProjectionEx.java | 129 ----- .../cache/GridCacheProjectionImpl.java | 272 ++-------- .../processors/cache/GridCacheProxyImpl.java | 449 ++------------- .../processors/cache/GridCacheSwapManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 28 - .../processors/cache/IgniteCacheProxy.java | 32 +- .../CacheDataStructuresManager.java | 4 +- .../GridDistributedCacheAdapter.java | 15 +- .../distributed/dht/GridDhtCacheAdapter.java | 23 +- .../dht/GridDhtTransactionalCacheAdapter.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 117 ++-- .../dht/colocated/GridDhtColocatedCache.java | 21 +- .../distributed/near/GridNearAtomicCache.java | 130 ++--- .../distributed/near/GridNearCacheAdapter.java | 57 +- .../distributed/near/GridNearCacheEntry.java | 16 +- .../near/GridNearTransactionalCache.java | 9 +- .../processors/cache/local/GridLocalCache.java | 16 +- .../local/atomic/GridLocalAtomicCache.java | 131 ++--- .../CacheQueryCloseableScanBiPredicate.java | 30 + .../cache/query/GridCacheQueryManager.java | 8 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../datastructures/DataStructuresProcessor.java | 16 +- .../GridAtomicCacheQueueImpl.java | 12 +- .../datastructures/GridCacheAtomicLongImpl.java | 16 +- .../GridCacheAtomicReferenceImpl.java | 4 +- .../GridCacheAtomicSequenceImpl.java | 2 +- .../GridCacheAtomicStampedImpl.java | 4 +- .../GridCacheCountDownLatchImpl.java | 2 +- .../datastructures/GridCacheSetImpl.java | 4 +- .../GridTransactionalCacheQueueImpl.java | 8 +- .../processors/igfs/IgfsDataManager.java | 6 +- .../processors/igfs/IgfsMetaManager.java | 39 +- .../handlers/cache/GridCacheCommandHandler.java | 14 +- .../service/GridServiceProcessor.java | 13 +- .../processors/task/GridTaskProcessor.java | 2 +- .../util/future/GridCompoundFuture.java | 9 +- .../ignite/startup/BasicWarmupClosure.java | 12 +- .../GridCacheAbstractFailoverSelfTest.java | 37 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 48 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- .../processors/cache/GridCacheOffHeapTest.java | 4 +- .../cache/GridCachePutAllFailoverSelfTest.java | 12 +- .../processors/cache/GridCachePutAllTask.java | 23 +- ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 32 ++ .../cache/IgniteTxMultiNodeAbstractTest.java | 4 +- .../GridCacheSequenceApiSelfAbstractTest.java | 2 +- ...GridCachePartitionedNodeRestartSelfTest.java | 67 --- .../GridCacheAbstractNodeRestartSelfTest.java | 23 +- .../GridCacheMultiNodeLockAbstractTest.java | 14 +- .../IgniteCacheAtomicNodeRestartTest.java | 33 ++ .../IgniteCacheSystemTransactionsSelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 8 +- .../GridCachePartitionedFullApiSelfTest.java | 2 +- .../GridCachePartitionedNodeRestartTest.java | 1 + .../GridCachePartitionedTxSalvageSelfTest.java | 4 + .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + ...acheAtomicReplicatedNodeRestartSelfTest.java | 32 ++ .../GridCacheReplicatedPreloadSelfTest.java | 4 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 12 +- .../junits/common/GridCommonAbstractTest.java | 36 +- .../IgniteCacheFailoverTestSuite.java | 2 +- .../testsuites/IgniteCacheRestartTestSuite.java | 20 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 18 +- .../hadoop/jobtracker/HadoopJobTracker.java | 2 +- .../HibernateAccessStrategyAdapter.java | 4 +- .../hibernate/HibernateGeneralDataRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 2 +- .../HibernateReadWriteAccessStrategy.java | 8 +- .../ignite/cache/hibernate/HibernateRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 8 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 10 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 6 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 2 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +- 82 files changed, 949 insertions(+), 2309 deletions(-) ----------------------------------------------------------------------
