#ignite-656: fixing skip store
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/22eb6952 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22eb6952 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22eb6952 Branch: refs/heads/ignite-sprint-4 Commit: 22eb695242e64655b4dfdc20227771b6edc69c78 Parents: f3a20e1 Author: Denis Magda <dma...@gridgain.com> Authored: Mon Apr 20 10:44:05 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Apr 20 10:44:05 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridPartitionedGetFuture.java | 4 ++-- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 2 +- .../cache/distributed/near/GridNearCacheAdapter.java | 2 +- .../processors/cache/distributed/near/GridNearGetFuture.java | 3 +-- .../processors/cache/distributed/near/GridNearGetRequest.java | 7 +------ .../cache/distributed/near/GridNearTransactionalCache.java | 2 +- 6 files changed, 7 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22eb6952/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index ec58075..45b9fd1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -372,8 +372,8 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M subjId, taskName == null ? 0 : taskName.hashCode(), expiryPlc != null ? expiryPlc.forAccess() : -1L, - skipVals, - cctx.skipStore()); + skipVals);//, + // cctx.skipStore()); add(fut); // Append new future. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22eb6952/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index b47c284..ce372b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -993,7 +993,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { GridPartitionedGetFuture<K, V> fut = new GridPartitionedGetFuture<>(ctx, keys, topVer, - true, + !ctx.skipStore(), reload, forcePrimary, subjId, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22eb6952/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index 5986b15..98f9d88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -247,7 +247,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda GridNearGetFuture<K, V> fut = new GridNearGetFuture<>(ctx, keys, - true, + !ctx.skipStore(), reload, forcePrimary, txx, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22eb6952/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index ece64a6..b1017d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -372,8 +372,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma subjId, taskName == null ? 0 : taskName.hashCode(), expiryPlc != null ? expiryPlc.forAccess() : -1L, - skipVals, - cctx.skipStore()); + skipVals); add(fut); // Append new future. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22eb6952/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index 28be254..93c869d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java @@ -105,7 +105,6 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep * @param subjId Subject ID. * @param taskNameHash Task name hash. * @param accessTtl New TTL to set after entry is accessed, -1 to leave unchanged. - * @param skipStore Skipe store flag. Used to skip read-through from a persistent storage. */ public GridNearGetRequest( int cacheId, @@ -119,8 +118,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep UUID subjId, int taskNameHash, long accessTtl, - boolean skipVals, - boolean skipStore + boolean skipVals ) { assert futId != null; assert miniId != null; @@ -140,9 +138,6 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep this.taskNameHash = taskNameHash; this.accessTtl = accessTtl; this.skipVals = skipVals; - - if (readThrough) - this.readThrough = !skipStore; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22eb6952/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index 7071597..3cca1d5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -159,7 +159,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> GridNearGetFuture<K, V> fut = new GridNearGetFuture<>(ctx, keys, - readThrough, + readThrough && !ctx.skipStore(), false, false, tx,
