You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/13 15:35:00 UTC
[30/39] ignite git commit: wip 2
wip 2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/57218fa9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/57218fa9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/57218fa9
Branch: refs/heads/ignite-4587
Commit: 57218fa9462fef9e5427d3a781f8f899ef71fbab
Parents: 77d1bf6
Author: Max Kozlov <dr...@gmail.com>
Authored: Tue Mar 14 15:30:27 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Tue Mar 14 15:30:27 2017 +0300
----------------------------------------------------------------------
.../configuration/IgniteConfiguration.java | 60 --------------------
.../cache/GridCacheAtomicVersionComparator.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 10 ++--
.../dht/atomic/GridDhtAtomicCache.java | 47 ++++++---------
...idNearAtomicAbstractSingleUpdateRequest.java | 5 +-
.../atomic/GridNearAtomicFullUpdateRequest.java | 5 +-
...GridNearAtomicSingleUpdateFilterRequest.java | 6 +-
.../GridNearAtomicSingleUpdateFuture.java | 4 --
...GridNearAtomicSingleUpdateInvokeRequest.java | 6 +-
.../GridNearAtomicSingleUpdateRequest.java | 6 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 2 -
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 6 --
.../GridCacheAtomicMessageCountSelfTest.java | 4 +-
.../GridCacheInterceptorAbstractSelfTest.java | 5 --
.../IgniteCacheConfigVariationsFullApiTest.java | 6 --
.../IgniteCacheStoreValueAbstractTest.java | 4 --
...dCacheMultithreadedFailoverAbstractTest.java | 5 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 8 ---
.../dht/GridCacheAtomicNearCacheSelfTest.java | 18 +-----
.../IgniteCachePutRetryAbstractSelfTest.java | 1 -
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 7 ---
...achePartitionedMultiNodeFullApiSelfTest.java | 4 --
...eplicatedAtomicMultiNodeFullApiSelfTest.java | 7 ---
.../DataStreamerUpdateAfterLoadTest.java | 3 -
.../tcp/TcpCommunicationSpiDropNodesTest.java | 1 -
.../TcpCommunicationSpiFaultyClientTest.java | 1 -
.../junits/common/GridCommonAbstractTest.java | 13 -----
28 files changed, 36 insertions(+), 213 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index dcd8a80..ca0f201 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -121,12 +121,6 @@ public class IgniteConfiguration {
/** Default message send retries count. */
public static final int DFLT_SEND_RETRY_CNT = 3;
- /** Default number of clock sync samples. */
- public static final int DFLT_CLOCK_SYNC_SAMPLES = 8;
-
- /** Default clock synchronization frequency. */
- public static final int DFLT_CLOCK_SYNC_FREQUENCY = 120000;
-
/** Default discovery startup delay in milliseconds (value is {@code 60,000ms}). */
public static final long DFLT_DISCOVERY_STARTUP_DELAY = 60000;
@@ -305,12 +299,6 @@ public class IgniteConfiguration {
/** Message send retries delay. */
private int sndRetryCnt = DFLT_SEND_RETRY_CNT;
- /** Number of samples for clock synchronization. */
- private int clockSyncSamples = DFLT_CLOCK_SYNC_SAMPLES;
-
- /** Clock synchronization frequency. */
- private long clockSyncFreq = DFLT_CLOCK_SYNC_FREQUENCY;
-
/** Metrics history time. */
private int metricsHistSize = DFLT_METRICS_HISTORY_SIZE;
@@ -511,8 +499,6 @@ public class IgniteConfiguration {
connectorCfg = cfg.getConnectorConfiguration();
classLdr = cfg.getClassLoader();
clientMode = cfg.isClientMode();
- clockSyncFreq = cfg.getClockSyncFrequency();
- clockSyncSamples = cfg.getClockSyncSamples();
consistentId = cfg.getConsistentId();
deployMode = cfg.getDeploymentMode();
discoStartupDelay = cfg.getDiscoveryStartupDelay();
@@ -1420,52 +1406,6 @@ public class IgniteConfiguration {
}
/**
- * Gets number of samples used to synchronize clocks between different nodes.
- * <p>
- * Clock synchronization is used for cache version assignment in {@code CLOCK} order mode.
- *
- * @return Number of samples for one synchronization round.
- */
- public int getClockSyncSamples() {
- return clockSyncSamples;
- }
-
- /**
- * Sets number of samples used for clock synchronization.
- *
- * @param clockSyncSamples Number of samples.
- * @return {@code this} for chaining.
- */
- public IgniteConfiguration setClockSyncSamples(int clockSyncSamples) {
- this.clockSyncSamples = clockSyncSamples;
-
- return this;
- }
-
- /**
- * Gets frequency at which clock is synchronized between nodes, in milliseconds.
- * <p>
- * Clock synchronization is used for cache version assignment in {@code CLOCK} order mode.
- *
- * @return Clock synchronization frequency, in milliseconds.
- */
- public long getClockSyncFrequency() {
- return clockSyncFreq;
- }
-
- /**
- * Sets clock synchronization frequency in milliseconds.
- *
- * @param clockSyncFreq Clock synchronization frequency.
- * @return {@code this} for chaining.
- */
- public IgniteConfiguration setClockSyncFrequency(long clockSyncFreq) {
- this.clockSyncFreq = clockSyncFreq;
-
- return this;
- }
-
- /**
* Gets Max count of threads can be used at rebalancing.
* Minimum is 1.
* @return count.
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
index ac0abec..95e36bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
@@ -28,10 +28,9 @@ public class GridCacheAtomicVersionComparator {
*
* @param one First version.
* @param other Second version.
- * @param ignoreTime {@code True} if global time should be ignored.
* @return Comparison value.
*/
- public int compare(GridCacheVersion one, GridCacheVersion other, boolean ignoreTime) {
+ public int compare(GridCacheVersion one, GridCacheVersion other) {
int topVer = one.topologyVersion();
int otherTopVer = other.topologyVersion();
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 68d171c..f7f262f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -2156,8 +2156,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
assert conflictCtx != null;
- boolean ignoreTime = true;
-
// Use old value?
if (conflictCtx.isUseOld()) {
GridCacheVersion newConflictVer = conflictVer != null ? conflictVer : newVer;
@@ -2166,7 +2164,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (!isNew() && // Not initial value,
verCheck && // and atomic version check,
oldConflictVer.dataCenterId() == newConflictVer.dataCenterId() && // and data centers are equal,
- ATOMIC_VER_COMPARATOR.compare(oldConflictVer, newConflictVer, ignoreTime) == 0 && // and both versions are equal,
+ ATOMIC_VER_COMPARATOR.compare(oldConflictVer, newConflictVer) == 0 && // and both versions are equal,
cctx.writeThrough() && // and store is enabled,
primary) // and we are primary.
{
@@ -2217,8 +2215,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
// Perform version check only in case there was no explicit conflict resolution.
if (conflictCtx == null) {
if (verCheck) {
- if (!isNew() && ATOMIC_VER_COMPARATOR.compare(ver, newVer, ignoreTime) >= 0) {
- if (ATOMIC_VER_COMPARATOR.compare(ver, newVer, ignoreTime) == 0 && cctx.writeThrough() && primary) {
+ if (!isNew() && ATOMIC_VER_COMPARATOR.compare(ver, newVer) >= 0) {
+ if (ATOMIC_VER_COMPARATOR.compare(ver, newVer) == 0 && cctx.writeThrough() && primary) {
if (log.isDebugEnabled())
log.debug("Received entry update with same version as current (will update store) " +
"[entry=" + this + ", newVer=" + newVer + ']');
@@ -2293,7 +2291,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
}
else
- assert isNew() || ATOMIC_VER_COMPARATOR.compare(ver, newVer, ignoreTime) <= 0 :
+ assert isNew() || ATOMIC_VER_COMPARATOR.compare(ver, newVer) <= 0 :
"Invalid version for inner update [isNew=" + isNew() + ", entry=" + this + ", newVer=" + newVer + ']';
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/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 b101b3e..fdb3ba0 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
@@ -704,7 +704,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
@Override public V tryGetAndPut(K key, V val) throws IgniteCheckedException {
A.notNull(key, "key", val, "val");
- return (V) update0(
+ return (V)update0(
key,
val,
null,
@@ -890,8 +890,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/** {@inheritDoc} */
@Override public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K> keys,
EntryProcessor<K, V, T> entryProcessor,
- Object... args) throws IgniteCheckedException
- {
+ Object... args) throws IgniteCheckedException {
return invokeAll0(false, keys, entryProcessor, args).get();
}
@@ -1829,7 +1828,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (req.size() > 1 && // Several keys ...
writeThrough() && !req.skipStore() && // and store is enabled ...
!ctx.store().isLocal() && // and this is not local store ...
- // (conflict resolver should be used for local store)
+ // (conflict resolver should be used for local store)
!ctx.dr().receiveEnabled() // and no DR.
) {
// This method can only be used when there are no replicated entries in the batch.
@@ -2214,8 +2213,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (intercept) {
CacheObject old = entry.innerGet(
- null,
- null,
+ null,
+ null,
/*read swap*/true,
/*read through*/ctx.loadPreviousValue(),
/*metrics*/true,
@@ -2874,8 +2873,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
* @param req Request with keys to lock.
* @param topVer Topology version to lock on.
* @return Collection of locked entries.
- * @throws GridDhtInvalidPartitionException If entry does not belong to local node. If exception is thrown,
- * locks are released.
+ * @throws GridDhtInvalidPartitionException If entry does not belong to local node. If exception is thrown, locks
+ * are released.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
private List<GridDhtCacheEntry> lockEntries(GridNearAtomicAbstractUpdateRequest req, AffinityTopologyVersion topVer)
@@ -2884,19 +2883,14 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
KeyCacheObject key = req.key(0);
while (true) {
- try {
- GridDhtCacheEntry entry = entryExx(key, topVer);
+ GridDhtCacheEntry entry = entryExx(key, topVer);
- GridUnsafe.monitorEnter(entry);
+ GridUnsafe.monitorEnter(entry);
- if (entry.obsolete())
- GridUnsafe.monitorExit(entry);
- else
- return Collections.singletonList(entry);
- }
- catch (GridDhtInvalidPartitionException e) {
- throw e;
- }
+ if (entry.obsolete())
+ GridUnsafe.monitorExit(entry);
+ else
+ return Collections.singletonList(entry);
}
}
else {
@@ -2904,14 +2898,9 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
while (true) {
for (int i = 0; i < req.size(); i++) {
- try {
- GridDhtCacheEntry entry = entryExx(req.key(i), topVer);
+ GridDhtCacheEntry entry = entryExx(req.key(i), topVer);
- locked.add(entry);
- }
- catch (GridDhtInvalidPartitionException e) {
- throw e;
- }
+ locked.add(entry);
}
boolean retry = false;
@@ -3002,8 +2991,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/**
* @param entry Entry to check.
* @param req Update request.
- * @param res Update response. If filter evaluation failed, key will be added to failed keys and method
- * will return false.
+ * @param res Update response. If filter evaluation failed, key will be added to failed keys and method will return
+ * false.
* @return {@code True} if filter evaluation succeeded.
*/
private boolean checkFilter(GridCacheEntryEx entry, GridNearAtomicAbstractUpdateRequest req,
@@ -3303,7 +3292,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
catch (IgniteCheckedException e) {
U.error(msgLog, "Failed to send DHT atomic update response [futId=" + req.futureVersion() +
- ", node=" + nodeId + ", res=" + res + ']', e);
+ ", node=" + nodeId + ", res=" + res + ']', e);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
index 61deeee..107537c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
@@ -106,12 +106,10 @@ public abstract class GridNearAtomicAbstractSingleUpdateRequest extends GridNear
/**
* Constructor.
- *
- * @param cacheId Cache ID.
+ * @param cacheId Cache ID.
* @param nodeId Node ID.
* @param futVer Future version.
* @param fastMap Fast map scheme flag.
- * @param updateVer Update version set if fast map is performed.
* @param topVer Topology version.
* @param topLocked Topology locked flag.
* @param syncMode Synchronization mode.
@@ -129,7 +127,6 @@ public abstract class GridNearAtomicAbstractSingleUpdateRequest extends GridNear
UUID nodeId,
GridCacheVersion futVer,
boolean fastMap,
- @Nullable GridCacheVersion updateVer,
@NotNull AffinityTopologyVersion topVer,
boolean topLocked,
CacheWriteSynchronizationMode syncMode,
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index 08c2474..422a3f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
@@ -172,12 +172,10 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat
/**
* Constructor.
- *
- * @param cacheId Cache ID.
+ * @param cacheId Cache ID.
* @param nodeId Node ID.
* @param futVer Future version.
* @param fastMap Fast map scheme flag.
- * @param updateVer Update version set if fast map is performed.
* @param topVer Topology version.
* @param topLocked Topology locked flag.
* @param syncMode Synchronization mode.
@@ -199,7 +197,6 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat
UUID nodeId,
GridCacheVersion futVer,
boolean fastMap,
- @Nullable GridCacheVersion updateVer,
@NotNull AffinityTopologyVersion topVer,
boolean topLocked,
CacheWriteSynchronizationMode syncMode,
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
index e0c24b2..d768fa7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
@@ -55,12 +55,10 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl
/**
* Constructor.
- *
- * @param cacheId Cache ID.
+ * @param cacheId Cache ID.
* @param nodeId Node ID.
* @param futVer Future version.
* @param fastMap Fast map scheme flag.
- * @param updateVer Update version set if fast map is performed.
* @param topVer Topology version.
* @param topLocked Topology locked flag.
* @param syncMode Synchronization mode.
@@ -79,7 +77,6 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl
UUID nodeId,
GridCacheVersion futVer,
boolean fastMap,
- @Nullable GridCacheVersion updateVer,
@NotNull AffinityTopologyVersion topVer,
boolean topLocked,
CacheWriteSynchronizationMode syncMode,
@@ -98,7 +95,6 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl
nodeId,
futVer,
fastMap,
- updateVer,
topVer,
topLocked,
syncMode,
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index 5630ca8..64d0e96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -535,7 +535,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- null,
topVer,
topLocked,
syncMode,
@@ -556,7 +555,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- null,
topVer,
topLocked,
syncMode,
@@ -575,7 +573,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- null,
topVer,
topLocked,
syncMode,
@@ -597,7 +594,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- null,
topVer,
topLocked,
syncMode,
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index 6582063..711a178 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
@@ -73,12 +73,10 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl
/**
* Constructor.
- *
- * @param cacheId Cache ID.
+ * @param cacheId Cache ID.
* @param nodeId Node ID.
* @param futVer Future version.
* @param fastMap Fast map scheme flag.
- * @param updateVer Update version set if fast map is performed.
* @param topVer Topology version.
* @param topLocked Topology locked flag.
* @param syncMode Synchronization mode.
@@ -97,7 +95,6 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl
UUID nodeId,
GridCacheVersion futVer,
boolean fastMap,
- @Nullable GridCacheVersion updateVer,
@NotNull AffinityTopologyVersion topVer,
boolean topLocked,
CacheWriteSynchronizationMode syncMode,
@@ -116,7 +113,6 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl
nodeId,
futVer,
fastMap,
- updateVer,
topVer,
topLocked,
syncMode,
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
index c3e9fbe..db80a70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
@@ -69,12 +69,10 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin
/**
* Constructor.
- *
- * @param cacheId Cache ID.
+ * @param cacheId Cache ID.
* @param nodeId Node ID.
* @param futVer Future version.
* @param fastMap Fast map scheme flag.
- * @param updateVer Update version set if fast map is performed.
* @param topVer Topology version.
* @param topLocked Topology locked flag.
* @param syncMode Synchronization mode.
@@ -92,7 +90,6 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin
UUID nodeId,
GridCacheVersion futVer,
boolean fastMap,
- @Nullable GridCacheVersion updateVer,
@NotNull AffinityTopologyVersion topVer,
boolean topLocked,
CacheWriteSynchronizationMode syncMode,
@@ -110,7 +107,6 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin
nodeId,
futVer,
fastMap,
- updateVer,
topVer,
topLocked,
syncMode,
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 8123335..7b6f856 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -820,7 +820,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
nodeId,
futVer,
fastMap,
- null,
topVer,
topLocked,
syncMode,
@@ -920,7 +919,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
primary.id(),
futVer,
fastMap,
- null,
topVer,
topLocked,
syncMode,
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
index 34e215f..8b2b7e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
@@ -173,7 +173,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
* @return Version represented as {@code GridUuid}
*/
public IgniteUuid asGridUuid() {
- return new IgniteUuid(new UUID(nodeOrderDrId << 32, topVer << 32), order);
+ return new IgniteUuid(new UUID(topVer, nodeOrderDrId ), order);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 4c47c66..8567591 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -2873,8 +2873,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
checkSize(F.asSet("key1", "key2", "key3"));
- atomicClockModeDelay(cache);
-
IgniteCache<String, Integer> asyncCache = cache.withAsync();
if (async) {
@@ -2896,8 +2894,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
cache.put("key2", 2);
cache.put("key3", 3);
- atomicClockModeDelay(cache);
-
if (async) {
IgniteCache<String, Integer> asyncCache0 = jcache(gridCount() > 1 ? 1 : 0).withAsync();
@@ -2917,8 +2913,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
for (int i = 0; i < entryCnt; i++)
assertEquals(Integer.valueOf(i), cache.get(String.valueOf(i)));
- atomicClockModeDelay(cache);
-
if (async) {
asyncCache.removeAll();
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
index 315cb20..138ca70 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
@@ -87,14 +87,14 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If failed.
*/
- public void testPartitionedPrimary() throws Exception {
+ public void testPartitioned() throws Exception {
checkMessages(false);
}
/**
* @throws Exception If failed.
*/
- public void testClientPrimary() throws Exception {
+ public void testClient() throws Exception {
checkMessages(true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
index 0904fab..71d4203 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
@@ -46,7 +46,6 @@ import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -87,8 +86,6 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
interceptor.disabled = false;
assertEquals(0, interceptor.invokeCnt.get());
-
- atomicClockModeDelay(jcache(0));
}
/** {@inheritDoc} */
@@ -890,8 +887,6 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
// Put from grid 1 to be sure grid 0 does not have value for near key.
jcache(1).putAll(F.asMap(key1, 1, key2, 2, key3, 3));
- atomicClockModeDelay(jcache(1));
-
interceptor.disabled = false;
log.info("Update [op=" + op + ", key1=" + key1 + ", key2=" + key2 + ", key3=" + key3 +
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index e47a18d..1950c72 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -2694,8 +2694,6 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
checkSize(F.asSet("key1", "key2", "key3"));
- atomicClockModeDelay(cache);
-
IgniteCache<String, Integer> asyncCache = cache.withAsync();
if (async) {
@@ -2717,8 +2715,6 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
cache.put("key2", 2);
cache.put("key3", 3);
- atomicClockModeDelay(cache);
-
if (async) {
IgniteCache asyncCache0 = jcache(gridCount() > 1 ? 1 : 0).withAsync();
@@ -2738,8 +2734,6 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
for (int i = 0; i < entryCnt; i++)
assertEquals(Integer.valueOf(i), cache.get(String.valueOf(i)));
- atomicClockModeDelay(cache);
-
if (async) {
asyncCache.removeAll();
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
index c0fb11d..35129a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
@@ -181,8 +181,6 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
cache.remove(key);
- atomicClockModeDelay(cache);
-
try (IgniteDataStreamer<TestKey, TestValue> streamer = grid(0).dataStreamer(null)) {
streamer.allowOverwrite(true);
@@ -350,8 +348,6 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
cache.remove(key);
- atomicClockModeDelay(cache);
-
try (IgniteDataStreamer<TestKey, TestValue> streamer = grid(0).dataStreamer(null)) {
streamer.allowOverwrite(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
index d275936..a275a16 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
@@ -218,9 +218,8 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
if (cacheMode() == PARTITIONED)
ccfg.setBackups(backups());
- if (atomicityMode() != ATOMIC) {
- if (cacheMode() == PARTITIONED)
- ccfg.setNearConfiguration(new NearCacheConfiguration());
+ if (atomicityMode() != ATOMIC && cacheMode() == PARTITIONED) {
+ ccfg.setNearConfiguration(new NearCacheConfiguration());
}
IgniteConfiguration cfg = getConfiguration(nodeName(idx));
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
index ce423f1..b027aea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import javax.cache.CacheException;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedFullApiSelfTest;
import org.apache.ignite.testframework.GridTestUtils;
@@ -55,13 +54,6 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS
return false;
}
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(gridName);
-
- return ccfg;
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
index 4a644da..a1f7429 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
@@ -99,7 +99,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNoBackups() throws Exception {
- startGridsLocal(0);
+ doStartGrids(0);
checkNearCache();
}
@@ -108,7 +108,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testWithBackups() throws Exception {
- startGridsLocal(2);
+ doStartGrids(2);
checkNearCache();
}
@@ -207,8 +207,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < GRID_CNT; i++) {
IgniteCache<Integer, Integer> cache = grid(i).cache(null);
- atomicClockModeDelay(cache);
-
for (Integer key : nearKeys.keySet())
nearKeys.put(key, val);
@@ -293,8 +291,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < GRID_CNT; i++) {
IgniteCache<Integer, Integer> cache = grid(i).cache(null);
- atomicClockModeDelay(cache);
-
log.info("Transform [grid=" + grid(i).name() + ", val=" + val + ']');
cache.invoke(nearKey, new Processor(val));
@@ -386,8 +382,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < GRID_CNT; i++) {
IgniteCache<Integer, Integer> cache = grid(i).cache(null);
- atomicClockModeDelay(cache);
-
for (Integer key : nearKeys)
nearKeys.add(key);
@@ -507,8 +501,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < GRID_CNT; i++) {
IgniteCache<Integer, Integer> cache = grid(i).cache(null);
- atomicClockModeDelay(cache);
-
log.info("Put [grid=" + grid(i).name() + ", val=" + val + ']');
cache.put(nearKey, val);
@@ -610,8 +602,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
IgniteCache<Integer, Integer> primaryCache = G.ignite(
(String) aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME)).cache(null);
- atomicClockModeDelay(cache0);
-
primaryCache.put(nearKey, 2); // This put should see that near entry evicted on grid0 and remove reader.
for (int i = 0; i < GRID_CNT; i++)
@@ -658,8 +648,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
IgniteCache<Integer, Integer> primaryCache = primaryNode.cache(null);
- atomicClockModeDelay(primaryCache);
-
primaryCache.put(nearKey, 2); // Put from primary, check there are no readers.
checkEntry(primaryNode, nearKey, 2, false);
@@ -770,7 +758,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
* @param backups Backups number.
* @throws Exception If failed.
*/
- private void startGridsLocal(int backups) throws Exception {
+ private void doStartGrids(int backups) throws Exception {
this.backups = backups;
startGrids(GRID_CNT);
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index a69c915..3a475a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -56,7 +56,6 @@ import org.apache.ignite.spi.swapspace.inmemory.GridTestSwapSpaceSpi;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager.DEFERRED_ONE_PHASE_COMMIT_ACK_REQUEST_TIMEOUT;
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
index 891e4ba..d5e0481 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
@@ -47,11 +47,4 @@ public class GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest
@Override protected boolean txEnabled() {
return false;
}
-
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(gridName);
-
- return ccfg;
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index 34b67bc..4d43ae1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -99,8 +99,6 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
c0.putAll(putMap);
- atomicClockModeDelay(c0);
-
c1.removeAll(new HashSet<>(putMap.keySet()));
for (int i = 0; i < size; i++) {
@@ -136,8 +134,6 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
for (int i = 0; i < size; i++)
putMap.put(i, i * i);
- atomicClockModeDelay(prj0);
-
info(">>> Before second put.");
prj1.putAll(putMap);
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
index 7a157ed..e828a8b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
@@ -40,11 +40,4 @@ public class GridCacheReplicatedAtomicMultiNodeFullApiSelfTest extends GridCache
@Override protected boolean lockingEnabled() {
return false;
}
-
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(gridName);
-
- return ccfg;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
index 9b3fc7d..abb40a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
@@ -115,9 +115,6 @@ public class DataStreamerUpdateAfterLoadTest extends GridCommonAbstractTest {
IgniteCache<Integer, Integer> cache = updateIgnite.cache(cacheName);
- if (allowOverwrite)
- atomicClockModeDelay(cache);
-
updateIgnite.cache(cacheName).put(key, key + 1);
checkValue(key, key + 1, cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
index b530e36..64266f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
@@ -65,7 +65,6 @@ public class TcpCommunicationSpiDropNodesTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setClockSyncFrequency(300000);
cfg.setFailureDetectionTimeout(1000);
TestCommunicationSpi spi = new TestCommunicationSpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
index c21e6ce..bc2de93 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
@@ -70,7 +70,6 @@ public class TcpCommunicationSpiFaultyClientTest extends GridCommonAbstractTest
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setClockSyncFrequency(300000);
cfg.setFailureDetectionTimeout(1000);
cfg.setClientMode(clientMode);
http://git-wip-us.apache.org/repos/asf/ignite/blob/57218fa9/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 2fab472..5582633 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -89,7 +89,6 @@ import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.transactions.TransactionRollbackException;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.NONE;
import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
@@ -1110,18 +1109,6 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
}
/**
- * In ATOMIC cache with CLOCK mode if key is updated from different nodes at same time
- * only one update wins others are ignored (can happen in test even when updates are executed from
- * different nodes sequentially), this delay is used to avoid lost updates.
- *
- * @param cache Cache.
- * @throws Exception If failed.
- */
- protected void atomicClockModeDelay(IgniteCache cache) throws Exception {
- CacheConfiguration ccfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
- }
-
- /**
* @param exp Expected.
* @param act Actual.
*/