You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/04 09:20:47 UTC
[8/8] incubator-ignite git commit: # ignite-51
# ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7c65bd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7c65bd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7c65bd0
Branch: refs/heads/ignite-51
Commit: b7c65bd04f85d650eea598f6e7d9db3cff558822
Parents: dd13b74 e229d1b
Author: sboikov <sb...@gridgain.com>
Authored: Wed Mar 4 11:09:36 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Mar 4 11:09:36 2015 +0300
----------------------------------------------------------------------
.../communication/GridIoMessageFactory.java | 10 +
.../processors/cache/CacheEntryPredicate.java | 40 ++
.../cache/CacheEntryPredicateAdapter.java | 97 ++++
.../cache/CacheEntryPredicateContainsValue.java | 133 +++++
.../cache/CacheEntryPredicateHasValue.java | 28 ++
.../cache/CacheEntryPredicateNoValue.java | 28 ++
.../cache/CacheEntrySerializablePredicate.java | 140 ++++++
.../processors/cache/CacheProjection.java | 80 +--
.../processors/cache/EvictableEntryImpl.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 275 ++++-------
.../cache/GridCacheClearAllRunnable.java | 2 +-
.../cache/GridCacheConcurrentMap.java | 64 +--
.../processors/cache/GridCacheContext.java | 103 ++--
.../cache/GridCacheDeploymentManager.java | 107 ++--
.../processors/cache/GridCacheEntryEx.java | 22 +-
.../cache/GridCacheEvictionManager.java | 29 +-
.../processors/cache/GridCacheKeySet.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 62 +--
.../processors/cache/GridCacheMessage.java | 84 ----
.../processors/cache/GridCacheProjectionEx.java | 24 +-
.../cache/GridCacheProjectionImpl.java | 493 ++++---------------
.../processors/cache/GridCacheProxyImpl.java | 93 ++--
.../processors/cache/GridCacheUtils.java | 116 ++++-
.../cache/GridCacheValueCollection.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../GridDistributedCacheAdapter.java | 6 +-
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../distributed/dht/GridDhtLockFuture.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 10 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 8 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 69 ++-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 42 +-
.../dht/colocated/GridDhtColocatedCache.java | 12 +-
.../colocated/GridDhtColocatedLockFuture.java | 6 +-
.../distributed/near/GridNearAtomicCache.java | 36 +-
.../distributed/near/GridNearCacheAdapter.java | 49 +-
.../distributed/near/GridNearLockFuture.java | 12 +-
.../distributed/near/GridNearLockRequest.java | 36 +-
.../near/GridNearTransactionalCache.java | 6 +-
.../cache/distributed/near/GridNearTxLocal.java | 2 +-
.../distributed/near/GridNearTxRemote.java | 4 +-
.../processors/cache/local/GridLocalCache.java | 8 +-
.../cache/local/GridLocalLockFuture.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 102 ++--
.../query/GridCacheDistributedQueryManager.java | 4 +-
.../cache/query/GridCacheLocalQueryFuture.java | 3 +-
.../cache/query/GridCacheQueriesImpl.java | 4 +-
.../cache/query/GridCacheQueryAdapter.java | 8 +-
.../cache/query/GridCacheQueryInfo.java | 7 +-
.../cache/query/GridCacheQueryManager.java | 42 +-
.../cache/query/GridCacheQueryRequest.java | 20 +-
.../cache/transactions/IgniteInternalTx.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 2 +-
.../cache/transactions/IgniteTxEntry.java | 23 +-
.../transactions/IgniteTxLocalAdapter.java | 56 +--
.../cache/transactions/IgniteTxLocalEx.java | 4 +-
.../org/apache/ignite/internal/util/F0.java | 90 ++++
.../ignite/internal/util/lang/GridFunc.java | 52 --
.../cache/GridCacheAbstractFullApiSelfTest.java | 8 +-
.../processors/cache/GridCacheTestEntryEx.java | 22 +-
.../distributed/GridCacheEventAbstractTest.java | 12 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 15 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 21 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 34 --
.../cache/GridCacheAbstractQuerySelfTest.java | 20 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 17 -
.../cache/spring/SpringDynamicCacheManager.java | 10 +-
70 files changed, 1479 insertions(+), 1469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7c65bd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7c65bd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index fd9c76b,4a2cf90..577a978
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@@ -290,12 -281,11 +281,9 @@@ public class GridCacheContext<K, V> imp
log = ctx.log(getClass());
- noValArr = new IgnitePredicate[]{F.cacheNoGetValue()};
- hasValArr = new IgnitePredicate[]{F.cacheHasGetValue()};
- noPeekArr = new IgnitePredicate[]{F.cacheNoPeekValue()};
- hasPeekArr = new IgnitePredicate[]{F.cacheHasPeekValue()};
- trueArr = new IgnitePredicate[]{F.alwaysTrue()};
+ noValArr = new CacheEntryPredicate[]{new CacheEntrySerializablePredicate(new CacheEntryPredicateNoValue())};
+ hasValArr = new CacheEntryPredicate[]{new CacheEntrySerializablePredicate(new CacheEntryPredicateHasValue())};
- cacheObjCtx = new CacheObjectContext(ctx);
-
// Create unsafe memory only if writing values
unsafeMemory = (cacheCfg.getMemoryMode() == OFFHEAP_VALUES || cacheCfg.getMemoryMode() == OFFHEAP_TIERED) ?
new GridUnsafeMemory(cacheCfg.getOffHeapMaxMemory()) : null;