ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [09/44] incubator-ignite git commit: IGNITE-52 - Fixing TCK tests.
Date Sat, 14 Feb 2015 11:09:49 GMT
IGNITE-52 - Fixing TCK tests.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5353dcb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5353dcb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5353dcb7

Branch: refs/heads/ignite-sql-old
Commit: 5353dcb79d11e5b618661bd082a41e7c53276668
Parents: 927708f
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Thu Feb 5 16:26:54 2015 -0800
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Thu Feb 5 16:26:54 2015 -0800

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheAdapter.java       | 4 ++--
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java         | 4 ++--
 .../cache/distributed/dht/colocated/GridDhtColocatedCache.java   | 2 +-
 .../processors/cache/distributed/near/GridNearAtomicCache.java   | 2 +-
 .../cache/distributed/near/GridNearTransactionalCache.java       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5353dcb7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git 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
index 96930f4..1e2d3f1 100644
--- 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
@@ -2070,7 +2070,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
             taskName,
             deserializePortable,
             forcePrimary,
-            accessExpiryPolicy(prj != null ? prj.expiry() : null),
+            skipVals ? null : accessExpiryPolicy(prj != null ? prj.expiry() : null),
             skipVals);
     }
 
@@ -2194,7 +2194,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
                     }
                 }
 
-                if (misses != null && readThrough && ctx.readThrough()) {
+                if (!skipVals && misses != null && readThrough &&
ctx.readThrough()) {
                     final Map<K, GridCacheVersion> loadKeys = misses;
 
                     final IgniteTxLocalAdapter<K, V> tx0 = tx;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5353dcb7/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 5ae1753..12761f5 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
@@ -273,7 +273,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
         final UUID subjId0 = subjId;
 
-        final ExpiryPolicy expiryPlc = prj != null ? prj.expiry() : null;
+        final ExpiryPolicy expiryPlc = skipVals ? null : prj != null ? prj.expiry() : null;
 
         return asyncOp(new CO<IgniteInternalFuture<Map<K, V>>>() {
             @Override public IgniteInternalFuture<Map<K, V>> apply() {
@@ -886,7 +886,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
         long topVer = ctx.affinity().affinityTopologyVersion();
 
-        final GetExpiryPolicy expiry = accessExpiryPolicy(expiryPlc);
+        final GetExpiryPolicy expiry = skipVals ? null : accessExpiryPolicy(expiryPlc);
 
         // Optimisation: try to resolve value locally and escape 'get future' creation.
         if (!reload && !forcePrimary) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5353dcb7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 363df2c..3be32e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -193,7 +193,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
             subjId,
             taskName,
             deserializePortable,
-            accessExpiryPolicy(prj != null ? prj.expiry() : null),
+            skipVals ? null : accessExpiryPolicy(prj != null ? prj.expiry() : null),
             skipVals);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5353dcb7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 6b84024..64d3567 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -390,7 +390,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
             subjId,
             taskName,
             deserializePortable,
-            prj != null ? prj.expiry() : null,
+            skipVals ? null : prj != null ? prj.expiry() : null,
             skipVals);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5353dcb7/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 899cd50..034a227 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
@@ -132,7 +132,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K,
V>
             subjId,
             taskName,
             deserializePortable,
-            prj != null ? prj.expiry() : null,
+            skipVals ? null : prj != null ? prj.expiry() : null,
             skipVals);
     }
 


Mime
View raw message