Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-107
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/88e38331 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88e38331 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88e38331 Branch: refs/heads/ignite-107 Commit: 88e38331637652b88be480afee56b81b7d9818fd Parents: 3b47ca3 df849b1 Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Sat Jan 24 14:08:32 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Sat Jan 24 14:08:32 2015 +0300 ---------------------------------------------------------------------- examples/pom-standalone.xml | 32 +-- .../datagrid/CacheTransactionExample.java | 2 +- .../examples/ScalarCacheQueryExample.scala | 3 +- .../test/config/aop/aspectj/META-INF/aop.xml | 2 +- .../client/impl/ClientCacheFlagsCodecTest.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 16 +- .../apache/ignite/IgniteCachingProvider.java | 3 +- .../apache/ignite/cache/CacheAtomicityMode.java | 2 +- .../apache/ignite/cache/CacheConfiguration.java | 8 +- .../org/apache/ignite/cache/CacheEntry.java | 12 +- .../java/org/apache/ignite/cache/CacheFlag.java | 110 --------- .../apache/ignite/cache/CacheFlagException.java | 67 ------ .../cache/CachePartialUpdateException.java | 6 +- .../apache/ignite/cache/CacheProjection.java | 1 + .../java/org/apache/ignite/cache/GridCache.java | 2 +- .../apache/ignite/cache/cloner/CacheCloner.java | 2 +- .../ignite/client/impl/GridClientImpl.java | 2 +- .../processors/cache/CacheEntryImpl.java | 8 +- .../internal/processors/cache/CacheFlag.java | 110 +++++++++ .../processors/cache/CacheFlagException.java | 67 ++++++ .../CachePartialUpdateCheckedException.java | 64 ++++++ .../processors/cache/GridCacheAdapter.java | 34 ++- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 17 +- .../processors/cache/GridCacheGateway.java | 2 + .../processors/cache/GridCacheMapEntry.java | 2 +- .../processors/cache/GridCacheMvccManager.java | 3 +- .../processors/cache/GridCacheProjectionEx.java | 24 +- .../cache/GridCacheSharedContext.java | 5 +- .../processors/cache/IgniteCacheProxy.java | 23 +- .../GridCacheDataStructuresManager.java | 4 +- .../cache/datastructures/GridCacheSetImpl.java | 174 ++------------ .../dht/atomic/GridNearAtomicUpdateFuture.java | 12 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 2 +- .../near/GridNearTransactionalCache.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 16 +- .../cache/query/GridCacheQueryAdapter.java | 14 +- .../query/GridCacheQueryFutureAdapter.java | 7 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../GridCacheContinuousQueryEntry.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 2 +- .../processors/job/GridJobProcessor.java | 3 - .../processors/task/GridTaskWorker.java | 28 +-- .../apache/ignite/transactions/IgniteTx.java | 2 +- .../cache/CacheIteratorConverter.java | 39 ++++ .../cache/CacheWeakQueryIteratorsHolder.java | 228 +++++++++++++++++++ .../internal/GridJobStealingSelfTest.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 178 +++++++++++++++ .../GridCacheAbstractProjectionSelfTest.java | 4 +- .../GridCacheReturnValueTransferSelfTest.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 2 +- .../GridCacheAbstractJobExecutionTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 1 + .../GridCachePartitionedProjectionSelfTest.java | 2 +- .../GridCacheReplicatedProjectionSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 3 +- .../p2p/GridAbstractMultinodeRedeployTest.java | 2 +- .../ignite/tests/p2p/ExcludeNodeFilter.java | 52 +++++ .../ignite/tests/p2p/GridExcludeNodeFilter.java | 52 ----- .../p2p/GridP2PContinuousDeploymentTask1.java | 2 +- .../ignite/tests/p2p/GridTestUserResource.java | 27 --- .../ignite/tests/p2p/TestUserResource.java | 27 +++ .../p2p/GridP2PUserVersionChangeSelfTest.java | 4 +- 67 files changed, 960 insertions(+), 586 deletions(-) ----------------------------------------------------------------------
