You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2019/05/30 08:22:06 UTC
[ignite] 01/01: TC CHECK
This is an automated email from the ASF dual-hosted git repository.
av pushed a commit to branch ignite-10663-tc
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 5bbc8cd2bea75b35c8af53b82a4c761c5cf88903
Author: Anton Vinogradov <av...@apache.org>
AuthorDate: Thu May 30 11:21:41 2019 +0300
TC CHECK
Signed-off-by: Anton Vinogradov <av...@apache.org>
---
.../processors/cache/GridCacheAdapter.java | 24 +++++++++++-----------
.../distributed/dht/atomic/GridDhtAtomicCache.java | 2 +-
.../dht/colocated/GridDhtColocatedCache.java | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
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 23c06bc..ef10245 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
@@ -726,7 +726,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/*skip values*/true,
false);
- boolean readRepair = opCtx != null && opCtx.readRepair();
+ boolean readRepair = true /* TODO replace with "opCtx != null && opCtx.readRepair()" */;
if (readRepair)
return getWithRepairAsync(
@@ -761,7 +761,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/*task name*/null,
/*deserialize binary*/false,
opCtx != null && opCtx.recovery(),
- opCtx != null && opCtx.readRepair(),
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */,
/*skip values*/true,
/*need ver*/false).chain(new CX1<IgniteInternalFuture<Map<K, V>>, Boolean>() {
@Override public Boolean applyx(IgniteInternalFuture<Map<K, V>> fut) throws IgniteCheckedException {
@@ -1410,7 +1410,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
taskName,
/*deserialize cache objects*/true,
opCtx != null && opCtx.recovery(),
- opCtx != null && opCtx.readRepair(),
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */,
/*skip values*/false,
/*need ver*/false).get().get(key);
}
@@ -1429,7 +1429,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
taskName,
true,
opCtx != null && opCtx.recovery(),
- opCtx != null && opCtx.readRepair(),
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */,
/*skip vals*/false,
/*can remap*/false).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
@Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
@@ -1456,7 +1456,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
taskName,
!(opCtx != null && opCtx.isKeepBinary()),
opCtx != null && opCtx.recovery(),
- opCtx != null && opCtx.readRepair(),
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */,
/*skip values*/false,
/*need ver*/false);
}
@@ -1542,7 +1542,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
key,
!keepBinary,
false,
- opCtx != null && opCtx.readRepair());
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */);
if (ctx.config().getInterceptor() != null)
fut = fut.chain(new CX1<IgniteInternalFuture<V>, V>() {
@@ -1578,7 +1578,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
key0,
!keepBinary,
true,
- opCtx != null && opCtx.readRepair());
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */);
final boolean intercept = ctx.config().getInterceptor() != null;
@@ -1627,7 +1627,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
!ctx.keepBinary(),
false,
opCtx != null && opCtx.recovery(),
- opCtx != null && opCtx.readRepair());
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */);
if (ctx.config().getInterceptor() != null)
map = interceptGet(keys, map);
@@ -1654,7 +1654,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
!ctx.keepBinary(),
true,
opCtx != null && opCtx.recovery(),
- opCtx != null && opCtx.readRepair());
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */);
Collection<CacheEntry<K, V>> res = new HashSet<>();
@@ -1690,7 +1690,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
taskName,
!(opCtx != null && opCtx.isKeepBinary()),
opCtx != null && opCtx.recovery(),
- opCtx != null && opCtx.readRepair(),
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */,
/*skip vals*/false,
/*need ver*/false);
@@ -1729,7 +1729,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
taskName,
!(opCtx != null && opCtx.isKeepBinary()),
opCtx != null && opCtx.recovery(),
- opCtx != null && opCtx.readRepair(),
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */,
/*skip vals*/false,
/*need ver*/true));
@@ -1873,7 +1873,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
taskName,
deserializeBinary,
opCtx != null && opCtx.recovery(),
- opCtx != null && opCtx.readRepair(),
+ true /* TODO replace with "opCtx != null && opCtx.readRepair()" */,
skipVals,
needVer).chain(
new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
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 2de90fa..e7d4b2d 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
@@ -473,7 +473,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
final ExpiryPolicy expiryPlc = skipVals ? null : opCtx != null ? opCtx.expiry() : null;
final boolean skipStore = opCtx != null && opCtx.skipStore();
final boolean recovery = opCtx != null && opCtx.recovery();
- final boolean readRepair = opCtx != null && opCtx.readRepair();
+ final boolean readRepair = true /* TODO replace with "opCtx != null && opCtx.readRepair()" */;
return asyncOp(new CO<IgniteInternalFuture<V>>() {
@Override public IgniteInternalFuture<V> apply() {
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 2066846..5064ecd 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
@@ -195,7 +195,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
final CacheOperationContext opCtx = ctx.operationContextPerCall();
final boolean recovery = opCtx != null && opCtx.recovery();
- final boolean readRepair = opCtx != null && opCtx.readRepair();
+ final boolean readRepair = true /* TODO replace with "opCtx != null && opCtx.readRepair()" */;
// Get operation bypass Tx in Mvcc mode.
if (!ctx.mvccEnabled() && tx != null && !tx.implicit() && !skipTx) {