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/03 05:40:43 UTC
[12/50] incubator-ignite git commit: # ignite-136 minor
# ignite-136 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c9821777
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c9821777
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c9821777
Branch: refs/heads/ignite-51
Commit: c982177761dfb3fed83c304a0c6f1b8056f69a91
Parents: 8d0f1b8
Author: sboikov <sb...@gridgain.com>
Authored: Wed Feb 25 09:24:44 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Feb 25 09:24:44 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtLocalPartition.java | 4 +++-
.../processors/cache/GridCacheAbstractLocalStoreSelfTest.java | 6 ++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9821777/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index f8af7dc..93a6012 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -531,6 +531,8 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti
boolean rec = cctx.events().isRecordable(EVT_CACHE_PRELOAD_OBJECT_UNLOADED);
+ boolean locStore = cctx.store().isLocalStore();
+
for (Iterator<GridDhtCacheEntry<K, V>> it = map.values().iterator(); it.hasNext();) {
GridDhtCacheEntry<K, V> cached = it.next();
@@ -538,7 +540,7 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti
if (cached.clearInternal(clearVer, swap)) {
it.remove();
- if (cctx.store().isLocalStore())
+ if (locStore)
cctx.store().removeFromStore(null, cached.key());
if (!cached.isInternal()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9821777/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index 4b647a1..ed1b889 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -47,7 +47,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
+
/** */
public static final TestLocalStore<Integer, Integer> LOCAL_STORE_1 = new TestLocalStore<>();
@@ -119,10 +119,8 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
cacheCfg.setWriteThrough(true);
cacheCfg.setReadThrough(true);
- cacheCfg.setWriteBehindBatchSize(1);
- cacheCfg.setWriteBehindFlushFrequency(1);
- cacheCfg.setWriteBehindFlushSize(1);
cacheCfg.setBackups(backups);
+
return cacheCfg;
}