Merge branch 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-96
Conflicts:
modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2c260529
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c260529
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c260529
Branch: refs/heads/ignite-96
Commit: 2c260529449f233c15a17a17cae5bd6db314c7b9
Parents: 2e80f87 bb8b07d
Author: Yakov Zhdanov <[email protected]>
Authored: Thu Feb 5 18:20:18 2015 +0300
Committer: Yakov Zhdanov <[email protected]>
Committed: Thu Feb 5 18:20:18 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 +-
.../apache/ignite/cache/CacheProjection.java | 45 +++--
.../discovery/GridDiscoveryManager.java | 22 +--
.../affinity/GridAffinityAssignmentCache.java | 23 ++-
.../processors/cache/GridCacheAdapter.java | 70 +++----
.../cache/GridCacheClearAllRunnable.java | 12 +-
.../cache/GridCacheConcurrentMap.java | 2 +-
.../cache/GridCacheDeploymentManager.java | 4 +-
.../processors/cache/GridCacheEntrySet.java | 2 +-
.../processors/cache/GridCacheKeySet.java | 2 +-
.../processors/cache/GridCacheMapAdapter.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 10 +-
.../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 +-
.../GridCacheContinuousQueryAdapter.java | 45 +++--
.../GridCacheContinuousQueryHandler.java | 15 +-
.../continuous/GridContinuousProcessor.java | 15 +-
.../dataload/GridDataLoadCacheUpdaters.java | 12 +-
.../portable/GridPortableInputStream.java | 7 +
.../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 +-
...dCacheContinuousQueryReplicatedSelfTest.java | 65 +++++++
.../fs/GridGgfsDataManagerSelfTest.java | 4 +-
.../loadtests/cache/GridCacheBenchmark.java | 2 +-
.../loadtests/cache/GridCacheLoadTest.java | 2 +-
.../GridCacheWriteBehindStoreLoadTest.java | 2 +-
.../hadoop/jobtracker/GridHadoopJobTracker.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 +-
84 files changed, 640 insertions(+), 496 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c260529/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index c62cbef,ae9e4b9..bb99ea2
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@@ -1481,8 -1480,8 +1481,8 @@@ public abstract class GridCacheAdapter<
* @param filter Optional filter.
* @return {@code True} if cleared.
*/
- private boolean clear(GridCacheVersion obsoleteVer, K key,
+ private boolean clearLocally(GridCacheVersion obsoleteVer, K key,
- @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
+ @Nullable IgnitePredicate<Entry<K, V>>[] filter) {
try {
if (ctx.portableEnabled())
key = (K)ctx.marshalToPortable(key);
@@@ -3599,27 -3598,7 +3599,7 @@@
}
/** {@inheritDoc} */
- @Override public void removeAll(IgnitePredicate<Entry<K, V>>... filter)
throws IgniteCheckedException {
- ctx.denyOnLocalRead();
-
- if (F.isEmptyOrNulls(filter))
- filter = ctx.trueArray();
-
- final IgnitePredicate<Entry<K, V>>[] p = filter;
-
- syncOp(new SyncInOp(false) {
- @Override public void inOp(IgniteTxLocalAdapter<K, V> tx) throws
IgniteCheckedException {
- tx.removeAllAsync(ctx, keySet(p), null, false, null).get();
- }
-
- @Override public String toString() {
- return "removeAll [filter=" + Arrays.toString(p) + ']';
- }
- });
- }
-
- /** {@inheritDoc} */
- @Override public IgniteInternalFuture<?> removeAllAsync(final
IgnitePredicate<CacheEntry<K, V>>... filter) {
+ @Override public IgniteInternalFuture<?> removeAllAsync(final
IgnitePredicate<Entry<K, V>>... filter) {
ctx.denyOnLocalRead();
final Set<? extends K> keys = keySet(filter);
@@@ -4671,8 -4650,8 +4651,8 @@@
* @param keys Keys.
* @param filter Filters to evaluate.
*/
- public void clearAll0(Collection<? extends K> keys,
+ public void clearLocally0(Collection<? extends K> keys,
- @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
+ @Nullable IgnitePredicate<Entry<K, V>>... filter) {
ctx.denyOnFlag(READ);
ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
@@@ -4693,7 -4672,7 +4673,7 @@@
* @param filter Filters to evaluate.
* @return {@code True} if cleared.
*/
- public boolean clear0(K key, @Nullable IgnitePredicate<Entry<K, V>>...
filter) {
- public boolean clearLocally0(K key, @Nullable
IgnitePredicate<CacheEntry<K, V>>... filter) {
++ public boolean clearLocally0(K key, @Nullable IgnitePredicate<Entry<K,
V>>... filter) {
A.notNull(key, "key");
if (keyCheck)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c260529/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c260529/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
