Merge branch 'sprint-1' into ignite-49
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/35495421 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/35495421 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/35495421 Branch: refs/heads/ignite-49 Commit: 35495421cb7611d49518120c9d7d39a7054e0b6b Parents: c7a9a1d 15cbff4 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Jan 23 18:51:27 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Jan 23 18:51:27 2015 +0300 ---------------------------------------------------------------------- .../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/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 +- .../internal/processors/cache/CacheFlag.java | 110 +++++++++++++++++++ .../processors/cache/CacheFlagException.java | 67 +++++++++++ .../CachePartialUpdateCheckedException.java | 64 +++++++++++ .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../processors/cache/GridCacheMvccManager.java | 3 +- .../processors/cache/GridCacheProjectionEx.java | 24 ++-- .../cache/GridCacheSharedContext.java | 5 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../GridCacheDataStructuresManager.java | 4 +- .../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 +-- .../GridCacheContinuousQueryEntry.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 2 +- .../processors/job/GridJobProcessor.java | 3 - .../processors/task/GridTaskWorker.java | 28 +---- .../apache/ignite/transactions/IgniteTx.java | 2 +- .../internal/GridJobStealingSelfTest.java | 4 +- .../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 +- 56 files changed, 416 insertions(+), 377 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35495421/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35495421/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35495421/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35495421/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35495421/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35495421/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35495421/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35495421/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ----------------------------------------------------------------------
