Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bb8b07dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bb8b07dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bb8b07dc Branch: refs/heads/ignite-160 Commit: bb8b07dcee5ba9d6574ea4e929f9275adffbc69a Parents: a86ae90 2372947 Author: vozerov-gridgain <[email protected]> Authored: Thu Feb 5 16:58:38 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Feb 5 16:58:38 2015 +0300 ---------------------------------------------------------------------- .../datagrid/CacheContinuousQueryExample.java | 2 +- .../examples/ScalarCacheAffinityExample1.scala | 2 +- .../examples/ScalarCacheAffinityExample2.scala | 2 +- .../ScalarCacheAffinitySimpleExample.scala | 2 +- .../scalar/examples/ScalarCacheExample.scala | 2 +- .../ScalarCachePopularNumbersExample.scala | 4 +- .../examples/ScalarCacheQueryExample.scala | 2 +- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +- .../ClientAbstractMultiThreadedSelfTest.java | 2 +- .../integration/ClientAbstractSelfTest.java | 4 +- .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../rest/RestBinaryProtocolSelfTest.java | 6 +- .../rest/RestMemcacheProtocolSelfTest.java | 6 +- .../loadtests/client/ClientTcpSslLoadTest.java | 7 +- .../org/apache/ignite/cache/CacheEntry.java | 4 +- .../apache/ignite/cache/CacheProjection.java | 45 +++-- .../processors/cache/GridCacheAdapter.java | 70 +++---- .../cache/GridCacheClearAllRunnable.java | 12 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../cache/GridCacheDeploymentManager.java | 4 +- .../processors/cache/GridCacheEntryImpl.java | 2 +- .../processors/cache/GridCacheEntrySet.java | 2 +- .../processors/cache/GridCacheKeySet.java | 2 +- .../processors/cache/GridCacheMapAdapter.java | 2 +- .../cache/GridCacheProjectionImpl.java | 25 ++- .../processors/cache/GridCacheProxyImpl.java | 32 +++- .../processors/cache/GridCacheUtils.java | 2 +- .../cache/GridCacheValueCollection.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 42 +---- .../GridDistributedCacheAdapter.java | 134 ++++++++++++++ .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 5 - .../distributed/near/GridNearAtomicCache.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 16 +- .../near/GridNearCacheClearAllRunnable.java | 2 +- .../processors/cache/local/GridLocalCache.java | 6 + .../local/atomic/GridLocalAtomicCache.java | 4 +- .../dataload/GridDataLoadCacheUpdaters.java | 12 +- .../visor/cache/VisorCacheClearTask.java | 2 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 22 --- .../cache/GridCacheAbstractFullApiSelfTest.java | 182 ++++++------------- .../GridCacheAbstractProjectionSelfTest.java | 31 +--- .../cache/GridCacheAbstractSelfTest.java | 12 +- .../cache/GridCacheAbstractTxReadTest.java | 2 +- .../cache/GridCacheBasicStoreAbstractTest.java | 8 +- ...acheBasicStoreMultithreadedAbstractTest.java | 2 +- .../cache/GridCacheClearAllSelfTest.java | 32 ++-- ...idCacheGetAndTransformStoreAbstractTest.java | 4 +- .../cache/GridCacheGlobalClearAllSelfTest.java | 6 +- .../GridCacheWriteBehindStoreAbstractTest.java | 6 +- .../GridCacheBasicOpAbstractTest.java | 2 +- .../distributed/GridCacheLockAbstractTest.java | 21 +++ .../GridCacheMultiNodeAbstractTest.java | 2 +- .../GridCacheMultiNodeLockAbstractTest.java | 2 +- ...heAbstractTransformWriteThroughSelfTest.java | 2 +- .../dht/GridCacheDhtEntrySelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../dht/GridCacheDhtEvictionSelfTest.java | 2 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 16 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 8 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 20 +- .../GridCacheNearPartitionedClearSelfTest.java | 4 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 5 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../fs/GridGgfsDataManagerSelfTest.java | 4 +- .../loadtests/cache/GridCacheBenchmark.java | 2 +- .../loadtests/cache/GridCacheLoadTest.java | 2 +- .../GridCacheWriteBehindStoreLoadTest.java | 2 +- .../GridHibernateAccessStrategyAdapter.java | 4 +- ...idHibernateL2CacheConfigurationSelfTest.java | 2 +- .../hibernate/GridHibernateL2CacheSelfTest.java | 2 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 4 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 2 +- .../cache/GridCacheQueryLoadSelfTest.java | 13 +- .../GridCacheQueryMultiThreadedSelfTest.java | 12 +- .../GridCacheReplicatedQuerySelfTest.java | 2 +- .../cache/VisorCacheCompactCommandSpec.scala | 4 +- 77 files changed, 483 insertions(+), 455 deletions(-) ----------------------------------------------------------------------
