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:34:31 UTC
[01/39] ignite git commit: Delete CLOCK mode in
CacheAtomicWriteOrderMode.
Repository: ignite
Updated Branches:
refs/heads/ignite-4587 [created] 0bfb5851c
Delete CLOCK mode in CacheAtomicWriteOrderMode.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f0dcbbde
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f0dcbbde
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f0dcbbde
Branch: refs/heads/ignite-4587
Commit: f0dcbbdecd10ee9afee3cb0c5a96bb1540d0c06a
Parents: 4e1fc40
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 13 12:20:51 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 13 12:20:51 2017 +0300
----------------------------------------------------------------------
.../ignite/cache/CacheAtomicWriteOrderMode.java | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0dcbbde/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
index 38b4556..2595d29 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
@@ -23,27 +23,11 @@ import org.jetbrains.annotations.Nullable;
* Cache write ordering mode. This enumeration is taken into account only in {@link CacheAtomicityMode#ATOMIC}
* atomicity mode. Write ordering mode determines which node assigns the write version, sender or the primary node.
* <p>
- * For example, {@link #CLOCK} mode assigns write versions on a sender node which generally leads to better
- * performance in {@link CacheWriteSynchronizationMode#FULL_SYNC} synchronization mode, since in this case
- * sender can send write requests to primary and backups at the same time. Otherwise, if ordering mode is
- * {@link #PRIMARY}, it would only send request to primary node, which in turn will assign write version
+ * For example, {@link #PRIMARY} mode would only send request to primary node, which in turn will assign write version
* and forward it to backups.
- * <p>
- * {@link #CLOCK} mode will be automatically configured only with {@link CacheWriteSynchronizationMode#FULL_SYNC}
- * write synchronization mode, as for other synchronization modes it does not render better performance.
*/
public enum CacheAtomicWriteOrderMode {
/**
- * In this mode, write versions are assigned on a sender node which generally leads to better
- * performance in {@link CacheWriteSynchronizationMode#FULL_SYNC} synchronization mode, since in this case
- * sender can send write requests to primary and backups at the same time.
- * <p>
- * This mode will be automatically configured only with {@link CacheWriteSynchronizationMode#FULL_SYNC}
- * write synchronization mode, as for other synchronization modes it does not render better performance.
- */
- CLOCK,
-
- /**
* Cache version is assigned only on primary node. This means that sender will only send write request
* to primary node, which in turn will assign write version and forward it to backups.
*/
[19/39] ignite git commit: Delete support write order mode in
web-console.
Posted by ag...@apache.org.
Delete support write order mode in web-console.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed3370f2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed3370f2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed3370f2
Branch: refs/heads/ignite-4587
Commit: ed3370f2fd750485a11d850b515092e4b26b6940
Parents: a608412
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 1 23:42:42 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 1 23:42:42 2017 +0300
----------------------------------------------------------------------
modules/web-console/backend/app/mongo.js | 1 -
.../configuration/generator/ConfigurationGenerator.js | 1 -
.../modules/configuration/generator/PlatformGenerator.js | 1 -
.../generator/defaults/Cache.platform.service.js | 4 ----
.../configuration/generator/defaults/Cache.service.js | 3 ---
.../modules/states/configuration/caches/concurrency.jade | 11 -----------
6 files changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed3370f2/modules/web-console/backend/app/mongo.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js
index 2d252b9..242df10 100644
--- a/modules/web-console/backend/app/mongo.js
+++ b/modules/web-console/backend/app/mongo.js
@@ -262,7 +262,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
invalidate: Boolean,
defaultLockTimeout: Number,
- atomicWriteOrderMode: {type: String, enum: ['CLOCK', 'PRIMARY']},
writeSynchronizationMode: {type: String, enum: ['FULL_SYNC', 'FULL_ASYNC', 'PRIMARY_SYNC']},
sqlEscapeAll: Boolean,
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed3370f2/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
index 670b828..d099cb3 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -1639,7 +1639,6 @@ export default class IgniteConfigurationGenerator {
static cacheConcurrency(cache, ccfg = this.cacheConfigurationBean(cache)) {
ccfg.intProperty('maxConcurrentAsyncOperations')
.intProperty('defaultLockTimeout')
- .enumProperty('atomicWriteOrderMode')
.enumProperty('writeSynchronizationMode');
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed3370f2/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js
index b076193..3a77966 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js
@@ -414,7 +414,6 @@ export default ['JavaTypes', 'igniteClusterPlatformDefaults', 'igniteCachePlatfo
static cacheConcurrency(cache, ccfg = this.cacheConfigurationBean(cache)) {
ccfg.intProperty('maxConcurrentAsyncOperations')
.intProperty('defaultLockTimeout')
- .enumProperty('atomicWriteOrderMode')
.enumProperty('writeSynchronizationMode');
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed3370f2/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js
index eeac3a0..6c44f36 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.platform.service.js
@@ -33,10 +33,6 @@ const DFLT_CACHE = {
value: 'ONHEAP_TIERED',
mapper: enumValueMapper
},
- atomicWriteOrderMode: {
- clsName: 'org.apache.ignite.cache.CacheAtomicWriteOrderMode',
- mapper: enumValueMapper
- },
writeSynchronizationMode: {
clsName: 'org.apache.ignite.cache.CacheWriteSynchronizationMode',
value: 'PRIMARY_SYNC',
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed3370f2/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js
index 14b315f..573c782 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js
@@ -52,9 +52,6 @@ const DFLT_CACHE = {
writeBehindFlushThreadCount: 1,
maxConcurrentAsyncOperations: 500,
defaultLockTimeout: 0,
- atomicWriteOrderMode: {
- clsName: 'org.apache.ignite.cache.CacheAtomicWriteOrderMode'
- },
writeSynchronizationMode: {
clsName: 'org.apache.ignite.cache.CacheWriteSynchronizationMode',
value: 'PRIMARY_SYNC'
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed3370f2/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.jade b/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.jade
index ffcd568..f1842ad 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.jade
+++ b/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.jade
@@ -37,17 +37,6 @@ include /app/helpers/jade/mixins.jade
+number('Default lock timeout:', model + '.defaultLockTimeout', '"defaultLockTimeout"', 'true', '0', '0',
'Default lock acquisition timeout in milliseconds<br/>\
If <b>0</b> then lock acquisition will never timeout')
- .settings-row(ng-hide='#{model}.atomicityMode === "TRANSACTIONAL"')
- +dropdown('Entry versioning:', model + '.atomicWriteOrderMode', '"atomicWriteOrderMode"', 'true', 'Choose versioning',
- '[\
- {value: "CLOCK", label: "CLOCK"},\
- {value: "PRIMARY", label: "PRIMARY"}\
- ]',
- 'Write ordering mode determines which node assigns the write version, sender or the primary node\
- <ul>\
- <li>CLOCK - in this mode write versions are assigned on a sender node which generally leads to better performance</li>\
- <li>PRIMARY - in this mode version is assigned only on primary node. This means that sender will only send write request to primary node, which in turn will assign write version and forward it to backups</li>\
- </ul>')
.settings-row
+dropdown('Write synchronization mode:', model + '.writeSynchronizationMode', '"writeSynchronizationMode"', 'true', 'PRIMARY_SYNC',
'[\
[38/39] ignite git commit: Fix size GridCacheVersion bug.
Posted by ag...@apache.org.
Fix size GridCacheVersion bug.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/530075bc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/530075bc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/530075bc
Branch: refs/heads/ignite-4587
Commit: 530075bce79d64dd23128adc77ceccf2cd6577fa
Parents: 7db3b40 7701104
Author: Max Kozlov <dr...@gmail.com>
Authored: Thu Mar 16 16:10:02 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Thu Mar 16 16:10:02 2017 +0300
----------------------------------------------------------------------
.../cache/GridCacheSwapEntryImpl.java | 4 ++--
.../dht/GridPartitionedGetFuture.java | 2 +-
.../cache/transactions/IgniteTxEntry.java | 8 +++----
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 22 ++++++++++----------
.../processors/cache/GridCacheMvccSelfTest.java | 4 ++--
.../transactions/DepthFirstSearchTest.java | 18 ++++++++--------
7 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/530075bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
[09/39] ignite git commit: Remove field updVer in
GridNearAtomicAbstractUpdateFuture. Remove parametr updVer in
GridNearAtomicSingleUpdateFuture.mapSingleUpdate,
GridNearAtomicUpdateFuture.mapSingleUpdate and
GridNearAtomicUpdateFuture.mapUpdate.
Posted by ag...@apache.org.
Remove field updVer in GridNearAtomicAbstractUpdateFuture. Remove parametr updVer in GridNearAtomicSingleUpdateFuture.mapSingleUpdate, GridNearAtomicUpdateFuture.mapSingleUpdate and GridNearAtomicUpdateFuture.mapUpdate.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a96fdf1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a96fdf1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a96fdf1
Branch: refs/heads/ignite-4587
Commit: 8a96fdf199bf476bd417192d795fcf4d1135deb8
Parents: a61e566
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 27 16:25:13 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 27 16:25:13 2017 +0300
----------------------------------------------------------------------
.../atomic/GridNearAtomicAbstractUpdateFuture.java | 3 ---
.../atomic/GridNearAtomicSingleUpdateFuture.java | 17 ++++++-----------
.../dht/atomic/GridNearAtomicUpdateFuture.java | 17 ++++-------------
3 files changed, 10 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a96fdf1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index 0024984..c720c8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
@@ -112,9 +112,6 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt
/** Current topology version. */
protected AffinityTopologyVersion topVer = AffinityTopologyVersion.ZERO;
- /** */
- protected GridCacheVersion updVer;
-
/** Topology version when got mapping error. */
protected AffinityTopologyVersion mapErrTopVer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a96fdf1/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 964e9a5..5630ca8 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
@@ -281,7 +281,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
new AffinityTopologyVersion(cause.topologyVersion().topologyVersion() + 1);
err = null;
- updVer = null;
}
}
}
@@ -449,14 +448,12 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
GridNearAtomicAbstractUpdateRequest singleReq0 = null;
try {
- singleReq0 = mapSingleUpdate(topVer, futVer, updVer);
+ singleReq0 = mapSingleUpdate(topVer, futVer);
synchronized (mux) {
assert this.futVer == futVer || (this.isDone() && this.error() != null);
assert this.topVer == topVer;
- this.updVer = updVer;
-
resCnt = 0;
req = singleReq0;
@@ -503,13 +500,11 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
/**
* @param topVer Topology version.
* @param futVer Future version.
- * @param updVer Update version.
* @return Request.
* @throws Exception If failed.
*/
private GridNearAtomicAbstractUpdateRequest mapSingleUpdate(AffinityTopologyVersion topVer,
- GridCacheVersion futVer,
- @Nullable GridCacheVersion updVer) throws Exception {
+ GridCacheVersion futVer) throws Exception {
if (key == null)
throw new NullPointerException("Null key.");
@@ -540,7 +535,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
@@ -561,7 +556,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
@@ -580,7 +575,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
@@ -602,7 +597,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a96fdf1/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 5d12dce..8123335 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
@@ -374,8 +374,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
for (Object key : failedKeys)
remapKeys.add(cctx.toCacheKeyObject(key));
-
- updVer = null;
}
}
}
@@ -629,13 +627,12 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
if (size == 1 && !fastMap) {
assert remapKeys == null || remapKeys.size() == 1;
- singleReq0 = mapSingleUpdate(topVer, futVer, updVer);
+ singleReq0 = mapSingleUpdate(topVer, futVer);
}
else {
Map<UUID, GridNearAtomicFullUpdateRequest> pendingMappings = mapUpdate(topNodes,
topVer,
futVer,
- updVer,
remapKeys);
if (pendingMappings.size() == 1)
@@ -660,8 +657,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
assert this.futVer == futVer || (this.isDone() && this.error() != null);
assert this.topVer == topVer;
- this.updVer = updVer;
-
resCnt = 0;
singleReq = singleReq0;
@@ -721,7 +716,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
* @param topNodes Cache nodes.
* @param topVer Topology version.
* @param futVer Future version.
- * @param updVer Update version.
* @param remapKeys Keys to remap.
* @return Mapping.
* @throws Exception If failed.
@@ -730,7 +724,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
private Map<UUID, GridNearAtomicFullUpdateRequest> mapUpdate(Collection<ClusterNode> topNodes,
AffinityTopologyVersion topVer,
GridCacheVersion futVer,
- @Nullable GridCacheVersion updVer,
@Nullable Collection<KeyCacheObject> remapKeys) throws Exception {
Iterator<?> it = null;
@@ -827,7 +820,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
nodeId,
futVer,
fastMap,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
@@ -859,13 +852,11 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
/**
* @param topVer Topology version.
* @param futVer Future version.
- * @param updVer Update version.
* @return Request.
* @throws Exception If failed.
*/
private GridNearAtomicFullUpdateRequest mapSingleUpdate(AffinityTopologyVersion topVer,
- GridCacheVersion futVer,
- @Nullable GridCacheVersion updVer) throws Exception {
+ GridCacheVersion futVer) throws Exception {
Object key = F.first(keys);
Object val;
@@ -929,7 +920,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
primary.id(),
futVer,
fastMap,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
[07/39] ignite git commit: Merge branch 'master' into ignite-4587
Posted by ag...@apache.org.
Merge branch 'master' into ignite-4587
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc7a9bd8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc7a9bd8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc7a9bd8
Branch: refs/heads/ignite-4587
Commit: bc7a9bd88b8d9fc18a291adbb7eb05dd1c2c0862
Parents: 92e11e8 7492843
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 27 14:33:08 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 27 14:33:08 2017 +0300
----------------------------------------------------------------------
.gitignore | 1 +
DEVNOTES.txt | 5 +-
NOTICE | 2 +-
assembly/LICENSE_FABRIC | 35 +-
assembly/LICENSE_HADOOP | 17 +-
assembly/NOTICE_FABRIC | 2 +-
assembly/NOTICE_HADOOP | 2 +-
assembly/dependencies-fabric-lgpl.xml | 1 +
assembly/dependencies-fabric.xml | 1 +
assembly/release-base.xml | 5 +
bin/ignite.sh | 9 +
config/dotnet/default-dotnet.xml | 45 +
examples/config/spark/example-shared-rdd.xml | 83 +
examples/pom-standalone-lgpl.xml | 6 +
examples/pom-standalone.xml | 12 +
examples/pom.xml | 43 +-
examples/schema-import/bin/h2-server.bat | 2 +-
examples/schema-import/bin/h2-server.sh | 4 +-
.../schema-import/bin/schema-import.properties | 2 +-
examples/schema-import/pom.xml | 2 +-
.../ignite/examples/ExampleNodeStartup.java | 2 +-
.../examples/datagrid/CachePutGetExample.java | 2 +-
.../scalar/examples/ScalarJvmCloudExample.scala | 2 +-
.../examples/spark/ScalarSharedRDDExample.scala | 89 +
.../ignite/examples/spark/SharedRDDExample.java | 127 +
.../ignite/examples/spark/package-info.java | 22 +
.../IgniteExamplesJ8SelfTestSuite.java | 1 +
.../tests/examples/ScalarExamplesSelfTest.scala | 6 +
.../examples/SharedRDDExampleSelfTest.java | 36 +
.../IgniteExamplesSparkSelfTestSuite.java | 46 +
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 2 +-
.../src/main/resources/META-INF/licenses.txt.vm | 7 +-
modules/aws/pom.xml | 2 +-
.../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 37 +-
.../TcpDiscoveryS3IpFinderAbstractSelfTest.java | 84 +
...3IpFinderAwsCredentialsProviderSelfTest.java | 46 +
...scoveryS3IpFinderAwsCredentialsSelfTest.java | 45 +
.../s3/TcpDiscoveryS3IpFinderSelfTest.java | 79 -
.../ignite/testsuites/IgniteS3TestSuite.java | 26 +-
modules/benchmarks/pom.xml | 2 +-
.../jmh/misc/JmhIncrementBenchmark.java | 95 +
modules/camel/pom.xml | 2 +-
.../stream/camel/IgniteCamelStreamerTest.java | 4 +-
modules/cassandra/pom.xml | 26 +-
modules/cassandra/serializers/pom.xml | 4 +-
modules/cassandra/store/pom.xml | 4 +-
.../store/cassandra/CassandraCacheStore.java | 6 +
.../store/cassandra/datasource/DataSource.java | 9 +
.../cassandra/persistence/PojoKeyField.java | 2 +-
modules/clients/pom.xml | 12 +-
.../ClientAbstractMultiNodeSelfTest.java | 8 +-
...BinaryMarshallerInsertStatementSelfTest.java | 2 -
...cBinaryMarshallerMergeStatementSelfTest.java | 2 -
.../internal/jdbc2/JdbcMetadataSelfTest.java | 2 +-
.../rest/ClientMemcachedProtocolSelfTest.java | 4 +-
.../rest/protocols/tcp/MockNioSession.java | 25 +-
.../tcp/redis/RedisProtocolSelfTest.java | 13 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +-
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 3 +-
modules/cloud/pom.xml | 8 +-
modules/codegen/pom.xml | 2 +-
.../ignite/codegen/MessageCodeGenerator.java | 2 +-
modules/core/pom.xml | 2 +-
modules/core/src/main/java/META-INF/NOTICE | 2 +-
.../java/org/apache/ignite/IgniteLogger.java | 10 +-
.../java/org/apache/ignite/IgniteMessaging.java | 11 +-
.../java/org/apache/ignite/IgniteServices.java | 16 +
.../apache/ignite/IgniteSystemProperties.java | 30 +
.../org/apache/ignite/cache/QueryEntity.java | 22 +-
.../ignite/cache/affinity/AffinityKey.java | 4 +-
.../rendezvous/RendezvousAffinityFunction.java | 80 +-
.../ignite/cache/query/SqlFieldsQuery.java | 6 +
.../org/apache/ignite/cache/query/SqlQuery.java | 25 +
.../cache/store/CacheLoadOnlyStoreAdapter.java | 6 +-
.../ignite/cache/store/CacheStoreAdapter.java | 6 +
.../store/jdbc/CacheAbstractJdbcStore.java | 11 +-
.../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 19 +-
.../store/jdbc/JdbcTypesDefaultTransformer.java | 119 +-
.../cache/store/jdbc/JdbcTypesTransformer.java | 17 +
.../store/jdbc/dialect/BasicJdbcDialect.java | 31 +-
.../configuration/CacheConfiguration.java | 4 +-
.../configuration/IgniteConfiguration.java | 50 +-
.../org/apache/ignite/events/CacheEvent.java | 6 +-
.../ignite/events/CacheQueryReadEvent.java | 8 +-
.../internal/GridEventConsumeHandler.java | 7 +-
.../ignite/internal/GridJobContextImpl.java | 4 +-
.../ignite/internal/GridKernalContext.java | 10 +
.../ignite/internal/GridKernalContextImpl.java | 17 +-
.../ignite/internal/GridKernalGatewayImpl.java | 25 +-
.../internal/GridMessageListenHandler.java | 5 +
.../internal/GridPerformanceSuggestions.java | 92 -
.../org/apache/ignite/internal/GridTopic.java | 11 +-
.../ignite/internal/IgniteInternalFuture.java | 11 +
.../apache/ignite/internal/IgniteKernal.java | 145 +-
.../ignite/internal/IgniteMessagingImpl.java | 6 +-
.../ignite/internal/IgniteServicesImpl.java | 9 +-
.../ignite/internal/IgniteVersionUtils.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 32 +-
.../ignite/internal/MarshallerContextImpl.java | 4 +-
.../internal/StripedExecutorMXBeanAdapter.java | 90 +
.../internal/binary/BinaryClassDescriptor.java | 12 +-
.../ignite/internal/binary/BinaryContext.java | 4 +-
.../internal/binary/BinaryEnumObjectImpl.java | 14 +-
.../internal/binary/BinaryMarshaller.java | 1 -
.../ignite/internal/binary/BinaryMetadata.java | 5 +-
.../internal/binary/BinaryObjectExImpl.java | 8 +-
.../ignite/internal/binary/BinaryTypeProxy.java | 15 +-
.../ignite/internal/binary/BinaryUtils.java | 14 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 11 +-
.../GridClientConnectionManagerAdapter.java | 8 +-
.../impl/connection/GridClientTopology.java | 53 +-
.../impl/GridRouterCommandLineStartup.java | 4 +-
.../client/router/impl/GridTcpRouterImpl.java | 1 +
.../client/util/GridClientConsistentHash.java | 14 +-
.../cluster/ClusterNodeLocalMapImpl.java | 1 -
.../internal/jdbc2/JdbcSqlFieldsQuery.java | 1 -
.../ignite/internal/jdbc2/JdbcStatement.java | 2 -
.../internal/managers/GridManagerAdapter.java | 2 +-
.../managers/communication/GridIoManager.java | 285 +-
.../managers/communication/GridIoMessage.java | 13 +
.../communication/GridIoMessageFactory.java | 46 +-
.../communication/IgniteIoTestMessage.java | 235 ++
.../discovery/GridDiscoveryManager.java | 360 +-
.../eventstorage/GridEventStorageManager.java | 34 +-
.../internal/mxbean/IgniteStandardMXBean.java | 12 +-
.../affinity/GridAffinityAssignmentCache.java | 8 +-
.../affinity/GridAffinityProcessor.java | 2 +-
.../cache/CacheAffinitySharedManager.java | 2 +-
.../cache/CacheEvictableEntryImpl.java | 4 +-
.../cache/CacheInvokeDirectResult.java | 2 +-
.../processors/cache/CacheInvokeResult.java | 2 +-
.../processors/cache/CacheLazyEntry.java | 4 +-
.../processors/cache/CacheMetricsImpl.java | 10 +-
.../processors/cache/CacheObjectAdapter.java | 7 +-
.../cache/CacheStoreBalancingWrapper.java | 6 +
.../processors/cache/EntryGetResult.java | 65 +
.../processors/cache/GridCacheAdapter.java | 897 ++---
.../cache/GridCacheAffinityManager.java | 60 +-
.../processors/cache/GridCacheAtomicFuture.java | 3 +-
.../processors/cache/GridCacheContext.java | 21 +-
.../cache/GridCacheDeploymentManager.java | 4 +-
.../processors/cache/GridCacheEntryEx.java | 44 +-
.../cache/GridCacheEvictionManager.java | 66 +-
.../processors/cache/GridCacheGateway.java | 48 +-
.../processors/cache/GridCacheIoManager.java | 19 +-
.../cache/GridCacheLoaderWriterStore.java | 6 +
.../processors/cache/GridCacheMapEntry.java | 155 +-
.../processors/cache/GridCacheMessage.java | 7 +
.../cache/GridCacheMvccCandidate.java | 9 +-
.../GridCachePartitionExchangeManager.java | 205 +-
.../processors/cache/GridCachePreloader.java | 17 +-
.../cache/GridCachePreloaderAdapter.java | 13 +-
.../processors/cache/GridCacheProcessor.java | 107 +-
.../processors/cache/GridCacheReturn.java | 2 +-
.../processors/cache/GridCacheSwapManager.java | 2 +-
.../processors/cache/GridCacheTtlManager.java | 4 +-
.../processors/cache/GridCacheUtils.java | 93 +-
.../processors/cache/IgniteCacheProxy.java | 9 +-
.../processors/cache/QueryCursorImpl.java | 6 +-
.../processors/cache/ReaderArguments.java | 74 +
.../cache/affinity/GridCacheAffinityImpl.java | 18 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 5 +-
.../CacheDataStructuresManager.java | 8 +-
.../distributed/GridCacheTxRecoveryFuture.java | 4 +-
.../GridDistributedCacheAdapter.java | 9 +-
.../distributed/GridDistributedCacheEntry.java | 3 -
.../distributed/GridDistributedLockRequest.java | 5 +
.../GridDistributedLockResponse.java | 1 -
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../GridDistributedUnlockRequest.java | 5 +
.../dht/GridClientPartitionTopology.java | 134 +-
.../dht/GridDhtAssignmentFetchFuture.java | 8 +-
.../distributed/dht/GridDhtCacheAdapter.java | 61 +-
.../distributed/dht/GridDhtCacheEntry.java | 2 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 85 +-
.../distributed/dht/GridDhtGetSingleFuture.java | 77 +-
.../distributed/dht/GridDhtLocalPartition.java | 126 +-
.../distributed/dht/GridDhtLockFuture.java | 32 +-
.../distributed/dht/GridDhtLockResponse.java | 9 +-
.../dht/GridDhtPartitionTopology.java | 29 +-
.../dht/GridDhtPartitionTopologyImpl.java | 304 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 21 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 82 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 126 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 18 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 52 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 2 +-
.../distributed/dht/GridDhtUnlockRequest.java | 3 +-
.../dht/GridPartitionedGetFuture.java | 13 +-
.../dht/GridPartitionedSingleGetFuture.java | 14 +-
.../GridDhtAtomicAbstractUpdateFuture.java | 9 +-
.../GridDhtAtomicAbstractUpdateRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 513 ++-
.../atomic/GridDhtAtomicSingleUpdateFuture.java | 6 +-
.../GridDhtAtomicSingleUpdateRequest.java | 10 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 6 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 15 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 31 +-
.../GridNearAtomicAbstractUpdateFuture.java | 34 +-
.../atomic/GridNearAtomicFullUpdateRequest.java | 6 +-
.../GridNearAtomicSingleUpdateFuture.java | 43 +-
.../GridNearAtomicSingleUpdateRequest.java | 5 +
.../dht/atomic/GridNearAtomicUpdateFuture.java | 52 +-
.../atomic/GridNearAtomicUpdateResponse.java | 35 +-
.../dht/colocated/GridDhtColocatedCache.java | 39 +-
.../colocated/GridDhtColocatedLockFuture.java | 18 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 8 +-
.../dht/preloader/GridDhtPartitionDemander.java | 286 +-
.../dht/preloader/GridDhtPartitionFullMap.java | 18 +-
.../dht/preloader/GridDhtPartitionMap2.java | 3 +-
.../dht/preloader/GridDhtPartitionSupplier.java | 12 +-
.../GridDhtPartitionsExchangeFuture.java | 91 +-
.../dht/preloader/GridDhtPreloader.java | 59 +-
.../distributed/near/GridNearAtomicCache.java | 68 +-
.../distributed/near/GridNearCacheEntry.java | 6 +-
.../distributed/near/GridNearGetFuture.java | 31 +-
.../distributed/near/GridNearGetRequest.java | 82 +-
.../distributed/near/GridNearLockFuture.java | 15 +-
.../distributed/near/GridNearLockRequest.java | 81 +-
...arOptimisticSerializableTxPrepareFuture.java | 8 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 28 +-
.../GridNearPessimisticTxPrepareFuture.java | 6 +-
.../near/GridNearSingleGetRequest.java | 62 +-
.../near/GridNearTransactionalCache.java | 8 +-
.../near/GridNearTxFinishFuture.java | 61 +-
.../cache/distributed/near/GridNearTxLocal.java | 67 +-
.../processors/cache/local/GridLocalCache.java | 1 +
.../local/atomic/GridLocalAtomicCache.java | 186 +-
.../processors/cache/query/CacheQuery.java | 1 -
.../query/GridCacheDistributedQueryManager.java | 2 +-
.../cache/query/GridCacheQueryAdapter.java | 12 +-
.../cache/query/GridCacheQueryManager.java | 208 +-
.../cache/query/GridCacheQueryRequest.java | 8 +-
.../cache/query/GridCacheSqlQuery.java | 6 +-
.../continuous/CacheContinuousQueryEvent.java | 8 +-
.../continuous/CacheContinuousQueryHandler.java | 101 +-
.../continuous/CacheContinuousQueryManager.java | 6 +-
.../cache/store/CacheStoreManager.java | 4 +-
.../store/GridCacheStoreManagerAdapter.java | 64 +-
.../cache/store/GridCacheWriteBehindStore.java | 8 +-
.../cache/transactions/IgniteTxAdapter.java | 4 +-
.../cache/transactions/IgniteTxEntry.java | 2 +-
.../cache/transactions/IgniteTxHandler.java | 27 +-
.../transactions/IgniteTxLocalAdapter.java | 156 +-
.../cache/transactions/IgniteTxLocalEx.java | 3 +
.../cache/transactions/IgniteTxManager.java | 10 +-
.../cache/transactions/IgniteTxStateImpl.java | 1 -
.../cache/transactions/TxDeadlockDetection.java | 2 +-
.../cache/transactions/TxEntryValueHolder.java | 6 +-
.../cache/version/GridCacheVersion.java | 2 +-
.../GridCacheVersionConflictContext.java | 2 +-
.../cache/version/GridCacheVersionManager.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 7 +-
.../processors/clock/GridClockServer.java | 4 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../closure/GridClosureProcessor.java | 35 +-
.../continuous/GridContinuousHandler.java | 5 +
.../continuous/GridContinuousMessage.java | 2 +-
.../continuous/GridContinuousProcessor.java | 3 +
.../datastreamer/DataStreamProcessor.java | 25 +-
.../datastreamer/DataStreamerImpl.java | 6 +-
.../datastructures/CollocatedSetItemKey.java | 2 +-
.../GridCacheAtomicLongValue.java | 2 +
.../GridCacheAtomicSequenceImpl.java | 14 +-
.../GridCacheAtomicSequenceValue.java | 2 +
.../GridCacheCountDownLatchValue.java | 3 +
.../datastructures/GridCacheSetImpl.java | 2 +-
.../datastructures/GridCacheSetItemKey.java | 2 +-
.../datastructures/GridSetQueryPredicate.java | 2 +-
.../processors/hadoop/HadoopClassLoader.java | 11 +
.../processors/hadoop/HadoopClasspathUtils.java | 4 +-
.../internal/processors/hadoop/HadoopJobId.java | 2 +-
.../processors/hadoop/HadoopJobProperty.java | 30 +-
.../hadoop/HadoopMapperAwareTaskOutput.java | 32 +
.../processors/hadoop/HadoopTaskContext.java | 18 +
.../processors/hadoop/HadoopTaskInfo.java | 43 +
.../io/PartiallyOffheapRawComparatorEx.java | 33 +
.../shuffle/HadoopDirectShuffleMessage.java | 273 ++
.../hadoop/shuffle/HadoopShuffleAck.java | 2 +-
.../shuffle/HadoopShuffleFinishRequest.java | 172 +
.../shuffle/HadoopShuffleFinishResponse.java | 142 +
.../hadoop/shuffle/HadoopShuffleMessage.java | 2 +-
.../internal/processors/igfs/IgfsContext.java | 4 +-
.../processors/igfs/IgfsDataManager.java | 6 +-
.../internal/processors/igfs/IgfsImpl.java | 2 +-
.../internal/processors/igfs/IgfsProcessor.java | 3 +-
.../igfs/client/IgfsClientSizeCallable.java | 1 -
.../processors/job/GridJobProcessor.java | 2 +-
.../internal/processors/job/GridJobWorker.java | 87 +-
.../internal/processors/odbc/IgniteTypes.java | 69 +
.../internal/processors/odbc/OdbcProcessor.java | 1 +
.../odbc/OdbcQueryExecuteRequest.java | 6 +-
.../processors/odbc/OdbcRequestHandler.java | 16 +-
.../internal/processors/odbc/OdbcTableMeta.java | 15 +-
.../internal/processors/odbc/OdbcTypes.java | 131 +
.../internal/processors/odbc/OdbcUtils.java | 85 +
.../processors/odbc/escape/OdbcEscapeUtils.java | 52 +-
.../platform/PlatformAbstractBootstrap.java | 3 +-
.../platform/PlatformAbstractTarget.java | 268 +-
.../platform/PlatformAsyncTarget.java | 44 +
.../platform/PlatformConfigurationEx.java | 3 +-
.../platform/PlatformContextImpl.java | 2 +-
.../platform/PlatformNativeException.java | 3 +-
.../platform/PlatformNoopProcessor.java | 41 +-
.../processors/platform/PlatformProcessor.java | 42 +-
.../platform/PlatformProcessorImpl.java | 87 +-
.../processors/platform/PlatformTarget.java | 103 +-
.../platform/PlatformTargetProxy.java | 126 +
.../platform/PlatformTargetProxyImpl.java | 222 ++
.../binary/PlatformBinaryProcessor.java | 6 +-
.../platform/cache/PlatformCache.java | 38 +-
.../cache/PlatformCacheEntryFilterImpl.java | 4 +-
.../cache/PlatformCacheEntryProcessorImpl.java | 43 +-
.../platform/cache/PlatformCacheIterator.java | 2 +-
.../cache/affinity/PlatformAffinity.java | 4 +-
.../affinity/PlatformAffinityFunction.java | 59 +-
.../PlatformAffinityFunctionTarget.java | 4 +-
.../query/PlatformAbstractQueryCursor.java | 4 +-
.../query/PlatformContinuousQueryProxy.java | 3 +-
.../callback/PlatformCallbackGateway.java | 272 +-
.../platform/callback/PlatformCallbackOp.java | 206 +
.../callback/PlatformCallbackUtils.java | 544 +--
.../platform/cluster/PlatformClusterGroup.java | 18 +-
.../platform/compute/PlatformAbstractJob.java | 2 +-
.../platform/compute/PlatformAbstractTask.java | 15 +-
.../platform/compute/PlatformClosureJob.java | 12 +-
.../platform/compute/PlatformCompute.java | 21 +-
.../platform/compute/PlatformFullJob.java | 15 +-
.../platform/compute/PlatformFullTask.java | 18 +-
.../datastreamer/PlatformDataStreamer.java | 4 +-
.../PlatformStreamReceiverImpl.java | 11 +-
.../datastructures/PlatformAtomicLong.java | 4 +-
.../datastructures/PlatformAtomicReference.java | 8 +-
.../datastructures/PlatformAtomicSequence.java | 2 +-
.../dotnet/PlatformDotNetCacheStore.java | 17 +-
.../platform/events/PlatformEvents.java | 15 +-
.../platform/messaging/PlatformMessaging.java | 9 +-
.../services/PlatformAbstractService.java | 25 +-
.../platform/services/PlatformServices.java | 29 +-
.../transactions/PlatformTransactions.java | 17 +-
.../utils/PlatformConfigurationUtils.java | 128 +-
.../platform/utils/PlatformFutureUtils.java | 18 +-
.../utils/PlatformListenableTarget.java | 62 +
.../platform/utils/PlatformUtils.java | 38 +-
.../processors/query/GridQueryIndexing.java | 21 +-
.../processors/query/GridQueryProcessor.java | 105 +-
.../query/GridQueryTypeDescriptor.java | 7 +
.../processors/query/GridRunningQueryInfo.java | 132 +
.../resource/GridResourceProcessor.java | 2 +-
.../processors/rest/GridRestResponse.java | 2 +-
.../handlers/cache/GridCacheCommandHandler.java | 29 +-
.../redis/GridRedisRestCommandHandler.java | 36 +
.../string/GridRedisSetCommandHandler.java | 45 +-
.../tcp/GridTcpMemcachedNioListener.java | 15 +-
.../protocols/tcp/GridTcpRestNioListener.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 1 +
.../service/GridServiceProcessor.java | 21 +-
.../processors/service/GridServiceProxy.java | 18 +-
.../processors/task/GridTaskWorker.java | 9 +-
.../suggestions/GridPerformanceSuggestions.java | 105 +
.../JvmConfigurationSuggestions.java | 104 +
.../suggestions/OsConfigurationSuggestions.java | 127 +
.../internal/suggestions/package-info.java | 21 +
.../ignite/internal/util/GridBusyLock.java | 2 +-
.../internal/util/GridStripedSpinBusyLock.java | 2 +-
.../ignite/internal/util/HostAndPortRange.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 79 +-
.../util/StripedCompositeReadWriteLock.java | 50 +-
.../ignite/internal/util/StripedExecutor.java | 718 ++++
.../util/future/GridCompoundFuture.java | 56 +-
.../util/future/GridFinishedFuture.java | 24 +
.../internal/util/future/GridFutureAdapter.java | 17 +-
.../util/future/GridFutureChainListener.java | 30 +-
.../internal/util/ipc/IpcToNioAdapter.java | 2 +-
.../util/lang/GridMetadataAwareAdapter.java | 2 +-
.../nio/GridAbstractCommunicationClient.java | 49 +-
.../util/nio/GridCommunicationClient.java | 14 +-
.../nio/GridConnectionBytesVerifyFilter.java | 15 +-
.../util/nio/GridNioAsyncNotifyFilter.java | 10 +-
.../internal/util/nio/GridNioCodecFilter.java | 17 +-
.../ignite/internal/util/nio/GridNioFilter.java | 16 +-
.../internal/util/nio/GridNioFilterAdapter.java | 10 +-
.../internal/util/nio/GridNioFilterChain.java | 14 +-
.../ignite/internal/util/nio/GridNioFuture.java | 4 +-
.../util/nio/GridNioRecoveryDescriptor.java | 124 +-
.../ignite/internal/util/nio/GridNioServer.java | 1511 ++++++--
.../internal/util/nio/GridNioSession.java | 25 +-
.../internal/util/nio/GridNioSessionImpl.java | 65 +-
.../ignite/internal/util/nio/GridNioWorker.java | 48 +
.../util/nio/GridSelectorNioSessionImpl.java | 221 +-
.../util/nio/GridShmemCommunicationClient.java | 7 +-
.../util/nio/GridTcpNioCommunicationClient.java | 55 +-
.../internal/util/nio/SessionWriteRequest.java | 85 +
.../internal/util/nio/ssl/GridNioSslFilter.java | 10 +-
.../util/nio/ssl/GridNioSslHandler.java | 4 +-
.../util/tostring/GridToStringBuilder.java | 658 +++-
.../util/tostring/GridToStringInclude.java | 12 +-
.../util/tostring/GridToStringThreadLocal.java | 12 +-
.../internal/visor/VisorMultiNodeTask.java | 2 +-
.../visor/cache/VisorCacheClearTask.java | 88 +-
.../visor/cache/VisorCacheTypeMetadata.java | 6 +
.../visor/compute/VisorGatewayTask.java | 30 +-
.../visor/node/VisorIgfsConfiguration.java | 1 -
.../visor/query/VisorCancelQueriesTask.java | 72 +
.../query/VisorCollectRunningQueriesTask.java | 96 +
.../internal/visor/query/VisorQueryJob.java | 2 +-
.../query/VisorQueryScanSubstringFilter.java | 5 +-
.../internal/visor/query/VisorQueryUtils.java | 60 +
.../internal/visor/query/VisorRunningQuery.java | 132 +
.../visor/service/VisorCancelServiceTask.java | 70 +
.../visor/service/VisorServiceDescriptor.java | 132 +
.../visor/service/VisorServiceTask.java | 75 +
.../internal/visor/util/VisorTaskUtils.java | 15 +-
.../ignite/lang/IgniteProductVersion.java | 2 +-
.../apache/ignite/logger/java/JavaLogger.java | 4 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 1 -
.../optimized/OptimizedClassDescriptor.java | 2 +-
.../optimized/OptimizedMarshallerUtils.java | 4 +-
.../optimized/OptimizedObjectOutputStream.java | 25 +-
.../ignite/mxbean/StripedExecutorMXBean.java | 90 +
.../communication/tcp/TcpCommunicationSpi.java | 1369 +++++--
.../tcp/TcpCommunicationSpiMBean.java | 38 +
.../ignite/spi/discovery/tcp/ClientImpl.java | 94 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 127 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 14 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 12 +-
.../messages/TcpDiscoveryAbstractMessage.java | 21 +
.../apache/ignite/spi/indexing/IndexingSpi.java | 3 +
.../roundrobin/RoundRobinLoadBalancingSpi.java | 16 +-
.../org/apache/ignite/stream/StreamAdapter.java | 4 +-
.../ignite/stream/socket/SocketStreamer.java | 1 +
.../org/apache/ignite/thread/IgniteThread.java | 26 +-
.../ignite/thread/IgniteThreadFactory.java | 8 +-
.../apache/ignite/util/AttributeNodeFilter.java | 108 +
.../resources/META-INF/classnames.properties | 66 +-
.../core/src/main/resources/ignite.properties | 2 +-
modules/core/src/test/config/log4j-test.xml | 6 +
.../AbstractAffinityFunctionSelfTest.java | 2 +-
.../CacheJdbcPojoStoreAbstractSelfTest.java | 21 +-
.../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 17 +-
.../jdbc/JdbcTypesDefaultTransformerTest.java | 283 ++
.../ignite/cache/store/jdbc/model/Gender.java | 41 +
.../ignite/cache/store/jdbc/model/Person.java | 33 +-
.../internal/ClusterGroupHostsSelfTest.java | 6 +-
.../ComputeJobCancelWithServiceSelfTest.java | 2 +-
.../internal/GridContinuousTaskSelfTest.java | 83 +-
.../GridEventStorageCheckAllEventsSelfTest.java | 2 +-
.../IgniteClientReconnectApiExceptionTest.java | 6 +-
...niteClientReconnectFailoverAbstractTest.java | 4 +-
.../IgniteComputeTopologyExceptionTest.java | 5 +-
.../IgniteSlowClientDetectionSelfTest.java | 1 +
.../internal/binary/BinaryEnumsSelfTest.java | 18 +
.../binary/BinaryMarshallerSelfTest.java | 66 +
.../communication/GridIoManagerSelfTest.java | 6 +-
...unicationBalanceMultipleConnectionsTest.java | 28 +
...mmunicationBalancePairedConnectionsTest.java | 28 +
.../IgniteCommunicationBalanceTest.java | 354 ++
.../communication/IgniteIoTestMessagesTest.java | 95 +
.../IgniteVariousConnectionNumberTest.java | 166 +
.../GridDiscoveryManagerAliveCacheSelfTest.java | 58 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 4 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 214 --
.../BinaryObjectOffHeapUnswapTemporaryTest.java | 1 -
.../cache/CacheAffinityCallSelfTest.java | 8 +-
.../cache/CacheConcurrentReadThroughTest.java | 184 +
.../cache/CacheDeferredDeleteQueueTest.java | 134 +
.../cache/CacheEntryProcessorCopySelfTest.java | 6 +-
.../cache/CacheGetEntryAbstractTest.java | 16 +-
.../cache/CacheRebalancingSelfTest.java | 75 +
.../CacheSerializableTransactionsTest.java | 179 +-
.../CacheStartupInDeploymentModesTest.java | 7 +-
.../cache/CacheStopAndDestroySelfTest.java | 6 +-
.../processors/cache/CacheTxFastFinishTest.java | 2 +-
.../cache/CrossCacheTxRandomOperationsTest.java | 30 +-
...idAbstractCacheInterceptorRebalanceTest.java | 4 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 10 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 2 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 33 +
.../GridCacheMissingCommitVersionSelfTest.java | 6 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 48 +-
.../processors/cache/GridCacheMvccSelfTest.java | 208 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 6 +-
.../processors/cache/GridCacheOffHeapTest.java | 274 --
.../GridCachePartitionedAffinitySpreadTest.java | 7 +-
.../processors/cache/GridCacheStopSelfTest.java | 4 +-
.../processors/cache/GridCacheTestEntryEx.java | 34 +-
.../cache/GridCacheUtilsSelfTest.java | 2 +-
...ProjectionForCachesOnDaemonNodeSelfTest.java | 8 +-
.../IgniteCacheConfigVariationsFullApiTest.java | 8 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 8 +-
.../cache/IgniteCacheStoreCollectionTest.java | 1 -
...gniteTopologyValidatorAbstractCacheTest.java | 6 +-
...niteTopologyValidatorGridSplitCacheTest.java | 334 ++
.../processors/cache/IgniteTxAbstractTest.java | 3 +-
.../cache/IgniteTxConfigCacheSelfTest.java | 2 +-
.../IgniteTxExceptionAbstractSelfTest.java | 3 +-
.../IgniteTxMultiThreadedAbstractTest.java | 4 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 1 +
...heapCacheMetricsForClusterGroupSelfTest.java | 141 +
.../CacheKeepBinaryWithInterceptorTest.java | 1 -
...yAtomicEntryProcessorDeploymentSelfTest.java | 4 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 7 +-
...IgniteCacheAbstractExecutionContextTest.java | 2 -
...eAbstractDataStructuresFailoverSelfTest.java | 16 +-
...actQueueFailoverDataConsistencySelfTest.java | 2 +-
...CacheAtomicReferenceApiSelfAbstractTest.java | 60 +-
...idCacheAtomicStampedApiSelfAbstractTest.java | 59 +
.../GridCacheQueueApiSelfAbstractTest.java | 58 +
.../GridCacheSetAbstractSelfTest.java | 53 +
.../IgniteAtomicLongApiAbstractSelfTest.java | 27 +
.../IgniteCountDownLatchAbstractSelfTest.java | 43 +
.../IgniteLockAbstractSelfTest.java | 78 +-
.../IgniteSemaphoreAbstractSelfTest.java | 52 +-
...achePartitionedAtomicSequenceTxSelfTest.java | 169 +
.../CacheGetFutureHangsSelfTest.java | 6 +-
.../CacheLateAffinityAssignmentTest.java | 2 +-
.../CacheLockReleaseNodeLeaveTest.java | 135 +
...ridCachePartitionNotLoadedEventSelfTest.java | 4 +-
...eAtomicMessageRecovery10ConnectionsTest.java | 28 +
...micMessageRecoveryPairedConnectionsTest.java | 47 +
...niteCacheClientNodeChangingTopologyTest.java | 20 +-
...acheConnectionRecovery10ConnectionsTest.java | 35 +
.../distributed/IgniteCacheCreatePutTest.java | 2 +-
.../IgniteCacheMessageRecoveryAbstractTest.java | 24 +-
.../IgniteCacheMessageWriteTimeoutTest.java | 17 +-
...teSynchronizationModesMultithreadedTest.java | 8 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 5 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 232 --
.../IgniteCacheCrossCacheTxFailoverTest.java | 6 +-
.../dht/IgniteCacheMultiTxLockSelfTest.java | 6 +-
...ePrimaryNodeFailureRecoveryAbstractTest.java | 4 +-
...gniteCachePutRetryTransactionalSelfTest.java | 4 +-
.../AtomicPutAllChangingTopologyTest.java | 212 +
...eAtomicInvalidPartitionHandlingSelfTest.java | 4 +-
...nabledMultiNodeLongTxTimeoutFullApiTest.java | 2 +-
...erNoStripedPoolMultiNodeFullApiSelfTest.java | 35 +
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 4 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 37 +-
...edNoStripedPoolMultiNodeFullApiSelfTest.java | 35 +
.../near/GridNearCacheStoreUpdateTest.java | 466 +++
.../GridNearOffheapCacheStoreUpdateTest.java | 35 +
.../GridCacheRebalancingSyncSelfTest.java | 2 +
.../GridCacheReplicatedNodeRestartSelfTest.java | 3 +-
.../GridCacheReplicatedPreloadSelfTest.java | 1 -
.../IgniteCacheExpiryPolicyAbstractTest.java | 4 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 102 +
.../IgniteCacheTxExpiryPolicyWithStoreTest.java | 21 +
.../CacheOffHeapAndSwapMetricsSelfTest.java | 621 ---
...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 621 +++
.../IgniteCacheQueryCacheDestroySelfTest.java | 142 +
.../cache/query/IndexingSpiQuerySelfTest.java | 244 +-
.../IndexingSpiQueryWithH2IndexingSelfTest.java | 36 +
...ContinuousQueryFailoverAbstractSelfTest.java | 6 +-
.../ClientReconnectContinuousQueryTest.java | 201 +
...dCacheContinuousQueryNodesFilteringTest.java | 2 +-
...IgniteCacheContinuousQueryReconnectTest.java | 12 +-
.../TxDeadlockDetectionNoHangsTest.java | 4 +-
.../transactions/TxDeadlockDetectionTest.java | 2 +-
.../TxOptimisticDeadlockDetectionTest.java | 31 +-
.../TxPessimisticDeadlockDetectionTest.java | 2 +-
.../closure/GridClosureSerializationTest.java | 177 +
...ComputeJobExecutionErrorToLogManualTest.java | 4 +-
.../datastreamer/DataStreamerImplSelfTest.java | 8 +-
.../datastreamer/DataStreamerTimeoutTest.java | 6 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 32 +-
...lockMessageSystemPoolStarvationSelfTest.java | 14 +-
.../processors/igfs/IgfsFileInfoSelfTest.java | 4 +-
.../igfs/IgfsMetaManagerSelfTest.java | 3 +-
.../igfs/IgfsModeResolverSelfTest.java | 10 +-
.../processors/igfs/IgfsTaskSelfTest.java | 87 +-
.../igfs/benchmark/IgfsBenchmark.java | 4 +-
...niteMessagingConfigVariationFullApiTest.java | 195 +-
.../odbc/OdbcEscapeSequenceSelfTest.java | 131 +
.../cache/GridCacheCommandHandlerSelfTest.java | 1 -
...rviceDeploymentExceptionPropagationTest.java | 2 +-
.../GridServiceProcessorProxySelfTest.java | 2 +-
.../GridServiceProcessorStopSelfTest.java | 2 +-
...gniteServiceProxyTimeoutInitializedTest.java | 284 ++
.../service/IgniteServiceReassignmentTest.java | 2 +-
.../internal/util/IgniteUtilsSelfTest.java | 5 +-
.../internal/util/StripedExecutorTest.java | 168 +
.../util/future/GridFutureAdapterSelfTest.java | 122 +-
.../nio/impl/GridNioFilterChainSelfTest.java | 32 +-
.../unsafe/GridOffheapSnapTreeSelfTest.java | 7 +-
.../tostring/GridToStringBuilderSelfTest.java | 33 +-
.../lang/GridMetadataAwareAdapterSelfTest.java | 4 +-
.../loadtests/nio/GridNioBenchmarkClient.java | 4 +-
.../GridMarshallerPerformanceTest.java | 4 +
.../ignite/messaging/GridMessagingSelfTest.java | 114 +-
.../messaging/IgniteMessagingSendAsyncTest.java | 544 +++
.../p2p/GridP2PRecursionTaskSelfTest.java | 2 +-
.../p2p/GridP2PSameClassLoaderSelfTest.java | 14 +-
.../platform/PlatformEventsWriteEventTask.java | 9 -
.../ignite/platform/PlatformExceptionTask.java | 78 +
.../spi/GridTcpSpiForwardingSelfTest.java | 18 +-
.../GridTcpCommunicationSpiAbstractTest.java | 28 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 82 +-
.../GridTcpCommunicationSpiConfigSelfTest.java | 5 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 23 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 9 +-
...tionSpiRecoveryFailureDetectionSelfTest.java | 1 +
...ationSpiRecoveryNoPairedConnectionsTest.java | 28 +
...GridTcpCommunicationSpiRecoverySelfTest.java | 67 +-
...CommunicationRecoveryAckClosureSelfTest.java | 9 +-
.../tcp/TcpCommunicationSpiDropNodesTest.java | 322 ++
.../TcpCommunicationSpiFaultyClientTest.java | 265 ++
.../local/GridLocalDeploymentSpiSelfTest.java | 6 +-
...lientDiscoverySpiFailureTimeoutSelfTest.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 8 +-
.../TcpDiscoverySpiFailureTimeoutSelfTest.java | 14 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 3 +-
.../startup/GridRandomCommandLineLoader.java | 2 +-
.../testframework/GridSpiTestContext.java | 5 +-
.../ignite/testframework/GridTestNode.java | 1 +
.../ignite/testframework/IgniteTestSuite.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 2 +
.../junits/GridTestKernalContext.java | 4 +-
.../junits/logger/GridTestLog4jLogger.java | 4 +-
.../junits/multijvm/IgniteProcessProxy.java | 5 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 7 +
.../IgniteCacheDataStructuresSelfTestSuite.java | 7 +-
.../IgniteCacheFailoverTestSuite.java | 3 +
.../IgniteCacheFullApiSelfTestSuite.java | 6 +
.../IgniteCacheMetricsSelfTestSuite.java | 6 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 23 +-
.../testsuites/IgniteCacheTestSuite2.java | 7 +
.../testsuites/IgniteCacheTestSuite4.java | 3 +
.../testsuites/IgniteCacheTestSuite5.java | 9 +-
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 7 +-
...essagingConfigVariationFullApiTestSuite.java | 4 +-
.../IgniteSpiCommunicationSelfTestSuite.java | 7 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +-
.../IgniteTopologyValidatorTestSuit.java | 1 +
.../util/AttributeNodeFilterSelfTest.java | 184 +
.../ignite/util/mbeans/GridMBeanSelfTest.java | 10 +-
modules/docker/1.8.0/Dockerfile | 46 +
modules/docker/1.8.0/run.sh | 51 +
modules/docker/Dockerfile | 6 +-
modules/extdata/p2p/pom.xml | 2 +-
.../CacheNoValueClassOnServerTestClient.java | 3 +-
.../CacheConfigurationP2PTestClient.java | 3 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/flink/pom.xml | 4 +-
modules/flume/pom.xml | 2 +-
.../apache/ignite/stream/flume/IgniteSink.java | 7 +-
modules/gce/pom.xml | 6 +-
.../gce/TcpDiscoveryGoogleStorageIpFinder.java | 4 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 9 +-
.../io/BytesWritablePartiallyRawComparator.java | 51 +
.../hadoop/io/PartiallyRawComparator.java | 33 +
.../org/apache/ignite/hadoop/io/RawMemory.java | 86 +
.../hadoop/io/TextPartiallyRawComparator.java | 51 +
.../apache/ignite/hadoop/io/package-info.java | 22 +
.../IgniteHadoopClientProtocolProvider.java | 70 +-
.../processors/hadoop/HadoopMapperUtils.java | 56 +
.../hadoop/igfs/HadoopIgfsEndpoint.java | 4 +-
.../processors/hadoop/impl/HadoopUtils.java | 66 +
.../HadoopBasicFileSystemFactoryDelegate.java | 2 +-
.../hadoop/impl/fs/HadoopFileSystemsUtils.java | 11 +
.../hadoop/impl/igfs/HadoopIgfsInProc.java | 40 +-
.../hadoop/impl/igfs/HadoopIgfsJclLogger.java | 9 +-
.../hadoop/impl/proto/HadoopClientProtocol.java | 55 +-
.../hadoop/impl/v1/HadoopV1MapTask.java | 89 +-
.../hadoop/impl/v1/HadoopV1ReduceTask.java | 69 +-
.../hadoop/impl/v2/HadoopV2Context.java | 2 +-
...DelegatingPartiallyOffheapRawComparator.java | 54 +
.../processors/hadoop/impl/v2/HadoopV2Job.java | 22 +-
.../impl/v2/HadoopV2JobResourceManager.java | 25 +-
.../hadoop/impl/v2/HadoopV2MapTask.java | 26 +-
.../hadoop/impl/v2/HadoopV2ReduceTask.java | 14 +
.../hadoop/impl/v2/HadoopV2TaskContext.java | 100 +-
.../processors/hadoop/io/OffheapRawMemory.java | 131 +
.../hadoop/jobtracker/HadoopJobTracker.java | 8 +-
.../hadoop/mapreduce/MapReduceClient.java | 147 +
.../hadoop/shuffle/HadoopShuffle.java | 66 +-
.../hadoop/shuffle/HadoopShuffleJob.java | 646 +++-
.../hadoop/shuffle/HadoopShuffleLocalState.java | 67 +
.../shuffle/HadoopShuffleRemoteState.java | 61 +
.../shuffle/collections/HadoopMultimapBase.java | 5 +-
.../shuffle/collections/HadoopSkipList.java | 14 +-
.../shuffle/direct/HadoopDirectDataInput.java | 166 +
.../shuffle/direct/HadoopDirectDataOutput.java | 235 ++
.../direct/HadoopDirectDataOutputContext.java | 140 +
.../direct/HadoopDirectDataOutputState.java | 66 +
.../taskexecutor/HadoopExecutorService.java | 6 +-
.../hadoop/taskexecutor/HadoopRunnableTask.java | 12 +-
.../child/HadoopChildProcessRunner.java | 16 +-
.../HadoopExternalCommunication.java | 5 +-
.../communication/HadoopIpcToNioAdapter.java | 2 +-
.../communication/HadoopMarshallerFilter.java | 6 +-
.../impl/HadoopAbstractMapReduceTest.java | 2 +
.../hadoop/impl/HadoopAbstractSelfTest.java | 13 +-
.../impl/HadoopAbstractWordCountTest.java | 6 +-
.../hadoop/impl/HadoopErrorSimulator.java | 12 +-
.../hadoop/impl/HadoopFileSystemsTest.java | 9 +
.../hadoop/impl/HadoopJobTrackerSelfTest.java | 4 +-
.../impl/HadoopMapReduceEmbeddedSelfTest.java | 24 +-
.../impl/HadoopTaskExecutionSelfTest.java | 4 +-
.../hadoop/impl/HadoopTeraSortTest.java | 409 ++
...opClientProtocolMultipleServersSelfTest.java | 93 +-
.../client/HadoopClientProtocolSelfTest.java | 232 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 3 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 6 +-
.../collections/HadoopAbstractMapTest.java | 6 +
.../collections/HadoopSkipListSelfTest.java | 14 +-
.../HadoopExternalTaskExecutionSelfTest.java | 2 +
.../testsuites/IgniteHadoopTestSuite.java | 3 +
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../cache/query/GridCacheTwoStepQuery.java | 18 +-
.../query/h2/GridH2ResultSetIterator.java | 3 +-
.../processors/query/h2/IgniteH2Indexing.java | 200 +-
.../query/h2/opt/GridH2IndexBase.java | 6 +-
.../processors/query/h2/sql/DmlAstUtils.java | 2 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 74 +-
.../query/h2/twostep/msg/GridH2Geometry.java | 2 +-
.../cache/BinarySerializationQuerySelfTest.java | 2 -
.../CacheRandomOperationsMultithreadedTest.java | 4 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 2 +-
.../cache/CacheSqlQueryValueCopySelfTest.java | 208 +-
.../ClientReconnectAfterClusterRestartTest.java | 4 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 2 +-
.../GridCacheQueryIndexDisabledSelfTest.java | 20 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 14 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 297 +-
.../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 6 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 18 +-
.../cache/IgniteCacheLargeResultSelfTest.java | 15 +-
...eLockPartitionOnAffinityRunAbstractTest.java | 1 -
...PartitionOnAffinityRunAtomicCacheOpTest.java | 11 +-
...niteCacheLockPartitionOnAffinityRunTest.java | 51 +-
...titionOnAffinityRunWithCollisionSpiTest.java | 10 +-
.../cache/IgniteCacheMergeSqlQuerySelfTest.java | 15 +-
.../cache/IgniteCacheOffheapEvictQueryTest.java | 4 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
.../IgniteCacheUpdateSqlQuerySelfTest.java | 6 +-
.../cache/QueryEntityCaseMismatchTest.java | 107 +
...niteCacheDistributedQueryCancelSelfTest.java | 4 +-
...niteCachePartitionedFieldsQuerySelfTest.java | 25 +
.../IgniteCachePartitionedQuerySelfTest.java | 85 +
.../IgniteCacheQueryNodeRestartSelfTest2.java | 4 +-
.../IgniteSqlEntryCacheModeAgnosticTest.java | 140 +
.../query/IgniteSqlSchemaIndexingTest.java | 15 +-
.../query/IgniteSqlSplitterSelfTest.java | 4 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 40 +-
.../query/h2/sql/GridQueryParsingTest.java | 4 -
.../IgniteCacheQuerySelfTestSuite.java | 136 +-
.../IgniteCacheQuerySelfTestSuite2.java | 111 +-
.../IgniteCacheQuerySelfTestSuite3.java | 2 +
.../IgniteH2IndexingSpiTestSuite.java | 16 +-
modules/jcl/pom.xml | 2 +-
.../org/apache/ignite/logger/jcl/JclLogger.java | 9 +-
modules/jms11/pom.xml | 2 +-
.../apache/ignite/stream/jms11/JmsStreamer.java | 4 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 2 +-
.../ignite/stream/kafka/KafkaStreamer.java | 52 +-
.../kafka/KafkaIgniteStreamerSelfTest.java | 36 +-
.../ignite/stream/kafka/TestKafkaBroker.java | 2 +-
.../connect/IgniteSourceConnectorTest.java | 2 +-
modules/kubernetes/DEVNOTES.txt | 63 +
modules/kubernetes/README.txt | 33 +
modules/kubernetes/config/Dockerfile | 45 +
modules/kubernetes/config/example-kube.xml | 44 +
.../kubernetes/config/ignite-deployment.yaml | 26 +
modules/kubernetes/config/ignite-service.yaml | 14 +
modules/kubernetes/config/run.sh | 50 +
modules/kubernetes/licenses/apache-2.0.txt | 202 +
modules/kubernetes/pom.xml | 93 +
.../TcpDiscoveryKubernetesIpFinder.java | 317 ++
.../tcp/ipfinder/kubernetes/package-info.java | 22 +
.../TcpDiscoveryKubernetesIpFinderSelfTest.java | 93 +
.../tcp/ipfinder/kubernetes/package-info.java | 22 +
.../testsuites/IgniteKubernetesTestSuite.java | 41 +
modules/log4j/pom.xml | 2 +-
.../apache/ignite/logger/log4j/Log4JLogger.java | 4 +-
modules/log4j2/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/mqtt/pom.xml | 2 +-
.../stream/mqtt/IgniteMqttStreamerTest.java | 4 +-
modules/osgi-karaf/pom.xml | 2 +-
modules/osgi-paxlogging/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
.../BundleDelegatingClassLoader.java | 4 +-
.../classloaders/ContainerSweepClassLoader.java | 4 +-
modules/platforms/cpp/binary/Makefile.am | 5 +-
.../platforms/cpp/binary/include/Makefile.am | 6 +
.../cpp/binary/include/ignite/binary/binary.h | 15 +-
.../binary/binary_array_identity_resolver.h | 64 +
.../ignite/binary/binary_identity_resolver.h | 61 +
.../include/ignite/binary/binary_object.h | 78 +
.../include/ignite/binary/binary_raw_reader.h | 21 +
.../binary/include/ignite/binary/binary_type.h | 16 -
.../ignite/impl/binary/binary_object_header.h | 250 ++
.../ignite/impl/binary/binary_object_impl.h | 109 +
.../ignite/impl/binary/binary_reader_impl.h | 9 +-
.../include/ignite/impl/binary/binary_schema.h | 2 +-
.../ignite/impl/binary/binary_type_impl.h | 149 +
.../ignite/impl/binary/binary_type_manager.h | 2 +-
.../ignite/impl/binary/binary_type_snapshot.h | 18 +-
.../include/ignite/impl/binary/binary_utils.h | 236 +-
.../ignite/impl/binary/binary_writer_impl.h | 11 +-
.../ignite/impl/interop/interop_output_stream.h | 10 +-
.../cpp/binary/project/vs/binary.vcxproj | 9 +
.../binary/project/vs/binary.vcxproj.filters | 27 +
.../binary/binary_array_identity_resolver.cpp | 42 +
.../cpp/binary/src/binary/binary_type.cpp | 4 +-
.../src/impl/binary/binary_object_header.cpp | 51 +
.../src/impl/binary/binary_object_impl.cpp | 56 +
.../src/impl/binary/binary_reader_impl.cpp | 17 +
.../src/impl/binary/binary_type_manager.cpp | 16 +-
.../cpp/binary/src/impl/binary/binary_utils.cpp | 169 +-
.../src/impl/binary/binary_writer_impl.cpp | 4 +-
.../binary/src/impl/interop/interop_memory.cpp | 2 +-
.../src/impl/interop/interop_output_stream.cpp | 5 +
modules/platforms/cpp/common/Makefile.am | 7 +-
.../platforms/cpp/common/include/Makefile.am | 6 +-
.../common/include/ignite/common/concurrent.h | 90 +-
.../include/ignite/common/dynamic_size_array.h | 2 +-
.../include/ignite/common/platform_utils.h | 79 +
.../include/ignite/common/reference_impl.h | 286 ++
.../cpp/common/include/ignite/common/utils.h | 249 +-
.../cpp/common/include/ignite/reference.h | 564 +++
.../os/linux/src/common/platform_utils.cpp | 81 +
.../cpp/common/os/linux/src/common/utils.cpp | 136 -
.../common/os/win/src/common/platform_utils.cpp | 88 +
.../cpp/common/os/win/src/common/utils.cpp | 142 -
.../cpp/common/project/vs/common.vcxproj | 7 +-
.../common/project/vs/common.vcxproj.filters | 18 +-
.../platforms/cpp/common/src/common/utils.cpp | 153 +
modules/platforms/cpp/configure.ac | 2 +-
modules/platforms/cpp/configure.acrel | 2 +-
modules/platforms/cpp/core-test/Makefile.am | 14 +-
.../cpp/core-test/config/cache-identity.xml | 121 +
.../core-test/config/cache-query-continuous.xml | 87 +
.../cpp/core-test/config/cache-query.xml | 10 -
.../cpp/core-test/config/cache-test.xml | 1 +
.../platforms/cpp/core-test/config/invalid.xml | 39 +
.../core-test/include/ignite/binary_test_defs.h | 25 +
.../cpp/core-test/include/ignite/complex_type.h | 135 +
.../cpp/core-test/include/ignite/test_type.h | 186 +
.../cpp/core-test/include/ignite/test_utils.h | 63 +
.../cpp/core-test/project/vs/core-test.vcxproj | 20 +-
.../project/vs/core-test.vcxproj.filters | 40 +-
.../src/binary_identity_resolver_test.cpp | 522 +++
.../cpp/core-test/src/binary_object_test.cpp | 282 ++
.../cpp/core-test/src/binary_session_test.cpp | 4 +-
.../cpp/core-test/src/cache_query_test.cpp | 223 +-
.../platforms/cpp/core-test/src/cache_test.cpp | 43 +-
.../cpp/core-test/src/continuous_query_test.cpp | 584 +++
.../cpp/core-test/src/handle_registry_test.cpp | 18 +-
.../cpp/core-test/src/ignition_test.cpp | 19 +-
.../cpp/core-test/src/interop_test.cpp | 51 +-
.../cpp/core-test/src/reference_test.cpp | 422 ++
.../platforms/cpp/core-test/src/test_utils.cpp | 79 +
.../cpp/core-test/src/transactions_test.cpp | 23 +-
modules/platforms/cpp/core/Makefile.am | 3 +-
.../cpp/core/include/ignite/cache/cache.h | 104 +-
.../cpp/core/include/ignite/cache/cache_entry.h | 40 +-
.../ignite/cache/event/cache_entry_event.h | 139 +
.../cache/event/cache_entry_event_listener.h | 71 +
.../cache/query/continuous/continuous_query.h | 239 ++
.../query/continuous/continuous_query_handle.h | 133 +
.../include/ignite/cache/query/query_cursor.h | 4 +-
.../core/include/ignite/impl/cache/cache_impl.h | 116 +-
.../continuous/continuous_query_handle_impl.h | 101 +
.../query/continuous/continuous_query_impl.h | 351 ++
.../core/include/ignite/impl/handle_registry.h | 62 +-
.../include/ignite/impl/ignite_environment.h | 34 +-
.../cpp/core/include/ignite/impl/operations.h | 4 +-
modules/platforms/cpp/core/namespaces.dox | 74 +-
.../platforms/cpp/core/project/vs/core.vcxproj | 7 +
.../cpp/core/project/vs/core.vcxproj.filters | 30 +
modules/platforms/cpp/core/src/ignition.cpp | 15 +-
.../cpp/core/src/impl/cache/cache_impl.cpp | 32 +
.../continuous/continuous_query_handle_impl.cpp | 96 +
.../cpp/core/src/impl/handle_registry.cpp | 102 +-
.../cpp/core/src/impl/ignite_environment.cpp | 146 +-
.../platforms/cpp/core/src/impl/ignite_impl.cpp | 4 +-
modules/platforms/cpp/examples/Makefile.am | 1 +
modules/platforms/cpp/examples/configure.ac | 3 +-
.../continuous-query-example/Makefile.am | 58 +
.../config/continuous-query-example.xml | 52 +
.../project/vs/continuous-query-example.vcxproj | 110 +
.../vs/continuous-query-example.vcxproj.filters | 35 +
.../src/continuous_query_example.cpp | 142 +
.../examples/include/ignite/examples/person.h | 2 +-
.../cpp/examples/odbc-example/Makefile.am | 2 +-
.../cpp/examples/project/vs/ignite-examples.sln | 6 +
.../cpp/examples/putget-example/Makefile.am | 2 +-
.../cpp/examples/query-example/Makefile.am | 2 +-
modules/platforms/cpp/ignite/Makefile.am | 2 +-
modules/platforms/cpp/jni/Makefile.am | 2 +-
.../cpp/jni/include/ignite/jni/exports.h | 3 -
.../platforms/cpp/jni/include/ignite/jni/java.h | 94 +-
.../platforms/cpp/jni/project/vs/jni.vcxproj | 1 +
modules/platforms/cpp/jni/project/vs/module.def | 6 +-
modules/platforms/cpp/jni/src/exports.cpp | 8 -
modules/platforms/cpp/jni/src/java.cpp | 421 +-
modules/platforms/cpp/odbc-test/Makefile.am | 3 +-
.../cpp/odbc-test/config/queries-default.xml | 146 +
.../odbc-test/config/queries-test-noodbc.xml | 84 +-
.../cpp/odbc-test/config/queries-test.xml | 85 +-
.../platforms/cpp/odbc-test/include/Makefile.am | 1 +
.../cpp/odbc-test/include/complex_type.h | 122 +
.../odbc-test/include/sql_test_suite_fixture.h | 16 +
.../platforms/cpp/odbc-test/include/test_type.h | 20 +-
.../cpp/odbc-test/include/test_utils.h | 51 +-
.../cpp/odbc-test/project/vs/odbc-test.vcxproj | 6 +-
.../project/vs/odbc-test.vcxproj.filters | 6 +
.../cpp/odbc-test/src/api_robustness_test.cpp | 150 +-
.../src/application_data_buffer_test.cpp | 24 +-
.../platforms/cpp/odbc-test/src/column_test.cpp | 189 +
.../cpp/odbc-test/src/queries_test.cpp | 248 +-
.../src/sql_aggregate_functions_test.cpp | 5 +-
.../src/sql_date_time_functions_test.cpp | 26 +-
.../src/sql_esc_convert_function_test.cpp | 160 +
.../src/sql_numeric_functions_test.cpp | 1 +
.../cpp/odbc-test/src/sql_outer_join_test.cpp | 1 +
.../odbc-test/src/sql_string_functions_test.cpp | 1 +
.../odbc-test/src/sql_test_suite_fixture.cpp | 105 +-
.../cpp/odbc-test/src/sql_types_test.cpp | 256 ++
.../platforms/cpp/odbc-test/src/test_utils.cpp | 60 +-
.../cpp/odbc-test/src/utility_test.cpp | 27 +-
modules/platforms/cpp/odbc/Makefile.am | 5 +-
modules/platforms/cpp/odbc/include/Makefile.am | 3 +-
.../cpp/odbc/include/ignite/odbc/common_types.h | 29 +-
.../ignite/odbc/config/connection_info.h | 2 -
.../cpp/odbc/include/ignite/odbc/log.h | 123 +
.../odbc/include/ignite/odbc/meta/column_meta.h | 2 -
.../cpp/odbc/include/ignite/odbc/statement.h | 143 +-
.../cpp/odbc/include/ignite/odbc/utility.h | 26 +-
.../cpp/odbc/install/ignite-odbc-amd64.wxs | 2 +-
.../cpp/odbc/install/ignite-odbc-x86.wxs | 2 +-
.../odbc/os/linux/src/system/socket_client.cpp | 9 +-
.../odbc/os/win/src/system/socket_client.cpp | 9 +-
.../src/system/ui/dsn_configuration_window.cpp | 18 +-
.../cpp/odbc/os/win/src/system_dsn.cpp | 17 +-
.../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 +
.../cpp/odbc/project/vs/odbc.vcxproj.filters | 6 +
.../odbc/src/app/application_data_buffer.cpp | 66 +-
.../platforms/cpp/odbc/src/app/parameter.cpp | 4 +-
modules/platforms/cpp/odbc/src/column.cpp | 65 +-
.../cpp/odbc/src/config/connection_info.cpp | 267 +-
modules/platforms/cpp/odbc/src/connection.cpp | 21 +-
.../odbc/src/diagnostic/diagnosable_adapter.cpp | 3 +-
.../odbc/src/diagnostic/diagnostic_record.cpp | 38 +
modules/platforms/cpp/odbc/src/entry_points.cpp | 52 +-
modules/platforms/cpp/odbc/src/log.cpp | 83 +
.../platforms/cpp/odbc/src/meta/column_meta.cpp | 4 -
modules/platforms/cpp/odbc/src/odbc.cpp | 286 +-
.../odbc/src/query/column_metadata_query.cpp | 13 +-
.../platforms/cpp/odbc/src/query/data_query.cpp | 23 +-
.../cpp/odbc/src/query/table_metadata_query.cpp | 12 +-
modules/platforms/cpp/odbc/src/statement.cpp | 187 +-
modules/platforms/cpp/odbc/src/type_traits.cpp | 3 +
modules/platforms/cpp/odbc/src/utility.cpp | 39 +-
modules/platforms/cpp/project/vs/ignite.slnrel | 3 +
.../platforms/cpp/project/vs/ignite_x86.slnrel | 3 +
.../Apache.Ignite.AspNet.Tests.csproj | 7 +-
.../Properties/AssemblyInfo.cs | 8 +-
.../Apache.Ignite.AspNet.csproj | 5 +
.../Apache.Ignite.AspNet.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 8 +-
.../Apache.Ignite.Benchmarks.csproj | 5 +
.../Properties/AssemblyInfo.cs | 8 +-
.../Properties/AssemblyInfo.cs | 8 +-
.../Apache.Ignite.Core.Tests.TestDll.csproj | 5 +
.../Properties/AssemblyInfo.cs | 8 +-
.../Apache.Ignite.Core.Tests.csproj | 12 +
.../Binary/BinaryBuilderSelfTest.cs | 159 +-
.../BinaryBuilderSelfTestArrayIdentity.cs | 34 +
.../Binary/BinaryCompactFooterInteropTest.cs | 31 +-
.../Binary/BinaryEqualityComparerTest.cs | 279 ++
.../Binary/BinaryStructureTest.cs | 122 +
.../Binary/IO/BinaryStreamsTest.cs | 19 +
.../Cache/CacheAbstractTest.cs | 648 +---
.../Cache/CacheAbstractTransactionalTest.cs | 904 +++++
.../Cache/CacheConfigurationTest.cs | 5 +-
.../Cache/CacheLocalAtomicTest.cs | 5 -
.../Cache/CacheLocalTest.cs | 6 +-
.../CachePartitionedAtomicNearEnabledTest.cs | 5 -
.../Cache/CachePartitionedAtomicTest.cs | 5 -
.../Cache/CachePartitionedNearEnabledTest.cs | 7 +-
.../Cache/CachePartitionedTest.cs | 7 +-
.../Cache/CacheReplicatedAtomicTest.cs | 5 -
.../Cache/CacheReplicatedTest.cs | 7 +-
.../Cache/Query/CacheDmlQueriesTest.cs | 296 ++
.../Cache/Query/CacheLinqTest.cs | 168 +-
.../Query/CacheQueriesCodeConfigurationTest.cs | 17 +-
.../Cache/Query/CacheQueriesTest.cs | 8 +
.../Cache/Store/CacheParallelLoadStoreTest.cs | 9 +-
.../Cache/Store/CacheStoreSessionTest.cs | 22 +-
.../Cache/Store/CacheStoreTest.cs | 363 +-
.../Cache/Store/CacheTestStore.cs | 14 +
.../Cache/Store/NamedNodeCacheStoreTest.cs | 34 +
.../Examples/Example.cs | 5 +-
.../Examples/ExamplesTest.cs | 107 +-
.../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 38 +
.../Apache.Ignite.Core.Tests/ExecutableTest.cs | 2 +-
.../IgniteConfigurationSerializerTest.cs | 46 +-
.../IgniteConfigurationTest.cs | 28 +
.../Log/ConcurrentMemoryTarget.cs | 73 +
.../Log/NLogLoggerTest.cs | 5 +-
.../Apache.Ignite.Core.Tests/MessagingTest.cs | 6 +-
.../Properties/AssemblyInfo.cs | 8 +-
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 28 +-
.../Services/ServicesTest.cs | 46 +-
.../Apache.Ignite.Core.Tests/TestUtils.cs | 4 +-
.../Apache.Ignite.Core.Schema.nuspec | 2 +-
.../Apache.Ignite.Core.csproj | 25 +-
.../Apache.Ignite.Core.nuspec | 2 +-
.../Binary/BinaryArrayEqualityComparer.cs | 149 +
.../Binary/BinaryConfiguration.cs | 24 +
.../Binary/BinaryTypeConfiguration.cs | 14 +
.../dotnet/Apache.Ignite.Core/Binary/IBinary.cs | 3 +-
.../Cache/Configuration/QueryEntity.cs | 33 +-
.../Cache/Configuration/QueryField.cs | 6 +
.../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 4 +-
.../Apache.Ignite.Core/Cache/Query/QueryBase.cs | 15 +-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 85 +-
.../IgniteConfigurationSection.xsd | 19 +
.../Apache.Ignite.Core/Impl/Binary/Binary.cs | 28 +-
.../Binary/BinaryEqualityComparerSerializer.cs | 99 +
.../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 +
.../Impl/Binary/BinaryFullTypeDescriptor.cs | 21 +-
.../Impl/Binary/BinaryObject.cs | 31 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 62 +-
.../Impl/Binary/BinaryObjectHeader.cs | 21 +-
.../Impl/Binary/BinaryObjectSchemaHolder.cs | 22 +
.../Impl/Binary/BinaryReader.cs | 153 +-
.../Binary/BinarySurrogateTypeDescriptor.cs | 6 +
.../Impl/Binary/BinarySystemHandlers.cs | 6 +-
.../Impl/Binary/BinaryUtils.cs | 16 +
.../Impl/Binary/BinaryWriter.cs | 11 +-
.../Impl/Binary/DateTimeHolder.cs | 35 +-
.../Impl/Binary/IBinaryEqualityComparer.cs | 53 +
.../Impl/Binary/IBinaryTypeDescriptor.cs | 5 +
.../Impl/Binary/Io/BinaryHeapStream.cs | 9 +
.../Impl/Binary/Io/BinaryStreamBase.cs | 17 +-
.../Impl/Binary/Io/IBinaryStream.cs | 11 +-
.../Impl/Binary/Io/IBinaryStreamProcessor.cs | 36 +
.../Impl/Binary/Marshaller.cs | 22 +-
.../Impl/Binary/SerializableObjectHolder.cs | 16 +
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 133 +-
.../Apache.Ignite.Core/Impl/Common/Future.cs | 13 +-
.../Common/IgniteConfigurationXmlSerializer.cs | 5 +-
.../Impl/Common/Listenable.cs | 49 +
.../Impl/Compute/ComputeImpl.cs | 4 +-
.../Impl/Compute/ComputeTaskHolder.cs | 14 +-
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 6 +-
.../Impl/Memory/PlatformMemoryStream.cs | 16 +
.../Apache.Ignite.Core/Impl/PlatformTarget.cs | 2 +-
.../Transactions/CacheTransactionManager.cs | 161 +
.../Impl/Transactions/Transaction.cs | 8 +
.../Impl/Transactions/TransactionImpl.cs | 13 +
.../Impl/Transactions/TransactionsImpl.cs | 28 +
.../Impl/Unmanaged/IgniteJniNativeMethods.cs | 8 -
.../Impl/Unmanaged/UnmanagedCallbackHandlers.cs | 79 +-
.../Impl/Unmanaged/UnmanagedCallbackOp.cs | 86 +
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 1229 +++---
.../Impl/Unmanaged/UnmanagedUtils.cs | 9 +-
.../Properties/AssemblyInfo.cs | 8 +-
.../Transactions/ITransactions.cs | 19 +-
.../Apache.Ignite.EntityFramework.Tests.csproj | 5 +
.../EntityFrameworkCacheTest.cs | 58 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Apache.Ignite.EntityFramework.csproj | 9 +-
.../Apache.Ignite.EntityFramework.nuspec | 2 +-
.../Impl/ArrayDbDataReader.cs | 5 +
.../Impl/DataReaderResult.cs | 2 +
.../Impl/DbCommandInfo.cs | 32 +-
.../Impl/DbCommandProxy.cs | 1 +
.../Properties/AssemblyInfo.cs | 6 +-
.../Apache.Ignite.Linq.csproj | 5 +
.../Apache.Ignite.Linq.nuspec | 2 +-
.../Impl/CacheQueryExpressionVisitor.cs | 139 +-
.../Impl/CacheQueryModelVisitor.cs | 3 +
.../Apache.Ignite.Linq/Impl/ExpressionWalker.cs | 8 +
.../Apache.Ignite.Linq/Impl/MethodVisitor.cs | 34 +-
.../Properties/AssemblyInfo.cs | 8 +-
.../Apache.Ignite.Log4Net.csproj | 5 +
.../Apache.Ignite.Log4Net.nuspec | 2 +-
.../IgniteLog4NetLogger.cs | 16 +-
.../Properties/AssemblyInfo.cs | 8 +-
.../Apache.Ignite.NLog.csproj | 5 +
.../Apache.Ignite.NLog.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 8 +-
modules/platforms/dotnet/Apache.Ignite.sln | 5 +
.../dotnet/Apache.Ignite/Apache.Ignite.csproj | 5 +
.../Apache.Ignite/Properties/AssemblyInfo.cs | 8 +-
modules/platforms/dotnet/DEVNOTES.txt | 12 +-
modules/platforms/dotnet/README.md | 6 +-
modules/platforms/dotnet/build.bat | 19 +
modules/platforms/dotnet/build.ps1 | 211 +
.../Apache.Ignite.Examples.csproj | 5 +
.../examples/Apache.Ignite.Examples/App.config | 2 +
.../DataStructures/AtomicSequenceExample.cs | 26 +-
.../Datagrid/QueryDmlExample.cs | 162 +
.../Datagrid/TransactionExample.cs | 75 +-
.../Properties/AssemblyInfo.cs | 8 +-
.../Apache.Ignite.ExamplesDll.csproj | 4 +
.../Properties/AssemblyInfo.cs | 6 +-
.../Services/MapService.cs | 2 -
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/pom.xml | 4 +-
modules/scalar/pom.xml | 4 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import-db/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
.../apache/ignite/logger/slf4j/Slf4jLogger.java | 11 +-
modules/spark-2.10/pom.xml | 56 +-
modules/spark/pom.xml | 185 +-
.../org/apache/ignite/spark/IgniteContext.scala | 22 +-
.../apache/ignite/spark/JavaIgniteContext.scala | 6 +
.../spark/JavaEmbeddedIgniteRDDSelfTest.java | 10 +-
.../spark/JavaStandaloneIgniteRDDSelfTest.java | 25 +-
modules/spring/pom.xml | 2 +-
.../util/spring/IgniteSpringHelperImpl.java | 8 +-
.../src/test/config/jdbc-pojo-store-builtin.xml | 8 +
.../src/test/config/jdbc-pojo-store-obj.xml | 8 +
.../ignite/internal/GridFactorySelfTest.java | 2 +-
.../internal/IgniteDynamicCacheConfigTest.java | 4 +-
.../GridSpringTransactionManagerSelfTest.java | 2 +-
modules/ssh/pom.xml | 2 +-
modules/storm/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
.../ignite/tools/classgen/ClassesGenerator.java | 14 +-
modules/twitter/pom.xml | 2 +-
.../twitter/IgniteTwitterStreamerTest.java | 4 +-
modules/urideploy/pom.xml | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 2 +-
.../GridUriDeploymentFileProcessorSelfTest.java | 3 +-
modules/visor-console-2.10/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
.../scala/org/apache/ignite/visor/visor.scala | 115 +-
.../commands/mem/VisorMemoryCommandSpec.scala | 33 +
modules/visor-plugins/pom.xml | 2 +-
modules/web-console/backend/app/agent.js | 71 +-
modules/web-console/backend/app/browser.js | 39 +
modules/web-console/backend/app/mongo.js | 92 +-
modules/web-console/backend/app/routes.js | 5 +-
.../web-console/backend/routes/activities.js | 45 +
modules/web-console/backend/routes/admin.js | 2 +-
modules/web-console/backend/routes/agent.js | 10 +-
modules/web-console/backend/routes/demo.js | 17 +-
modules/web-console/backend/routes/profile.js | 5 +-
modules/web-console/backend/routes/public.js | 1 -
.../web-console/backend/services/activities.js | 116 +
.../web-console/backend/services/notebooks.js | 14 +-
.../web-console/backend/services/sessions.js | 12 +-
modules/web-console/backend/services/spaces.js | 15 +
modules/web-console/backend/services/users.js | 20 +-
.../backend/test/unit/ActivitiesService.test.js | 131 +
modules/web-console/frontend/app/app.config.js | 13 +
modules/web-console/frontend/app/app.js | 34 +-
.../activities-user-dialog.controller.js | 27 +
.../activities-user-dialog.jade | 36 +
.../components/activities-user-dialog/index.js | 35 +
.../form-field-datepicker.jade | 55 +
.../form-field-datepicker.scss | 20 +
.../list-of-registered-users/index.js | 28 +
.../list-of-registered-users.categories.js | 30 +
.../list-of-registered-users.column-defs.js | 80 +
.../list-of-registered-users.controller.js | 235 ++
.../list-of-registered-users.jade | 58 +
.../ui-grid-header/ui-grid-header.jade | 27 +
.../ui-grid-header/ui-grid-header.scss | 84 +
.../ui-grid-settings/ui-grid-settings.jade | 33 +
.../ui-grid-settings/ui-grid-settings.scss | 99 +
.../controllers/reset-password.controller.js | 14 +-
.../app/core/activities/Activities.data.js | 34 +
.../frontend/app/core/admin/Admin.data.js | 77 +
modules/web-console/frontend/app/core/index.js | 25 +
.../frontend/app/data/event-groups.json | 169 +
.../frontend/app/data/event-types.json | 169 -
modules/web-console/frontend/app/data/i18n.js | 39 +
.../frontend/app/data/pom-dependencies.json | 12 +-
.../ui-ace-docker/ui-ace-docker.controller.js | 2 +-
.../directives/ui-ace-docker/ui-ace-docker.jade | 2 +-
.../ui-ace-pojos/ui-ace-pojos.controller.js | 12 +-
.../ui-ace-pom/ui-ace-pom.controller.js | 4 +-
.../ui-grid-settings/ui-grid-settings.jade | 33 -
.../ui-grid-settings/ui-grid-settings.scss | 38 -
.../app/filters/uiGridSubcategories.filter.js | 24 +
.../helpers/jade/form/form-field-dropdown.jade | 5 +-
.../helpers/jade/form/form-field-number.jade | 3 +-
.../app/helpers/jade/form/form-field-text.jade | 19 +-
.../frontend/app/helpers/jade/mixins.jade | 52 +-
.../frontend/app/modules/Demo/Demo.module.js | 166 -
.../frontend/app/modules/agent/agent.module.js | 15 -
.../app/modules/branding/branding.provider.js | 2 +-
.../configuration/EventGroups.provider.js | 30 -
.../modules/configuration/Version.service.js | 39 +-
.../configuration/configuration.module.js | 63 +-
.../generator/AbstractTransformer.js | 22 +
.../modules/configuration/generator/Beans.js | 9 +
.../generator/ConfigurationGenerator.js | 2816 +++++++-------
.../configuration/generator/Custom.service.js | 23 +
.../configuration/generator/Docker.service.js | 4 +-
.../generator/JavaTransformer.service.js | 2318 +++++------
.../configuration/generator/Maven.service.js | 236 ++
.../configuration/generator/Pom.service.js | 233 --
.../generator/Properties.service.js | 2 +-
.../configuration/generator/Readme.service.js | 2 +-
.../generator/SharpTransformer.service.js | 437 ++-
.../generator/SpringTransformer.service.js | 497 ++-
.../defaults/Cache.platform.service.js | 56 +
.../generator/defaults/Cache.service.js | 131 +
.../defaults/Cluster.platform.service.js | 43 +
.../generator/defaults/Cluster.service.js | 289 ++
.../generator/defaults/Event-groups.service.js | 27 +
.../generator/defaults/IGFS.service.js | 64 +
.../defaults/cache.platform.provider.js | 60 -
.../generator/defaults/cache.provider.js | 137 -
.../defaults/cluster.platform.provider.js | 49 -
.../generator/defaults/cluster.provider.js | 293 --
.../generator/defaults/igfs.provider.js | 68 -
.../configuration/generator/generator-common.js | 625 ---
.../configuration/generator/generator-java.js | 3617 ------------------
.../generator/generator-optional.js | 25 -
.../configuration/generator/generator-spring.js | 2111 ----------
.../frontend/app/modules/demo/Demo.module.js | 172 +
.../frontend/app/modules/sql/Notebook.data.js | 11 +-
.../app/modules/sql/Notebook.service.js | 2 +-
.../app/modules/sql/scan-filter-input.jade | 39 -
.../modules/sql/scan-filter-input.service.js | 51 -
.../frontend/app/modules/sql/sql.controller.js | 221 +-
.../frontend/app/modules/sql/sql.module.js | 4 +-
.../frontend/app/modules/states/admin.state.js | 2 +-
.../app/modules/states/configuration.state.js | 2 +
.../states/configuration/caches/affinity.jade | 82 +
.../states/configuration/caches/memory.jade | 4 +-
.../configuration/caches/node-filter.jade | 2 +-
.../states/configuration/caches/query.jade | 3 +
.../states/configuration/caches/store.jade | 4 +-
.../configuration/clusters/checkpoint.jade | 11 +-
.../configuration/clusters/checkpoint/fs.jade | 8 +-
.../configuration/clusters/checkpoint/jdbc.jade | 8 +-
.../configuration/clusters/checkpoint/s3.jade | 25 +-
.../clusters/collision/custom.jade | 2 +-
.../clusters/collision/job-stealing.jade | 2 +-
.../configuration/clusters/deployment.jade | 129 +-
.../states/configuration/clusters/events.jade | 4 +-
.../states/configuration/clusters/failover.jade | 4 +-
.../clusters/general/discovery/zookeeper.jade | 2 +-
.../discovery/zookeeper/retrypolicy/custom.jade | 2 +-
.../configuration/clusters/load-balancing.jade | 23 +-
.../configuration/clusters/logger/custom.jade | 2 +-
.../states/configuration/clusters/ssl.jade | 2 +-
.../summary/summary-zipper.service.js | 37 +
.../configuration/summary/summary.controller.js | 103 +-
.../configuration/summary/summary.worker.js | 119 +
.../app/modules/user/AclRoute.provider.js | 31 +-
.../frontend/app/modules/user/Auth.service.js | 11 +-
.../frontend/app/modules/user/permissions.js | 2 +-
.../frontend/app/modules/user/user.module.js | 6 +-
.../frontend/app/services/JavaTypes.service.js | 13 +-
.../frontend/app/services/Messages.service.js | 17 +-
modules/web-console/frontend/app/vendor.js | 1 +
.../frontend/controllers/admin-controller.js | 93 -
.../frontend/controllers/caches-controller.js | 22 +-
.../frontend/controllers/clusters-controller.js | 42 +-
.../frontend/controllers/domains-controller.js | 44 +-
.../frontend/controllers/igfs-controller.js | 20 +-
.../frontend/controllers/profile-controller.js | 3 +-
.../gulpfile.babel.js/webpack/common.js | 17 +-
.../webpack/environments/development.js | 14 +-
.../webpack/environments/production.js | 3 +-
.../webpack/plugins/progress.js | 82 -
modules/web-console/frontend/package.json | 181 +-
.../frontend/public/images/cache.png | Bin 23700 -> 24791 bytes
.../frontend/public/images/domains.png | Bin 23828 -> 22131 bytes
.../web-console/frontend/public/images/igfs.png | Bin 14307 -> 14139 bytes
.../frontend/public/images/query-chart.png | Bin 16637 -> 17142 bytes
.../frontend/public/images/query-metadata.png | Bin 32298 -> 39361 bytes
.../frontend/public/images/query-table.png | Bin 29189 -> 28065 bytes
.../frontend/public/images/summary.png | Bin 31997 -> 33650 bytes
.../stylesheets/_font-awesome-custom.scss | 51 +-
.../frontend/public/stylesheets/form-field.scss | 37 +
.../frontend/public/stylesheets/style.scss | 140 +-
.../frontend/test/unit/JavaTypes.test.js | 17 +-
.../frontend/test/unit/Version.test.js | 34 +-
.../frontend/views/configuration/caches.jade | 1 +
.../views/configuration/domains-import.jade | 5 +-
.../frontend/views/configuration/summary.jade | 25 +-
.../frontend/views/settings/admin.jade | 61 +-
.../frontend/views/sql/notebook-new.jade | 2 +-
modules/web-console/frontend/views/sql/sql.jade | 237 +-
.../views/templates/agent-download.jade | 12 +-
.../frontend/views/templates/alert.jade | 2 +-
.../frontend/views/templates/select.jade | 2 +-
modules/web-console/pom.xml | 2 +-
modules/web-console/web-agent/README.txt | 2 +-
.../web-agent/bin/ignite-web-agent.bat | 4 +-
.../web-agent/bin/ignite-web-agent.sh | 2 +
modules/web-console/web-agent/pom.xml | 2 +-
.../ignite/console/agent/AgentLauncher.java | 259 +-
.../apache/ignite/console/agent/AgentUtils.java | 80 +
.../console/agent/handlers/AbstractHandler.java | 110 -
.../agent/handlers/AbstractListener.java | 104 +
.../console/agent/handlers/DatabaseHandler.java | 298 --
.../agent/handlers/DatabaseListener.java | 316 ++
.../console/agent/handlers/RestHandler.java | 276 --
.../console/agent/handlers/RestListener.java | 287 ++
.../ignite/console/demo/AgentClusterDemo.java | 475 +--
.../ignite/console/demo/AgentDemoUtils.java | 79 +
.../demo/service/DemoCachesLoadService.java | 456 +++
.../service/DemoRandomCacheLoadService.java | 120 +
.../service/DemoServiceClusterSingleton.java | 41 +
.../demo/service/DemoServiceKeyAffinity.java | 41 +
.../service/DemoServiceMultipleInstances.java | 41 +
.../demo/service/DemoServiceNodeSingleton.java | 41 +
modules/web/ignite-appserver-test/pom.xml | 2 +-
modules/web/ignite-websphere-test/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
.../ignite/cache/websession/WebSessionV2.java | 2 +-
.../internal/websession/WebSessionSelfTest.java | 6 +-
modules/yardstick/DEVNOTES-standalone.txt | 16 +
modules/yardstick/DEVNOTES.txt | 20 +
modules/yardstick/README.txt | 140 +-
.../config/benchmark-atomic-win.properties | 2 +-
.../config/benchmark-atomic.properties | 35 +-
.../config/benchmark-bin-identity.properties | 16 +-
.../config/benchmark-cache-load-win.properties | 2 +-
.../config/benchmark-cache-load.properties | 4 +-
.../config/benchmark-client-mode.properties | 68 +-
.../config/benchmark-compute-win.properties | 2 +-
.../config/benchmark-compute.properties | 30 +-
.../config/benchmark-failover.properties | 2 +-
.../yardstick/config/benchmark-full.properties | 62 +-
.../config/benchmark-multicast.properties | 107 +-
.../config/benchmark-put-indexed-val.properties | 23 +-
.../benchmark-query-put-separated.properties | 3 +-
.../config/benchmark-query-win.properties | 2 +-
.../yardstick/config/benchmark-query.properties | 33 +-
.../config/benchmark-remote-sample.properties | 80 +
.../config/benchmark-remote.properties | 119 +
.../config/benchmark-sample.properties | 80 +
.../config/benchmark-sql-dml.properties | 36 +-
.../yardstick/config/benchmark-store.properties | 3 +-
.../config/benchmark-tx-win.properties | 2 +-
.../yardstick/config/benchmark-tx.properties | 33 +-
.../yardstick/config/benchmark-win.properties | 2 +-
modules/yardstick/config/benchmark.properties | 76 +-
.../yardstick/config/ignite-remote-config.xml | 47 +
.../test-max-int-values-offheap.properties | 3 +-
.../test-max-int-values-onheap.properties | 3 +-
.../config/test-max-int-values-swap.properties | 3 +-
modules/yardstick/pom-standalone.xml | 209 +
modules/yardstick/pom.xml | 16 +-
.../yardstick/IgniteAbstractBenchmark.java | 30 +
.../yardstick/IgniteBenchmarkArguments.java | 33 +
.../ignite/yardstick/IgniteBenchmarkUtils.java | 48 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 2 +-
.../apache/ignite/yardstick/PreloadLogger.java | 155 +
.../yardstick/cache/CacheEntryEventProbe.java | 2 +-
.../cache/IgnitePutRemoveBenchmark.java | 42 +
.../cache/IgnitePutRemoveTxBenchmark.java | 30 +
.../cache/IgnitePutValue8Benchmark.java | 42 +
.../IgniteCacheRandomOperationBenchmark.java | 74 +-
.../io/IgniteIoTestAbstractBenchmark.java | 61 +
.../io/IgniteIoTestSendAllBenchmark.java | 32 +
.../io/IgniteIoTestSendRandomBenchmark.java | 35 +
modules/yarn/pom.xml | 2 +-
.../apache/ignite/yarn/ApplicationMaster.java | 4 +-
.../org/apache/ignite/yarn/IgniteProvider.java | 4 +-
modules/zeromq/README.txt | 37 +
modules/zeromq/licenses/apache-2.0.txt | 202 +
modules/zeromq/pom.xml | 75 +
.../stream/zeromq/IgniteZeroMqStreamer.java | 146 +
.../ignite/stream/zeromq/ZeroMqTypeSocket.java | 56 +
.../ignite/stream/zeromq/package-info.java | 21 +
.../stream/zeromq/IgniteZeroMqStreamerTest.java | 235 ++
.../zeromq/IgniteZeroMqStreamerTestSuite.java | 37 +
.../ZeroMqStringSingleTupleExtractor.java | 46 +
.../ignite/stream/zeromq/package-info.java | 21 +
modules/zookeeper/pom.xml | 2 +-
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 2 +-
parent/pom.xml | 7 +-
pom.xml | 103 +-
1389 files changed, 57337 insertions(+), 26692 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc7a9bd8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
----------------------------------------------------------------------
[31/39] ignite git commit: Remove clockSync in web-console module.
Posted by ag...@apache.org.
Remove clockSync in web-console module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/187bfeab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/187bfeab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/187bfeab
Branch: refs/heads/ignite-4587
Commit: 187bfeabafa362fc0c03d1c25e595c8af510ebdb
Parents: 57218fa
Author: Max Kozlov <dr...@gmail.com>
Authored: Tue Mar 14 16:07:26 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Tue Mar 14 16:07:26 2017 +0300
----------------------------------------------------------------------
modules/web-console/backend/app/mongo.js | 2 --
.../configuration/generator/ConfigurationGenerator.js | 4 +---
.../configuration/generator/defaults/Cluster.service.js | 2 --
.../app/modules/states/configuration/clusters/time.jade | 8 --------
4 files changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/187bfeab/modules/web-console/backend/app/mongo.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js
index 242df10..59a1a48 100644
--- a/modules/web-console/backend/app/mongo.js
+++ b/modules/web-console/backend/app/mongo.js
@@ -548,8 +548,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
compactFooter: Boolean
},
caches: [{type: ObjectId, ref: 'Cache'}],
- clockSyncSamples: Number,
- clockSyncFrequency: Number,
deploymentMode: {type: String, enum: ['PRIVATE', 'ISOLATED', 'SHARED', 'CONTINUOUS']},
discoveryStartupDelay: Number,
igfsThreadPoolSize: Number,
http://git-wip-us.apache.org/repos/asf/ignite/blob/187bfeab/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
index d099cb3..3ef63db 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -1285,9 +1285,7 @@ export default class IgniteConfigurationGenerator {
// Generate time group.
static clusterTime(cluster, cfg = this.igniteConfigurationBean(cluster)) {
- cfg.intProperty('clockSyncSamples')
- .intProperty('clockSyncFrequency')
- .intProperty('timeServerPortBase')
+ cfg.intProperty('timeServerPortBase')
.intProperty('timeServerPortRange');
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/187bfeab/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js
index 6333ef9..e58c3c7 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js
@@ -181,8 +181,6 @@ const DFLT_CLUSTER = {
metricsHistorySize: 10000,
metricsLogFrequency: 60000,
metricsUpdateFrequency: 2000,
- clockSyncSamples: 8,
- clockSyncFrequency: 120000,
timeServerPortBase: 31100,
timeServerPortRange: 100,
transactionConfiguration: {
http://git-wip-us.apache.org/repos/asf/ignite/blob/187bfeab/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade b/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade
index bcb1cb7..5c48013 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade
@@ -30,14 +30,6 @@ include /app/helpers/jade/mixins.jade
.panel-body(ng-if='ui.isPanelLoaded("#{form}")')
.col-sm-6
.settings-row
- +number('Samples size:', model + '.clockSyncSamples', '"clockSyncSamples"', 'true', '8', '0',
- 'Number of samples used to synchronize clocks between different nodes<br/>\
- Clock synchronization is used for cache version assignment in CLOCK order mode')
- .settings-row
- +number('Frequency:', model + '.clockSyncFrequency', '"clockSyncFrequency"', 'true', '120000', '0',
- 'Frequency at which clock is synchronized between nodes, in milliseconds<br/>\
- Clock synchronization is used for cache version assignment in CLOCK order mode')
- .settings-row
+number-min-max('Port base:', model + '.timeServerPortBase', '"timeServerPortBase"', 'true', '31100', '0', '65535',
'Time server provides clock synchronization between nodes<br/>\
Base UPD port number for grid time server. Time server will be started on one of free ports in range')
[12/39] ignite git commit: Remove CacheAtomicWriteOrderMode.java and
refactoring core module.
Posted by ag...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java
index 9891b3b..768f066 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -46,11 +44,6 @@ public class IgniteCacheAtomicPrimaryWriteOrderInvokeTest extends IgniteCacheInv
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
index 2833030..d445bf7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
@@ -17,16 +17,8 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
*
*/
public class IgniteCacheAtomicPrimaryWriteOrderStoreValueTest extends IgniteCacheAtomicStoreValueTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
index 66bdf95..47f0163 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -46,11 +44,6 @@ public class IgniteCacheAtomicStoreValueTest extends IgniteCacheStoreValueAbstra
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java
index 57be54c..cddb446 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -46,11 +44,6 @@ public class IgniteCacheEntryListenerAtomicTest extends IgniteCacheEntryListener
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
index d9fdfac..89e785c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
@@ -41,7 +41,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -171,7 +170,6 @@ public class IgniteCacheEntryListenerExpiredEventsTest extends GridCommonAbstrac
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
index 5163d96..4f92b12 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
@@ -35,7 +35,6 @@ import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -113,7 +112,6 @@ public class IgniteCacheEntryProcessorCallTest extends GridCommonAbstractTest {
ccfg.setBackups(1);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicityMode(ATOMIC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
checkEntryProcessorCallCount(ccfg, 1);
}
@@ -123,7 +121,6 @@ public class IgniteCacheEntryProcessorCallTest extends GridCommonAbstractTest {
ccfg.setBackups(0);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicityMode(ATOMIC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
checkEntryProcessorCallCount(ccfg, 1);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
index 294ebea..237fde7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
@@ -46,7 +46,6 @@ import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -342,7 +341,6 @@ public abstract class IgniteCacheInvokeReadThroughAbstractTest extends GridCommo
ccfg.setAtomicityMode(atomicityMode);
ccfg.setCacheMode(cacheMode);
ccfg.setAffinity(new RendezvousAffinityFunction(false, 32));
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setMemoryMode(memoryMode);
if (nearCache)
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
index fb2d0de..08b37d5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
@@ -24,7 +24,6 @@ import java.io.ObjectOutput;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import javax.cache.CacheException;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
@@ -63,11 +62,6 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTes
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CacheAtomicWriteOrderMode.PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java
index bb092d4..d72c9ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java
@@ -45,7 +45,6 @@ import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -224,7 +223,6 @@ public class IgniteCacheReadThroughStoreCallTest extends GridCommonAbstractTest
ccfg.setAtomicityMode(atomicityMode);
ccfg.setCacheMode(cacheMode);
ccfg.setAffinity(new RendezvousAffinityFunction(false, 32));
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPeekModesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPeekModesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPeekModesTest.java
index f399ca2..21a92a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPeekModesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTxPeekModesTest.java
@@ -17,11 +17,9 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -45,11 +43,6 @@ public class IgniteCacheTxPeekModesTest extends IgniteCachePeekModesAbstractTest
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override public void testLocalPeek() throws Exception {
fail("https://issues.apache.org/jira/browse/IGNITE-1839");
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java
index aac7019..6e4bdf9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
@@ -47,11 +46,6 @@ public class IgniteExchangeFutureHistoryTest extends IgniteCacheAbstractTest {
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CacheAtomicWriteOrderMode.PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorPartitionedAtomicCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorPartitionedAtomicCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorPartitionedAtomicCacheTest.java
index 1298607..84beadb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorPartitionedAtomicCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorPartitionedAtomicCacheTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -40,11 +38,6 @@ public class IgniteTopologyValidatorPartitionedAtomicCacheTest extends IgniteTop
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorReplicatedAtomicCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorReplicatedAtomicCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorReplicatedAtomicCacheTest.java
index 460de7f..f48097e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorReplicatedAtomicCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorReplicatedAtomicCacheTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -40,11 +38,6 @@ public class IgniteTopologyValidatorReplicatedAtomicCacheTest extends IgniteTopo
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java
index 86f5cff..025d345 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.context;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -40,11 +38,6 @@ public class IgniteCacheAtomicExecutionContextTest extends IgniteCacheAbstractEx
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java
index 4d8457e..36d2c2b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.context;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -40,11 +38,6 @@ public class IgniteCachePartitionedExecutionContextTest extends IgniteCacheAbstr
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java
index 3c5f016..c6e57f2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.context;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -40,11 +38,6 @@ public class IgniteCacheReplicatedExecutionContextTest extends IgniteCacheAbstra
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java
index b75fda3..680b134 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.context;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
/**
@@ -40,11 +38,6 @@ public class IgniteCacheTxExecutionContextTest extends IgniteCacheAbstractExecut
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicNearUpdateTopologyChangeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicNearUpdateTopologyChangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicNearUpdateTopologyChangeTest.java
index d19a1a4..931a22e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicNearUpdateTopologyChangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicNearUpdateTopologyChangeTest.java
@@ -17,11 +17,9 @@
package org.apache.ignite.internal.processors.cache.distributed;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.internal.processors.cache.CacheNearUpdateTopologyChangeAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -32,9 +30,4 @@ public class CacheAtomicNearUpdateTopologyChangeTest extends CacheNearUpdateTopo
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
index 70a6723..691c35f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
@@ -92,7 +92,6 @@ import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC;
@@ -194,7 +193,6 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest {
ccfg.setNodeFilter(cacheNodeFilter);
ccfg.setAffinity(affinityFunction(null));
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setBackups(0);
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledAtomicInvokeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledAtomicInvokeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledAtomicInvokeRestartSelfTest.java
index 90427f5..28f2fe0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledAtomicInvokeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheNearDisabledAtomicInvokeRestartSelfTest.java
@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.cache.processor.EntryProcessorException;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.CacheMode;
@@ -69,11 +68,6 @@ public class CacheNearDisabledAtomicInvokeRestartSelfTest extends CacheAbstractR
return ATOMIC;
}
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CacheAtomicWriteOrderMode.PRIMARY;
- }
-
/** */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 b3b2317..d275936 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
@@ -41,7 +41,6 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -140,13 +139,6 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
}
/**
- * @return Atomic write order mode.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return null;
- }
-
- /**
* @return Number of data nodes.
*/
protected int dataNodes() {
@@ -226,12 +218,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
if (cacheMode() == PARTITIONED)
ccfg.setBackups(backups());
- if (atomicityMode() == ATOMIC) {
- assert atomicWriteOrderMode() != null;
-
- ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
- }
- else {
+ if (atomicityMode() != ATOMIC) {
if (cacheMode() == PARTITIONED)
ccfg.setNearConfiguration(new NearCacheConfiguration());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
index 13b5b3b..b84e5ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
@@ -23,7 +23,6 @@ import java.util.Map;
import javax.cache.integration.CompletionListenerFuture;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.Affinity;
@@ -42,7 +41,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jsr166.ConcurrentHashMap8;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -100,8 +98,6 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid
else
cc.setCacheStoreFactory(null);
- cc.setAtomicWriteOrderMode(atomicWriteOrderMode());
-
c.setCacheConfiguration(cc);
return c;
@@ -122,13 +118,6 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid
}
/**
- * @return Write order mode for atomic cache.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /**
* @return {@code True} if near cache is enabled.
*/
protected abstract boolean nearEnabled();
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
index f36b060..8fd88ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
@@ -47,7 +47,6 @@ import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.eclipse.jetty.util.ConcurrentHashSet;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -131,7 +130,6 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest {
ccfg.setCacheMode(cacheMode);
ccfg.setAtomicityMode(atomicityMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(BACKUP_CNT);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java
index 96dd50c..eeb96c4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeJoinTest.java
@@ -17,21 +17,15 @@
package org.apache.ignite.internal.processors.cache.distributed;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
*
*/
public class IgniteCacheAtomicNodeJoinTest extends IgniteCacheNodeJoinAbstractTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
/** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index 4cd3f5a..3321a2c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -42,7 +42,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteTransactions;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.affinity.AffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
@@ -91,7 +91,6 @@ import org.apache.ignite.transactions.TransactionIsolation;
import org.eclipse.jetty.util.ConcurrentHashSet;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -150,31 +149,29 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testAtomicPutAllPrimaryMode() throws Exception {
- atomicPut(PRIMARY, true, null);
+ atomicPut(true, null);
}
/**
* @throws Exception If failed.
*/
public void testAtomicPutAllNearEnabledPrimaryMode() throws Exception {
- atomicPut(PRIMARY, true, new NearCacheConfiguration());
+ atomicPut(true, new NearCacheConfiguration());
}
/**
* @throws Exception If failed.
*/
public void testAtomicPutPrimaryMode() throws Exception {
- atomicPut(PRIMARY, false, null);
+ atomicPut(false, null);
}
/**
- * @param writeOrder Write order.
* @param putAll If {@code true} executes putAll.
* @param nearCfg Near cache configuration.
* @throws Exception If failed.
*/
- private void atomicPut(CacheAtomicWriteOrderMode writeOrder,
- final boolean putAll,
+ private void atomicPut(final boolean putAll,
@Nullable NearCacheConfiguration nearCfg) throws Exception {
ccfg = new CacheConfiguration();
@@ -182,7 +179,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
ccfg.setBackups(1);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(writeOrder);
ccfg.setRebalanceMode(SYNC);
IgniteEx ignite0 = startGrid(0);
@@ -213,8 +209,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
final IgniteCache<Integer, Integer> cache = ignite2.cache(null);
- assertEquals(writeOrder, cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode());
-
IgniteInternalFuture<?> putFut = GridTestUtils.runAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
Thread.currentThread().setName("put-thread");
@@ -294,21 +288,19 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testAtomicNoRemapPrimaryMode() throws Exception {
- atomicNoRemap(PRIMARY);
+ atomicNoRemap();
}
/**
- * @param writeOrder Write order.
* @throws Exception If failed.
*/
- private void atomicNoRemap(CacheAtomicWriteOrderMode writeOrder) throws Exception {
+ private void atomicNoRemap() throws Exception {
ccfg = new CacheConfiguration();
ccfg.setCacheMode(PARTITIONED);
ccfg.setBackups(1);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(writeOrder);
ccfg.setRebalanceMode(SYNC);
IgniteEx ignite0 = startGrid(0);
@@ -340,8 +332,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
final IgniteCache<Integer, Integer> cache = ignite3.cache(null);
- assertEquals(writeOrder, cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode());
-
IgniteInternalFuture<?> putFut = GridTestUtils.runAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
Thread.currentThread().setName("put-thread");
@@ -388,21 +378,19 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testAtomicGetAndPutPrimaryMode() throws Exception {
- atomicGetAndPut(PRIMARY);
+ atomicGetAndPut();
}
/**
- * @param writeOrder Write order.
* @throws Exception If failed.
*/
- private void atomicGetAndPut(CacheAtomicWriteOrderMode writeOrder) throws Exception {
+ private void atomicGetAndPut() throws Exception {
ccfg = new CacheConfiguration();
ccfg.setCacheMode(PARTITIONED);
ccfg.setBackups(1);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(writeOrder);
ccfg.setRebalanceMode(SYNC);
IgniteEx ignite0 = startGrid(0);
@@ -428,8 +416,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
final IgniteCache<Integer, Integer> cache = ignite2.cache(null);
- assertEquals(writeOrder, cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode());
-
IgniteInternalFuture<Integer> putFut = GridTestUtils.runAsync(new Callable<Integer>() {
@Override public Integer call() throws Exception {
Thread.currentThread().setName("put-thread");
@@ -1659,50 +1645,49 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
public void testAtomicPrimaryPutAllMultinode() throws Exception {
fail("https://issues.apache.org/jira/browse/IGNITE-1685");
- multinode(PRIMARY, TestType.PUT_ALL);
+ multinode(ATOMIC, TestType.PUT_ALL);
}
/**
* @throws Exception If failed.
*/
public void testOptimisticTxPutAllMultinode() throws Exception {
- multinode(null, TestType.OPTIMISTIC_TX);
+ multinode(TRANSACTIONAL, TestType.OPTIMISTIC_TX);
}
/**
* @throws Exception If failed.
*/
public void testOptimisticSerializableTxPutAllMultinode() throws Exception {
- multinode(null, TestType.OPTIMISTIC_SERIALIZABLE_TX);
+ multinode(TRANSACTIONAL, TestType.OPTIMISTIC_SERIALIZABLE_TX);
}
/**
* @throws Exception If failed.
*/
public void testPessimisticTxPutAllMultinode() throws Exception {
- multinode(null, TestType.PESSIMISTIC_TX);
+ multinode(TRANSACTIONAL, TestType.PESSIMISTIC_TX);
}
/**
* @throws Exception If failed.
*/
public void testLockAllMultinode() throws Exception {
- multinode(null, TestType.LOCK);
+ multinode(TRANSACTIONAL, TestType.LOCK);
}
/**
- * @param atomicWriteOrder Write order if test atomic cache.
+ * @param atomicityMode Atomicity mode cache.
* @param testType Test type.
* @throws Exception If failed.
*/
- private void multinode(final CacheAtomicWriteOrderMode atomicWriteOrder, final TestType testType)
+ private void multinode(CacheAtomicityMode atomicityMode, final TestType testType)
throws Exception {
ccfg = new CacheConfiguration();
ccfg.setCacheMode(PARTITIONED);
ccfg.setBackups(1);
- ccfg.setAtomicityMode(atomicWriteOrder != null ? ATOMIC : TRANSACTIONAL);
- ccfg.setAtomicWriteOrderMode(atomicWriteOrder);
+ ccfg.setAtomicityMode(atomicityMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setRebalanceMode(SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
index 1bfd727..5173237 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
@@ -39,7 +39,6 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -67,7 +66,6 @@ public abstract class IgniteCacheMessageRecoveryAbstractTest extends GridCommonA
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(atomicityMode());
ccfg.setBackups(1);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setNearConfiguration(null);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java
index 6f98c09..507d755 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java
@@ -24,7 +24,6 @@ import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.distributed.GridCacheAbstractPartitionedByteArrayValuesSelfTest;
import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.junit.Assert.assertArrayEquals;
@@ -59,19 +58,16 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex
atomicCacheCfg.setName(CACHE_ATOMIC);
atomicCacheCfg.setAtomicityMode(ATOMIC);
- atomicCacheCfg.setAtomicWriteOrderMode(PRIMARY);
CacheConfiguration atomicOffheapCacheCfg = offheapCacheConfiguration0();
atomicOffheapCacheCfg.setName(CACHE_ATOMIC_OFFHEAP);
atomicOffheapCacheCfg.setAtomicityMode(ATOMIC);
- atomicOffheapCacheCfg.setAtomicWriteOrderMode(PRIMARY);
CacheConfiguration atomicOffheapTieredCacheCfg = offheapTieredCacheConfiguration();
atomicOffheapTieredCacheCfg.setName(CACHE_ATOMIC_OFFHEAP_TIERED);
atomicOffheapTieredCacheCfg.setAtomicityMode(ATOMIC);
- atomicOffheapTieredCacheCfg.setAtomicWriteOrderMode(PRIMARY);
c.setCacheConfiguration(cacheConfiguration(),
offheapCacheConfiguration(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 67f697f..ce423f1 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
@@ -23,27 +23,18 @@ import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import javax.cache.CacheException;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
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;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
* Multi node test for disabled near cache.
*/
public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiSelfTest {
- /**
- * @return Write order mode for atomic cache.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
/** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
@@ -68,8 +59,6 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
-
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 6ffb443..79188c8 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
@@ -29,7 +29,6 @@ import javax.cache.processor.EntryProcessor;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -71,9 +70,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
private int backups;
/** */
- private CacheAtomicWriteOrderMode writeOrderMode;
-
- /** */
private int lastKey;
/** {@inheritDoc} */
@@ -87,10 +83,6 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
ccfg.setNearConfiguration(new NearCacheConfiguration());
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setRebalanceMode(SYNC);
-
- assert writeOrderMode != null;
-
- ccfg.setAtomicWriteOrderMode(writeOrderMode);
ccfg.setBackups(backups);
cfg.setCacheConfiguration(ccfg);
@@ -107,7 +99,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNoBackupsPrimaryWriteOrder() throws Exception {
- startGrids(0, CacheAtomicWriteOrderMode.PRIMARY);
+ startGridsLocal(0);
checkNearCache();
}
@@ -116,7 +108,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testWithBackupsPrimaryWriteOrder() throws Exception {
- startGrids(2, CacheAtomicWriteOrderMode.PRIMARY);
+ startGridsLocal(2);
checkNearCache();
}
@@ -776,14 +768,11 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
/**
* @param backups Backups number.
- * @param writeOrderMode Write order mode.
* @throws Exception If failed.
*/
- private void startGrids(int backups, CacheAtomicWriteOrderMode writeOrderMode) throws Exception {
+ private void startGridsLocal(int backups) throws Exception {
this.backups = backups;
- this.writeOrderMode = writeOrderMode;
-
startGrids(GRID_CNT);
awaitPartitionMapExchange();
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java
index 0895c42..c192046 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java
@@ -17,16 +17,8 @@
package org.apache.ignite.internal.processors.cache.distributed.dht;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
* Test for atomic cache with primary write order mode.
*/
public class GridCacheAtomicPrimaryWriteOrderFullApiSelfTest extends GridCacheAtomicFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java
index 1f216a7..72c5e17 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java
@@ -17,16 +17,8 @@
package org.apache.ignite.internal.processors.cache.distributed.dht;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
* Tests reloadAll for colocated cache with primary write order.
*/
public class GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest extends GridCacheAtomicReloadAllSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
index 8a857a5..b4e6a08 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
@@ -17,13 +17,11 @@
package org.apache.ignite.internal.processors.cache.distributed.dht;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -42,11 +40,6 @@ public class GridCacheDhtAtomicRemoveFailureTest extends GridCacheAbstractRemove
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearCache() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
index 66373fe..ea4112c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
@@ -35,7 +35,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -194,7 +193,6 @@ public class IgniteCacheConcurrentPutGetRemove extends GridCommonAbstractTest {
ccfg.setMemoryMode(memoryMode);
ccfg.setBackups(backups);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
index 6654fd9..ccc93d0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.locks.ReentrantLock;
import javax.cache.processor.EntryProcessor;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.Affinity;
@@ -34,7 +33,6 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -60,11 +58,6 @@ public class IgniteCachePartitionedBackupNodeFailureRecoveryTest extends IgniteC
}
/** {@inheritDoc}*/
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc}*/
@Override protected NearCacheConfiguration nearConfiguration() {
return new NearCacheConfiguration();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 57122bd..a69c915 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
@@ -33,7 +33,6 @@ import javax.cache.processor.EntryProcessorResult;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.CachePartialUpdateException;
@@ -57,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.CacheAtomicWriteOrderMode.PRIMARY;
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;
@@ -97,7 +95,6 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
cfg.setAtomicityMode(atomicityMode());
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setAtomicWriteOrderMode(writeOrderMode());
cfg.setBackups(1);
cfg.setRebalanceMode(SYNC);
@@ -161,13 +158,6 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
protected abstract CacheAtomicityMode atomicityMode();
/**
- * @return Write order mode.
- */
- protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
-
- /**
* @throws Exception If failed.
*/
public void testPut() throws Exception {
@@ -274,11 +264,6 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
int iter = 0;
try {
- if (atomicityMode() == ATOMIC) {
- assertEquals(writeOrderMode(),
- cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode());
- }
-
long stopTime = System.currentTimeMillis() + DURATION;
switch (test) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
index 69f74b9..f2b87e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
@@ -23,7 +23,6 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractFailoverSelfTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -35,8 +34,6 @@ public class GridCacheAtomicFailoverSelfTest extends GridCacheAbstractFailoverSe
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
-
assertEquals(CacheWriteSynchronizationMode.FULL_SYNC, ccfg.getWriteSynchronizationMode());
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index ac7c3e8..5de2524 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.IgniteException;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CachePartialUpdateException;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.Affinity;
@@ -59,7 +58,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jsr166.ThreadLocalRandom8;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
@@ -78,9 +76,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
/** Delay flag. */
private static volatile boolean delay;
- /** Write order. */
- private CacheAtomicWriteOrderMode writeOrder;
-
/** Write sync. */
private CacheWriteSynchronizationMode writeSync;
@@ -118,7 +113,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
ccfg.setCacheMode(PARTITIONED);
ccfg.setBackups(1);
- ccfg.setAtomicWriteOrderMode(writeOrder);
ccfg.setWriteSynchronizationMode(writeSync);
ccfg.setRebalanceMode(SYNC);
@@ -149,55 +143,52 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
* @throws Exception If failed.
*/
public void testPrimaryFullSync() throws Exception {
- checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.HEAP);
+ checkRestarts(FULL_SYNC, TestMemoryMode.HEAP);
}
/**
* @throws Exception If failed.
*/
public void testPrimaryFullSyncSwap() throws Exception {
- checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.SWAP);
+ checkRestarts(FULL_SYNC, TestMemoryMode.SWAP);
}
/**
* @throws Exception If failed.
*/
public void testPrimaryFullSyncOffheapTiered() throws Exception {
- checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED);
+ checkRestarts(FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED);
}
/**
* @throws Exception If failed.
*/
public void testPrimaryFullSyncOffheapSwap() throws Exception {
- checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP);
+ checkRestarts(FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP);
}
/**
* @throws Exception If failed.
*/
public void testPrimaryPrimarySync() throws Exception {
- checkRestarts(PRIMARY, PRIMARY_SYNC, TestMemoryMode.HEAP);
+ checkRestarts(PRIMARY_SYNC, TestMemoryMode.HEAP);
}
/**
* @throws Exception If failed.
*/
public void testPrimaryFullAsync() throws Exception {
- checkRestarts(PRIMARY, FULL_ASYNC, TestMemoryMode.HEAP);
+ checkRestarts(FULL_ASYNC, TestMemoryMode.HEAP);
}
/**
- * @param writeOrder Write order to check.
* @param writeSync Write synchronization mode to check.
* @param memMode Memory mode.
* @throws Exception If failed.
*/
- private void checkRestarts(CacheAtomicWriteOrderMode writeOrder,
- CacheWriteSynchronizationMode writeSync,
+ private void checkRestarts(CacheWriteSynchronizationMode writeSync,
TestMemoryMode memMode)
throws Exception {
- this.writeOrder = writeOrder;
this.writeSync = writeSync;
this.memMode = memMode;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
index 5cc18af..dec8ad2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
@@ -19,8 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
import org.apache.ignite.configuration.CacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
*
*/
@@ -29,8 +27,6 @@ public class GridCacheAtomicPrimaryWriteOrderFailoverSelfTest extends GridCacheA
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
-
return ccfg;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java
index 2fd8a82..0eb13a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java
@@ -17,13 +17,11 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -42,11 +40,6 @@ public class GridCacheAtomicPrimaryWriteOrderRemoveFailureTest extends GridCache
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearCache() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java
index 9d6bc33..8b992ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java
@@ -17,13 +17,11 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -42,11 +40,6 @@ public class GridCacheAtomicRemoveFailureTest extends GridCacheAbstractRemoveFai
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearCache() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java
index ac56011..d0a044d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java
@@ -17,11 +17,8 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
* Tests cache value consistency for ATOMIC mode with near cache enabled.
*/
@@ -31,9 +28,4 @@ public class GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest
@Override protected NearCacheConfiguration nearConfiguration() {
return new NearCacheConfiguration();
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java
index f270949..878d580 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java
@@ -17,16 +17,8 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
*
*/
public class GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest extends GridCacheValueConsistencyAtomicSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java
index 3ed1323..f703355 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java
@@ -16,17 +16,10 @@
*/
package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
*
*/
public class IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest extends IgniteCachePutRetryAtomicSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
index 247d78e..8847b1a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -30,13 +28,6 @@ import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
* Multi-node tests for partitioned cache.
*/
public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitionedMultiNodeFullApiSelfTest {
- /**
- * @return Write order mode for atomic cache.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
/** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
@@ -53,7 +44,6 @@ public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitione
cc.setRebalanceMode(SYNC);
cc.setBackups(1);
- cc.setAtomicWriteOrderMode(atomicWriteOrderMode());
return cc;
}
[30/39] ignite git commit: wip 2
Posted by ag...@apache.org.
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.
*/
[05/39] ignite git commit: Change from CLOCK to PRIMARY in
CacheConfigurationTest.cs.
Posted by ag...@apache.org.
Change from CLOCK to PRIMARY in CacheConfigurationTest.cs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/062d631d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/062d631d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/062d631d
Branch: refs/heads/ignite-4587
Commit: 062d631d6b6968963bcb6ef6431d622366b11706
Parents: fcc4d85
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 13 16:15:41 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 13 16:15:41 2017 +0300
----------------------------------------------------------------------
.../Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/062d631d/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
index 9d55160..7e0b77c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
@@ -587,7 +587,7 @@ namespace Apache.Ignite.Core.Tests.Cache
WriteBehindFlushFrequency = TimeSpan.FromSeconds(6),
WriteBehindFlushSize = 7,
EvictSynchronized = true,
- AtomicWriteOrderMode = CacheAtomicWriteOrderMode.Clock,
+ AtomicWriteOrderMode = CacheAtomicWriteOrderMode.Primary,
AtomicityMode = CacheAtomicityMode.Transactional,
Backups = 8,
CacheMode = CacheMode.Partitioned,
[29/39] ignite git commit: Remove GridJvmClockSource, GridClockSource,
GridClockServer, GridClockMessage, GridClockDeltaVersion,
GridClockDeltaSnapshotMessage, GridClockDeltaSnapshot classes.
Posted by ag...@apache.org.
Remove GridJvmClockSource, GridClockSource, GridClockServer, GridClockMessage, GridClockDeltaVersion, GridClockDeltaSnapshotMessage, GridClockDeltaSnapshot classes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/77d1bf6d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77d1bf6d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77d1bf6d
Branch: refs/heads/ignite-4587
Commit: 77d1bf6d953e48f4095255184b9142d85f3b6a41
Parents: ea3d5de
Author: Max Kozlov <dr...@gmail.com>
Authored: Sat Mar 11 09:22:43 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Sat Mar 11 09:22:43 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContext.java | 8 -
.../ignite/internal/GridKernalContextImpl.java | 19 --
.../communication/GridIoMessageFactory.java | 12 -
.../clock/GridClockDeltaSnapshot.java | 235 -------------------
.../clock/GridClockDeltaSnapshotMessage.java | 154 ------------
.../processors/clock/GridClockDeltaVersion.java | 194 ---------------
.../processors/clock/GridClockMessage.java | 171 --------------
.../processors/clock/GridClockServer.java | 216 -----------------
.../processors/clock/GridClockSource.java | 30 ---
.../processors/clock/GridJvmClockSource.java | 28 ---
.../resources/META-INF/classnames.properties | 2 -
11 files changed, 1069 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 1c39f9a..01a9348 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -36,7 +36,6 @@ import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
-import org.apache.ignite.internal.processors.clock.GridClockSource;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
@@ -420,13 +419,6 @@ public interface GridKernalContext extends Iterable<GridComponent> {
public GridIndexingManager indexing();
/**
- * Gets grid time source.
- *
- * @return Time source.
- */
- public GridClockSource timeSource();
-
- /**
* Gets data structures processor.
*
* @return Data structures processor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 24bb97a..55a14c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -51,8 +51,6 @@ import org.apache.ignite.internal.processors.cache.CacheConflictResolutionManage
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
-import org.apache.ignite.internal.processors.clock.GridClockSource;
-import org.apache.ignite.internal.processors.clock.GridJvmClockSource;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
@@ -349,9 +347,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/** Network segmented flag. */
private volatile boolean segFlag;
- /** Time source. */
- private GridClockSource clockSrc = new GridJvmClockSource();
-
/** Performance suggestions. */
private final GridPerformanceSuggestions perf = new GridPerformanceSuggestions();
@@ -836,20 +831,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
}
/** {@inheritDoc} */
- @Override public GridClockSource timeSource() {
- return clockSrc;
- }
-
- /**
- * Sets time source. For test purposes only.
- *
- * @param clockSrc Time source.
- */
- public void timeSource(GridClockSource clockSrc) {
- this.clockSrc = clockSrc;
- }
-
- /** {@inheritDoc} */
@Override public GridPerformanceSuggestions performance() {
return perf;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index b1fe910..232a5c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -111,8 +111,6 @@ import org.apache.ignite.internal.processors.cache.transactions.TxLocksResponse;
import org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
-import org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage;
-import org.apache.ignite.internal.processors.clock.GridClockDeltaVersion;
import org.apache.ignite.internal.processors.continuous.GridContinuousMessage;
import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry;
import org.apache.ignite.internal.processors.datastreamer.DataStreamerRequest;
@@ -546,11 +544,6 @@ public class GridIoMessageFactory implements MessageFactory {
break;
- case 60:
- msg = new GridClockDeltaSnapshotMessage();
-
- break;
-
case 61:
msg = new GridContinuousMessage();
@@ -621,11 +614,6 @@ public class GridIoMessageFactory implements MessageFactory {
break;
- case 83:
- msg = new GridClockDeltaVersion();
-
- break;
-
case 84:
msg = new GridByteArrayList();
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java
deleted file mode 100644
index 1e675b6..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.managers.discovery.GridDiscoveryTopologySnapshot;
-import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.internal.S;
-
-/**
- * Snapshot of time deltas for given topology.
- */
-public class GridClockDeltaSnapshot {
- /** Time delta version. */
- private final GridClockDeltaVersion ver;
-
- /** Deltas between coordinator and nodes by node ID. */
- private final Map<UUID, Long> deltas;
-
- /** Pending delta values. */
- @GridToStringExclude
- private final Map<UUID, DeltaAverage> pendingDeltas;
-
- /**
- * @param ver Snapshot version.
- * @param locNodeId Local node ID.
- * @param discoSnap Discovery snapshot.
- * @param avgSize Average size.
- */
- public GridClockDeltaSnapshot(
- GridClockDeltaVersion ver,
- UUID locNodeId,
- GridDiscoveryTopologySnapshot discoSnap,
- int avgSize
- ) {
- assert ver.topologyVersion() == discoSnap.topologyVersion();
-
- this.ver = ver;
-
- deltas = new HashMap<>(discoSnap.topologyNodes().size(), 1.0f);
-
- pendingDeltas = new HashMap<>(discoSnap.topologyNodes().size(), 1.0f);
-
- for (ClusterNode n : discoSnap.topologyNodes()) {
- if (!locNodeId.equals(n.id()))
- pendingDeltas.put(n.id(), new DeltaAverage(avgSize));
- }
- }
-
- /**
- * @param ver Snapshot version.
- * @param deltas Deltas map.
- */
- public GridClockDeltaSnapshot(GridClockDeltaVersion ver, Map<UUID, Long> deltas) {
- this.ver = ver;
- this.deltas = deltas;
-
- pendingDeltas = Collections.emptyMap();
- }
-
- /**
- * @return Version.
- */
- public GridClockDeltaVersion version() {
- return ver;
- }
-
- /**
- * @return Map of collected deltas.
- */
- public Map<UUID, Long> deltas() {
- return Collections.unmodifiableMap(deltas);
- }
-
- /**
- * Awaits either until snapshot is ready or timeout elapses.
- *
- * @param timeout Timeout to wait.
- * @throws IgniteInterruptedCheckedException If wait was interrupted.
- */
- public synchronized void awaitReady(long timeout) throws IgniteInterruptedCheckedException {
- long start = System.currentTimeMillis();
-
- try {
- while (!ready()) {
- long now = System.currentTimeMillis();
-
- if (start + timeout - now <= 0)
- return;
-
- wait(start + timeout - now);
- }
- }
- catch (InterruptedException e) {
- Thread.currentThread().interrupt();
-
- throw new IgniteInterruptedCheckedException(e);
- }
- }
-
- /**
- * Callback invoked when time delta is received from remote node.
- *
- * @param nodeId Node ID.
- * @param timeDelta Calculated time delta.
- * @return {@code True} if more samples needed from that node.
- */
- public synchronized boolean onDeltaReceived(UUID nodeId, long timeDelta) {
- DeltaAverage avg = pendingDeltas.get(nodeId);
-
- if (avg != null) {
- avg.onValue(timeDelta);
-
- if (avg.ready()) {
- pendingDeltas.remove(nodeId);
-
- deltas.put(nodeId, avg.average());
-
- if (ready())
- notifyAll();
-
- return false;
- }
-
- return true;
- }
-
- return false;
- }
-
- /**
- * Callback invoked when node left.
- *
- * @param nodeId Left node ID.
- */
- public synchronized void onNodeLeft(UUID nodeId) {
- pendingDeltas.remove(nodeId);
-
- deltas.put(nodeId, 0L);
-
- if (ready())
- notifyAll();
- }
-
- /**
- * @return {@code True} if snapshot is ready.
- */
- public synchronized boolean ready() {
- return pendingDeltas.isEmpty();
- }
-
- /**
- * @return Collection of node IDs for which response was not received so far.
- */
- public synchronized Collection<UUID> pendingNodeIds() {
- // Must return copy.
- return new HashSet<>(pendingDeltas.keySet());
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridClockDeltaSnapshot.class, this);
- }
-
- /**
- * Delta average.
- */
- private static class DeltaAverage {
- /** Delta values. */
- private long[] vals;
-
- /** Current index. */
- private int idx;
-
- /**
- * @param size Accumulator size.
- */
- private DeltaAverage(int size) {
- vals = new long[size];
- }
-
- /**
- * Adds value to accumulator.
- *
- * @param val Value to add.
- */
- public void onValue(long val) {
- if (idx < vals.length)
- vals[idx++] = val;
- }
-
- /**
- * Whether this average is complete.
- *
- * @return {@code True} if enough values is collected.
- */
- public boolean ready() {
- return idx == vals.length;
- }
-
- /**
- * @return Average delta.
- */
- public long average() {
- long sum = 0;
-
- for (long val : vals)
- sum += val;
-
- return sum / vals.length;
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
deleted file mode 100644
index 11a0ed7..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.io.Externalizable;
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.ignite.internal.GridDirectMap;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
-
-/**
- * Message containing time delta map for all nodes.
- */
-public class GridClockDeltaSnapshotMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Snapshot version. */
- private GridClockDeltaVersion snapVer;
-
- /** Grid time deltas. */
- @GridToStringInclude
- @GridDirectMap(keyType = UUID.class, valueType = long.class)
- private Map<UUID, Long> deltas;
-
- /**
- * Empty constructor required by {@link Externalizable}.
- */
- public GridClockDeltaSnapshotMessage() {
- // No-op.
- }
-
- /**
- * @param snapVer Snapshot version.
- * @param deltas Deltas map.
- */
- public GridClockDeltaSnapshotMessage(GridClockDeltaVersion snapVer, Map<UUID, Long> deltas) {
- this.snapVer = snapVer;
- this.deltas = deltas;
- }
-
- /**
- * @return Snapshot version.
- */
- public GridClockDeltaVersion snapshotVersion() {
- return snapVer;
- }
-
- /**
- * @return Time deltas map.
- */
- public Map<UUID, Long> deltas() {
- return deltas;
- }
-
- /** {@inheritDoc} */
- @Override public void onAckReceived() {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType(), fieldsCount()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 0:
- if (!writer.writeMap("deltas", deltas, MessageCollectionItemType.UUID, MessageCollectionItemType.LONG))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeMessage("snapVer", snapVer))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- if (!reader.beforeMessageRead())
- return false;
-
- switch (reader.state()) {
- case 0:
- deltas = reader.readMap("deltas", MessageCollectionItemType.UUID, MessageCollectionItemType.LONG, false);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- snapVer = reader.readMessage("snapVer");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return reader.afterMessageRead(GridClockDeltaSnapshotMessage.class);
- }
-
- /** {@inheritDoc} */
- @Override public byte directType() {
- return 60;
- }
-
- /** {@inheritDoc} */
- @Override public byte fieldsCount() {
- return 2;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridClockDeltaSnapshotMessage.class, this);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
deleted file mode 100644
index 310fd50..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.nio.ByteBuffer;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
-
-/**
- * Version for time delta snapshot.
- */
-public class GridClockDeltaVersion implements Message, Comparable<GridClockDeltaVersion>, Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Snapshot local version. */
- private long ver;
-
- /** Topology version. */
- private long topVer;
-
- /**
- * Empty constructor required by {@link Externalizable}.
- */
- public GridClockDeltaVersion() {
- // No-op.
- }
-
- /**
- * @param ver Version.
- * @param topVer Topology version.
- */
- public GridClockDeltaVersion(long ver, long topVer) {
- this.ver = ver;
- this.topVer = topVer;
- }
-
- /**
- * @return Snapshot local version.
- */
- public long version() {
- return ver;
- }
-
- /**
- * @return Snapshot topology version.
- */
- public long topologyVersion() {
- return topVer;
- }
-
- /** {@inheritDoc} */
- @Override public void onAckReceived() {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public int compareTo(GridClockDeltaVersion o) {
- int res = Long.compare(topVer, o.topVer);
-
- if (res == 0)
- res = Long.compare(ver, o.ver);
-
- return res;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o)
- return true;
-
- if (!(o instanceof GridClockDeltaVersion))
- return false;
-
- GridClockDeltaVersion that = (GridClockDeltaVersion)o;
-
- return topVer == that.topVer && ver == that.ver;
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- int res = (int)(ver ^ (ver >>> 32));
-
- res = 31 * res + (int)(topVer ^ (topVer >>> 32));
-
- return res;
- }
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeLong(ver);
- out.writeLong(topVer);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- ver = in.readLong();
- topVer = in.readLong();
- }
-
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType(), fieldsCount()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 0:
- if (!writer.writeLong("topVer", topVer))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeLong("ver", ver))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- if (!reader.beforeMessageRead())
- return false;
-
- switch (reader.state()) {
- case 0:
- topVer = reader.readLong("topVer");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- ver = reader.readLong("ver");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return reader.afterMessageRead(GridClockDeltaVersion.class);
- }
-
- /** {@inheritDoc} */
- @Override public byte directType() {
- return 83;
- }
-
- /** {@inheritDoc} */
- @Override public byte fieldsCount() {
- return 2;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridClockDeltaVersion.class, this);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
deleted file mode 100644
index 99dc817..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.util.UUID;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
-
-/**
- * Time server message.
- */
-public class GridClockMessage {
- /** Packet size. */
- public static final int PACKET_SIZE = 48;
-
- /** Originating node ID. */
- private UUID origNodeId;
-
- /** Target node ID. */
- private UUID targetNodeId;
-
- /** Originating timestamp. */
- private long origTs;
-
- /** Remote node reply ts. */
- private long replyTs;
-
- /**
- * @param origNodeId Originating node ID.
- * @param targetNodeId Target node ID.
- * @param origTs Originating timestamp.
- * @param replyTs Reply timestamp.
- */
- public GridClockMessage(UUID origNodeId, UUID targetNodeId, long origTs, long replyTs) {
- this.origNodeId = origNodeId;
- this.targetNodeId = targetNodeId;
- this.origTs = origTs;
- this.replyTs = replyTs;
- }
-
- /**
- * @return Originating node ID.
- */
- public UUID originatingNodeId() {
- return origNodeId;
- }
-
- /**
- * @param origNodeId Originating node ID.
- */
- public void originatingNodeId(UUID origNodeId) {
- this.origNodeId = origNodeId;
- }
-
- /**
- * @return Target node ID.
- */
- public UUID targetNodeId() {
- return targetNodeId;
- }
-
- /**
- * @param targetNodeId Target node ID.
- */
- public void targetNodeId(UUID targetNodeId) {
- this.targetNodeId = targetNodeId;
- }
-
- /**
- * @return Originating timestamp.
- */
- public long originatingTimestamp() {
- return origTs;
- }
-
- /**
- * @param origTs Originating timestamp.
- */
- public void originatingTimestamp(long origTs) {
- this.origTs = origTs;
- }
-
- /**
- * @return Reply timestamp.
- */
- public long replyTimestamp() {
- return replyTs;
- }
-
- /**
- * @param replyTs Reply timestamp.
- */
- public void replyTimestamp(long replyTs) {
- this.replyTs = replyTs;
- }
-
- /**
- * Converts message to bytes to send over network.
- *
- * @return Bytes representing this packet.
- */
- public byte[] toBytes() {
- byte[] buf = new byte[PACKET_SIZE];
-
- int off = 0;
-
- off = U.longToBytes(origNodeId.getLeastSignificantBits(), buf, off);
- off = U.longToBytes(origNodeId.getMostSignificantBits(), buf, off);
-
- off = U.longToBytes(targetNodeId.getLeastSignificantBits(), buf, off);
- off = U.longToBytes(targetNodeId.getMostSignificantBits(), buf, off);
-
- off = U.longToBytes(origTs, buf, off);
-
- off = U.longToBytes(replyTs, buf, off);
-
- assert off == PACKET_SIZE;
-
- return buf;
- }
-
- /**
- * Constructs message from bytes.
- *
- * @param buf Bytes.
- * @param off Offset.
- * @param len Packet length.
- * @return Assembled message.
- * @throws IgniteCheckedException If message length is invalid.
- */
- public static GridClockMessage fromBytes(byte[] buf, int off, int len) throws IgniteCheckedException {
- if (len < PACKET_SIZE)
- throw new IgniteCheckedException("Failed to assemble time server packet (message is too short).");
-
- long lsb = U.bytesToLong(buf, off);
- long msb = U.bytesToLong(buf, off + 8);
-
- UUID origNodeId = new UUID(msb, lsb);
-
- lsb = U.bytesToLong(buf, off + 16);
- msb = U.bytesToLong(buf, off + 24);
-
- UUID targetNodeId = new UUID(msb, lsb);
-
- long origTs = U.bytesToLong(buf, off + 32);
- long replyTs = U.bytesToLong(buf, off + 40);
-
- return new GridClockMessage(origNodeId, targetNodeId, origTs, replyTs);
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridClockMessage.class, this);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
deleted file mode 100644
index a736a37..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.SocketException;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.util.worker.GridWorker;
-import org.apache.ignite.thread.IgniteThread;
-
-/**
- * Time server that enables time synchronization between nodes.
- */
-public class GridClockServer {
- /** Kernal context. */
- private GridKernalContext ctx;
-
- /** Datagram socket for message exchange. */
- private DatagramSocket sock;
-
- /** Logger. */
- private IgniteLogger log;
-
- /** Read worker. */
- private GridWorker readWorker;
-
- /**
- * Starts server.
- *
- * @param ctx Kernal context.
- * @throws IgniteCheckedException If server could not be started.
- */
- public void start(GridKernalContext ctx) throws IgniteCheckedException {
- this.ctx = ctx;
-
- log = ctx.log(GridClockServer.class);
-
- try {
- int startPort = ctx.config().getTimeServerPortBase();
- int portRange = ctx.config().getTimeServerPortRange();
- int endPort = portRange == 0 ? startPort : startPort + portRange - 1;
-
- InetAddress locHost;
-
- if (F.isEmpty(ctx.config().getLocalHost())) {
- try {
- locHost = U.getLocalHost();
- }
- catch (IOException ignored) {
- locHost = InetAddress.getLoopbackAddress();
-
- U.warn(log, "Failed to get local host address, will use loopback address: " + locHost);
- }
- }
- else
- locHost = InetAddress.getByName(ctx.config().getLocalHost());
-
- for (int p = startPort; p <= endPort; p++) {
- try {
- sock = new DatagramSocket(p, locHost);
-
- if (log.isDebugEnabled())
- log.debug("Successfully bound time server [host=" + locHost + ", port=" + p + ']');
-
- break;
- }
- catch (SocketException e) {
- if (log.isDebugEnabled())
- log.debug("Failed to bind time server socket [host=" + locHost + ", port=" + p +
- ", err=" + e.getMessage() + ']');
- }
- }
-
- if (sock == null)
- throw new IgniteCheckedException("Failed to bind time server socket within specified port range " +
- "[locHost=" + locHost + ", startPort=" + startPort + ", endPort=" + endPort + ']');
- }
- catch (IOException e) {
- throw new IgniteCheckedException("Failed to start time server (failed to get local host address)", e);
- }
- }
-
- /**
- * After start callback.
- */
- public void afterStart() {
- readWorker = new ReadWorker();
-
- IgniteThread th = new IgniteThread(readWorker);
-
- th.setPriority(Thread.MAX_PRIORITY);
-
- th.start();
- }
-
- /**
- * Stops server.
- */
- public void stop() {
- // No-op.
- }
-
- /**
- * Before stop callback.
- */
- public void beforeStop() {
- if (readWorker != null)
- readWorker.cancel();
-
- U.closeQuiet(sock);
-
- if (readWorker != null)
- U.join(readWorker, log);
- }
-
- /**
- * Sends packet to remote node.
- *
- * @param msg Message to send.
- * @param addr Address.
- * @param port Port.
- * @throws IgniteCheckedException If send failed.
- */
- public void sendPacket(GridClockMessage msg, InetAddress addr, int port) throws IgniteCheckedException {
- try {
- DatagramPacket packet = new DatagramPacket(msg.toBytes(), GridClockMessage.PACKET_SIZE, addr, port);
-
- if (log.isDebugEnabled())
- log.debug("Sending time sync packet [msg=" + msg + ", addr=" + addr + ", port=" + port);
-
- sock.send(packet);
- }
- catch (IOException e) {
- if (!sock.isClosed())
- throw new IgniteCheckedException("Failed to send datagram message to remote node [addr=" + addr +
- ", port=" + port + ", msg=" + msg + ']', e);
- }
- }
-
- /**
- * @return Address to which this server is bound.
- */
- public InetAddress host() {
- return sock.getLocalAddress();
- }
-
- /**
- * @return Port to which this server is bound.
- */
- public int port() {
- return sock.getLocalPort();
- }
-
- /**
- * Message read worker.
- */
- private class ReadWorker extends GridWorker {
- /**
- * Creates read worker.
- */
- protected ReadWorker() {
- super(ctx.gridName(), "grid-time-server-reader", GridClockServer.this.log);
- }
-
- /** {@inheritDoc} */
- @Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException {
- DatagramPacket packet = new DatagramPacket(new byte[GridClockMessage.PACKET_SIZE],
- GridClockMessage.PACKET_SIZE);
-
- while (!isCancelled()) {
- try {
- // Read packet from buffer.
- sock.receive(packet);
-
- if (log.isDebugEnabled())
- log.debug("Received clock sync message from remote node [host=" + packet.getAddress() +
- ", port=" + packet.getPort() + ']');
-
- GridClockMessage msg = GridClockMessage.fromBytes(packet.getData(), packet.getOffset(),
- packet.getLength());
- }
- catch (IgniteCheckedException e) {
- U.warn(log, "Failed to assemble clock server message (will ignore the packet) [host=" +
- packet.getAddress() + ", port=" + packet.getPort() + ", err=" + e.getMessage() + ']');
- }
- catch (IOException e) {
- if (!isCancelled())
- U.warn(log, "Failed to receive message on datagram socket: " + e);
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSource.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSource.java
deleted file mode 100644
index ef7dc06..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSource.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-/**
- * Interface representing time source for time processor.
- */
-public interface GridClockSource {
- /**
- * Gets current time in milliseconds past since 1 January, 1970.
- *
- * @return Current time in milliseconds.
- */
- public long currentTimeMillis();
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridJvmClockSource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridJvmClockSource.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridJvmClockSource.java
deleted file mode 100644
index 77bc3eb..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridJvmClockSource.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-/**
- * JVM time source.
- */
-public class GridJvmClockSource implements GridClockSource {
- /** {@inheritDoc} */
- @Override public long currentTimeMillis() {
- return System.currentTimeMillis();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/77d1bf6d/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 6cce80a..c8b19f7 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -976,8 +976,6 @@ org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx
org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectByteArrayImpl
org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectImpl
org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserKeyCacheObjectImpl
-org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage
-org.apache.ignite.internal.processors.clock.GridClockDeltaVersion
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLAV2
[22/39] ignite git commit: Remove and rename tests.
Posted by ag...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java
deleted file mode 100644
index 2222ada..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.multijvm;
-
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest;
-
-/**
- * Multi-JVM tests.
- */
-public class GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest extends
- GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- protected boolean isMultiJvm() {
- return true;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
deleted file mode 100644
index 3aa161e..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.multijvm;
-
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest;
-
-/**
- * Multi-JVM tests.
- */
-public class GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest
- extends GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- protected boolean isMultiJvm() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public void testLocalClearKeys() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-1107");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java
deleted file mode 100644
index cc648f7..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.multijvm;
-
-import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest;
-
-/**
- * Multi-JVM tests.
- */
-public class GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends
- GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- protected boolean isMultiJvm() {
- return true;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java
deleted file mode 100644
index b2047a2..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.query.continuous;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMode;
-
-/**
- *
- */
-public class CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest
- extends CacheContinuousQueryFailoverAbstractSelfTest {
-
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return CacheMode.PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return CacheAtomicityMode.ATOMIC;
- }
-
- /** {@inheritDoc} */
- @Override protected boolean asyncCallback() {
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicSelfTest.java
new file mode 100644
index 0000000..3cab9e0
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicSelfTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.query.continuous;
+
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+
+/**
+ *
+ */
+public class CacheContinuousQueryAsyncFailoverAtomicSelfTest
+ extends CacheContinuousQueryFailoverAbstractSelfTest {
+
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return CacheMode.PARTITIONED;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return CacheAtomicityMode.ATOMIC;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected boolean asyncCallback() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
index 88999a3..4dd7c05 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
@@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
*
*/
public class CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest
- extends CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest {
+ extends CacheContinuousQueryFailoverAtomicSelfTest {
/** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
return PARTITIONED;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicOffheapTieredTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicOffheapTieredTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicOffheapTieredTest.java
new file mode 100644
index 0000000..14003d6
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicOffheapTieredTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.query.continuous;
+
+import org.apache.ignite.cache.CacheMemoryMode;
+
+import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
+
+/**
+ *
+ */
+public class CacheContinuousQueryFailoverAtomicOffheapTieredTest
+ extends CacheContinuousQueryFailoverAtomicSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheMemoryMode memoryMode() {
+ return OFFHEAP_TIERED;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.java
deleted file mode 100644
index cc8590d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.query.continuous;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
-
-/**
- *
- */
-public class CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest
- extends CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return OFFHEAP_TIERED;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java
deleted file mode 100644
index 44fe81a..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.query.continuous;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMode;
-
-/**
- *
- */
-public class CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest extends CacheContinuousQueryFailoverAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return CacheMode.PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return CacheAtomicityMode.ATOMIC;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java
index 80c65e5..4d9b701 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java
@@ -25,7 +25,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
*
*/
public class CacheContinuousQueryFailoverAtomicReplicatedSelfTest
- extends CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest {
+ extends CacheContinuousQueryFailoverAtomicSelfTest {
/** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
return REPLICATED;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicSelfTest.java
new file mode 100644
index 0000000..a7c7cc7
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicSelfTest.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.query.continuous;
+
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+
+/**
+ *
+ */
+public class CacheContinuousQueryFailoverAtomicSelfTest extends CacheContinuousQueryFailoverAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return CacheMode.PARTITIONED;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return CacheAtomicityMode.ATOMIC;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
index 986b8d4..16e195f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
@@ -37,10 +37,8 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.Atomic
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientInvalidPartitionHandlingSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientRemoveFailureTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicInvalidPartitionHandlingSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicPrimaryWriteOrderRemoveFailureTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicRemoveFailureTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearRemoveFailureTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearRemoveFailureTest;
import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingPartitionDistributionTest;
import org.apache.ignite.testframework.GridTestUtils;
@@ -73,7 +71,6 @@ public class IgniteCacheFailoverTestSuite extends TestSuite {
// Failure consistency tests.
suite.addTestSuite(GridCacheAtomicRemoveFailureTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.class);
suite.addTestSuite(GridCacheAtomicClientRemoveFailureTest.class);
suite.addTestSuite(GridCacheDhtAtomicRemoveFailureTest.class);
@@ -81,7 +78,6 @@ public class IgniteCacheFailoverTestSuite extends TestSuite {
suite.addTestSuite(GridCacheDhtClientRemoveFailureTest.class);
suite.addTestSuite(GridCacheNearRemoveFailureTest.class);
suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.class);
suite.addTestSuite(IgniteCacheAtomicNodeJoinTest.class);
suite.addTestSuite(IgniteCacheTxNodeJoinTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
index 60ada78..1150286 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
@@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.cache.distributed.CachePutAllFailov
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedFailoverSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheCrossCacheTxFailoverTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicFailoverSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicPrimaryWriteOrderFailoverSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicReplicatedFailoverSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedFailoverSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxSalvageSelfTest;
@@ -47,7 +46,6 @@ public class IgniteCacheFailoverTestSuite2 {
suite.addTestSuite(CacheGetFromJobTest.class);
suite.addTestSuite(GridCacheAtomicFailoverSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.class);
suite.addTestSuite(GridCacheAtomicReplicatedFailoverSelfTest.class);
suite.addTestSuite(GridCachePartitionedFailoverSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
index 85b6e93..f1cf267 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
@@ -21,7 +21,6 @@ import junit.framework.TestSuite;
import org.apache.ignite.internal.processors.cache.distributed.CacheGetInsideLockChangingTopologyTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest;
/**
* Test suite.
@@ -35,7 +34,6 @@ public class IgniteCacheFailoverTestSuite3 extends TestSuite {
TestSuite suite = new TestSuite("Cache Failover Test Suite3");
suite.addTestSuite(IgniteCachePutRetryAtomicSelfTest.class);
- suite.addTestSuite(IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.class);
suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
suite.addTestSuite(CacheGetInsideLockChangingTopologyTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
index 584916a..cdf75e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
@@ -27,16 +27,10 @@ import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicMulti
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicOffHeapMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheNearOnlyMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest;
@@ -53,7 +47,6 @@ import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitioned
import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedOffHeapMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedAtomicMultiJvmFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest;
@@ -75,18 +68,14 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest.class);
suite.addTestSuite(GridCacheReplicatedAtomicMultiJvmFullApiSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedCopyOnReadDisabledMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicCopyOnReadDisabledMultiJvmFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicMultiJvmP2PDisabledFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest.class);
@@ -105,7 +94,6 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicFairAffinityMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicNearEnabledFairAffinityMultiJvmFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.class);
@@ -113,14 +101,12 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedOffHeapMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedOffHeapMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicOffHeapMultiJvmFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiJvmFullApiSelfTest.class);
// Multi-node with off-heap tiered mode.
suite.addTestSuite(GridCacheReplicatedOffHeapTieredMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedOffHeapTieredMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicOffHeapTieredMultiJvmFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiJvmFullApiSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
index 17757ab..11dd423 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
@@ -21,9 +21,6 @@ import junit.framework.TestSuite;
import org.apache.ignite.internal.processors.cache.GridCacheClearSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicNearEnabledFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicPrimaryWriteOrderFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicReloadAllSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedReloadAllSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiNodeFullApiSelfTest;
@@ -42,26 +39,18 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAto
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicClientOnlyMultiNodeP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicFairAffinityMultiNodeFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicLateAffDisabledPrimaryWriteOrderMultiNodeFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearOnlyMultiNodeP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapTieredFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNoStripedPoolMultiNodeFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOffHeapTieredFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNoStripedPoolMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyFairAffinityMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest;
@@ -90,7 +79,6 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheR
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCachePartitionedFairAffinityMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedAtomicFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedAtomicMultiNodeFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedFullApiMultithreadedSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeFullApiSelfTest;
@@ -125,12 +113,10 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedFilteredPutSelfTest.class);
suite.addTestSuite(GridCacheReplicatedAtomicFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicNearEnabledFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.class);
// No primary.
suite.addTestSuite(GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.class);
@@ -142,7 +128,6 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedOffHeapFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedOffHeapFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicOffHeapFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapFullApiSelfTest.class);
// One node with off-heap tiered mode.
@@ -151,7 +136,6 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedOffHeapTieredFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedOffHeapTieredFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicOffHeapTieredFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOffHeapTieredFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredAtomicFullApiSelfTest.class);
@@ -159,18 +143,14 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheReplicatedMultiNodeP2PDisabledFullApiSelfTest.class);
suite.addTestSuite(GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.class);
suite.addTestSuite(CachePartitionedMultiNodeLongTxTimeoutFullApiTest.class);
suite.addTestSuite(CachePartitionedNearEnabledMultiNodeLongTxTimeoutFullApiTest.class);
@@ -195,14 +175,12 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCachePartitionedNearDisabledFairAffinityMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicFairAffinityMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicNearEnabledFairAffinityMultiNodeFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheNearOnlyFairAffinityMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicClientOnlyFairAffinityMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheNearReloadAllSelfTest.class);
suite.addTestSuite(GridCacheColocatedReloadAllSelfTest.class);
suite.addTestSuite(GridCacheAtomicReloadAllSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.class);
suite.addTestSuite(GridCacheNearTxMultiNodeSelfTest.class);
suite.addTestSuite(GridCachePartitionedMultiNodeCounterSelfTest.class);
@@ -210,20 +188,18 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedOffHeapMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedOffHeapMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.class);
// Multi-node with off-heap tiered mode.
suite.addTestSuite(GridCacheReplicatedOffHeapTieredMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedOffHeapTieredMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiNodeFullApiSelfTest.class);
// Old affinity assignment mode.
suite.addTestSuite(GridCachePartitionedLateAffDisabledMultiNodeFullApiSelfTest.class);
- suite.addTestSuite(GridCacheAtomicLateAffDisabledPrimaryWriteOrderMultiNodeFullApiSelfTest.class);
+ suite.addTestSuite(GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.class);
// Multithreaded.
suite.addTestSuite(GridCacheLocalFullApiMultithreadedSelfTest.class);
@@ -231,7 +207,7 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCachePartitionedFullApiMultithreadedSelfTest.class);
// Disabled striped pool.
- suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNoStripedPoolMultiNodeFullApiSelfTest.class);
+ suite.addTestSuite(GridCacheAtomicNoStripedPoolMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNoStripedPoolMultiNodeFullApiSelfTest.class);
// Other.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 3f0073d..3e6b815 100755
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -98,8 +98,7 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicInvokeTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalInvokeTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalWithStoreInvokeTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearEnabledInvokeTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPrimaryWriteOrderInvokeTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPrimaryWriteOrderWithStoreInvokeTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicWithStoreInvokeTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicStopBusySelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicLocalTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicOffheapTieredTest;
@@ -198,8 +197,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(IgniteCacheAtomicInvokeTest.class);
suite.addTestSuite(IgniteCacheAtomicNearEnabledInvokeTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderInvokeTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderWithStoreInvokeTest.class);
+ suite.addTestSuite(IgniteCacheAtomicWithStoreInvokeTest.class);
suite.addTestSuite(IgniteCacheAtomicLocalInvokeTest.class);
suite.addTestSuite(IgniteCacheAtomicLocalWithStoreInvokeTest.class);
suite.addTestSuite(IgniteCacheTxInvokeTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index 0785714..cd45b8f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -46,8 +46,6 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePart
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteTxReentryColocatedSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheValueConsistencyAtomicNearEnabledSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheValueConsistencyAtomicSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearPartitionedP2PDisabledByteArrayValuesSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest;
@@ -99,9 +97,7 @@ public class IgniteCacheTestSuite3 extends TestSuite {
// Value consistency tests.
suite.addTestSuite(GridCacheValueConsistencyAtomicSelfTest.class);
- suite.addTestSuite(GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.class);
suite.addTestSuite(GridCacheValueConsistencyAtomicNearEnabledSelfTest.class);
- suite.addTestSuite(GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.class);
suite.addTestSuite(GridCacheValueConsistencyTransactionalSelfTest.class);
suite.addTestSuite(GridCacheValueConsistencyTransactionalNearEnabledSelfTest.class);
suite.addTestSuite(GridCacheValueBytesPreloadingSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
index 5a09a1c..c65dc3ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -60,8 +60,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalStoreVa
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearEnabledStoreValueTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearPeekModesTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPeekModesTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPrimaryWriteOrderStoreValueTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicReplicatedPeekModesTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicStoreValueTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheConfigurationDefaultTemplateTest;
@@ -244,8 +242,6 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(IgniteCacheAtomicLocalStoreValueTest.class);
suite.addTestSuite(IgniteCacheAtomicStoreValueTest.class);
suite.addTestSuite(IgniteCacheAtomicNearEnabledStoreValueTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.class);
suite.addTestSuite(IgniteCacheTxLocalStoreValueTest.class);
suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java
index c4fcdac..0431377 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java
@@ -18,11 +18,11 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
-import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverAtomicSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverTxSelfTest;
-import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest;
-import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicOffheapTieredTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicReplicatedSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxOffheapTieredTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverTxReplicatedSelfTest;
@@ -40,14 +40,14 @@ public class IgniteCacheQuerySelfTestSuite4 extends TestSuite {
TestSuite suite = new TestSuite("Ignite Cache Queries Test Suite 4");
// Continuous queries failover tests.
- suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.class);
+ suite.addTestSuite(CacheContinuousQueryFailoverAtomicSelfTest.class);
suite.addTestSuite(CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class);
suite.addTestSuite(CacheContinuousQueryFailoverTxSelfTest.class);
suite.addTestSuite(CacheContinuousQueryFailoverTxReplicatedSelfTest.class);
- suite.addTestSuite(CacheContinuousQueryFailoverAtomicPrimaryWriteOrderOffheapTieredTest.class);
+ suite.addTestSuite(CacheContinuousQueryFailoverAtomicOffheapTieredTest.class);
suite.addTestSuite(CacheContinuousQueryFailoverTxOffheapTieredTest.class);
- suite.addTestSuite(CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.class);
+ suite.addTestSuite(CacheContinuousQueryAsyncFailoverAtomicSelfTest.class);
suite.addTestSuite(CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest.class);
suite.addTestSuite(CacheContinuousQueryAsyncFailoverTxSelfTest.class);
[36/39] ignite git commit: Remove globalTime and updateTime
Posted by ag...@apache.org.
Remove globalTime and updateTime
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2f858129
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2f858129
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2f858129
Branch: refs/heads/ignite-4587
Commit: 2f8581297e4a35f0f016917bfe02a550108afcb4
Parents: ea61e62
Author: Max Kozlov <dr...@gmail.com>
Authored: Thu Mar 16 14:08:26 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Thu Mar 16 14:08:26 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContext.java | 8 -
.../ignite/internal/GridKernalContextImpl.java | 12 -
.../apache/ignite/internal/IgniteKernal.java | 2 -
.../cache/GridCacheAtomicVersionComparator.java | 21 +-
.../processors/cache/GridCacheMapEntry.java | 1 -
.../processors/cache/GridCacheMvcc.java | 23 +-
.../processors/cache/GridCacheUtils.java | 7 +-
.../dht/GridPartitionedGetFuture.java | 2 +-
.../cache/transactions/IgniteTxEntry.java | 8 +-
.../cache/transactions/IgniteTxManager.java | 2 +-
.../version/GridCachePlainVersionedEntry.java | 5 -
.../version/GridCacheRawVersionedEntry.java | 5 -
.../cache/version/GridCacheVersion.java | 47 +-
.../cache/version/GridCacheVersionEx.java | 19 +-
.../cache/version/GridCacheVersionManager.java | 9 +-
.../cache/version/GridCacheVersionedEntry.java | 7 -
.../processors/clock/GridClockServer.java | 6 -
.../clock/GridClockSyncProcessor.java | 481 -------------------
.../ignite/internal/util/IgniteUtils.java | 26 +-
.../cache/GridCacheMvccFlagsTest.java | 4 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 24 +-
.../processors/cache/GridCacheMvccSelfTest.java | 8 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../cache/GridCacheVersionSelfTest.java | 4 +-
.../transactions/DepthFirstSearchTest.java | 18 +-
.../clock/GridTimeSyncProcessorSelfTest.java | 224 ---------
26 files changed, 77 insertions(+), 898 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 00696c7..1c39f9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -37,7 +37,6 @@ import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
import org.apache.ignite.internal.processors.clock.GridClockSource;
-import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
@@ -178,13 +177,6 @@ public interface GridKernalContext extends Iterable<GridComponent> {
public GridTimeoutProcessor timeout();
/**
- * Gets time processor.
- *
- * @return Time processor.
- */
- public GridClockSyncProcessor clockSync();
-
- /**
* Gets resource processor.
*
* @return Resource processor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index e80ec6b..24bb97a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -52,7 +52,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
import org.apache.ignite.internal.processors.clock.GridClockSource;
-import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
import org.apache.ignite.internal.processors.clock.GridJvmClockSource;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
@@ -186,10 +185,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/** */
@GridToStringInclude
- private GridClockSyncProcessor clockSyncProc;
-
- /** */
- @GridToStringInclude
private GridResourceProcessor rsrcProc;
/** */
@@ -514,8 +509,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
jobProc = (GridJobProcessor)comp;
else if (comp instanceof GridTimeoutProcessor)
timeProc = (GridTimeoutProcessor)comp;
- else if (comp instanceof GridClockSyncProcessor)
- clockSyncProc = (GridClockSyncProcessor)comp;
else if (comp instanceof GridResourceProcessor)
rsrcProc = (GridResourceProcessor)comp;
else if (comp instanceof GridJobMetricsProcessor)
@@ -637,11 +630,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
}
/** {@inheritDoc} */
- @Override public GridClockSyncProcessor clockSync() {
- return clockSyncProc;
- }
-
- /** {@inheritDoc} */
@Override public GridResourceProcessor resource() {
return rsrcProc;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index cdbe2e3..77ba212 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -108,7 +108,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
-import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
@@ -891,7 +890,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Start processors before discovery manager, so they will
// be able to start receiving messages once discovery completes.
startProcessor(createComponent(DiscoveryNodeValidationProcessor.class, ctx));
- startProcessor(new GridClockSyncProcessor(ctx));
startProcessor(new GridAffinityProcessor(ctx));
startProcessor(createComponent(GridSegmentationProcessor.class, ctx));
startProcessor(createComponent(IgniteCacheObjectProcessor.class, ctx));
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/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 08a5b28..ac0abec 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
@@ -36,24 +36,17 @@ public class GridCacheAtomicVersionComparator {
int otherTopVer = other.topologyVersion();
if (topVer == otherTopVer) {
- long globalTime = one.globalTime();
- long otherGlobalTime = other.globalTime();
+ long locOrder = one.order();
+ long otherLocOrder = other.order();
- if (globalTime == otherGlobalTime || ignoreTime) {
- long locOrder = one.order();
- long otherLocOrder = other.order();
+ if (locOrder == otherLocOrder) {
+ int nodeOrder = one.nodeOrder();
+ int otherNodeOrder = other.nodeOrder();
- if (locOrder == otherLocOrder) {
- int nodeOrder = one.nodeOrder();
- int otherNodeOrder = other.nodeOrder();
-
- return nodeOrder == otherNodeOrder ? 0 : nodeOrder < otherNodeOrder ? -1 : 1;
- }
- else
- return locOrder > otherLocOrder ? 1 : -1;
+ return nodeOrder == otherNodeOrder ? 0 : nodeOrder < otherNodeOrder ? -1 : 1;
}
else
- return globalTime > otherGlobalTime ? 1 : -1;
+ return locOrder > otherLocOrder ? 1 : -1;
}
else
return topVer > otherTopVer ? 1 : -1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/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 c33b60d..68d171c 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
@@ -2384,7 +2384,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
// Incorporate conflict version into new version if needed.
if (conflictVer != null && conflictVer != newVer)
newVer = new GridCacheVersionEx(newVer.topologyVersion(),
- newVer.globalTime(),
newVer.order(),
newVer.nodeOrder(),
newVer.dataCenterId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index 498584c..28cc8fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -57,26 +57,19 @@ public final class GridCacheMvcc {
/** */
private static final Comparator<GridCacheVersion> SER_VER_COMPARATOR = new Comparator<GridCacheVersion>() {
@Override public int compare(GridCacheVersion ver1, GridCacheVersion ver2) {
- long time1 = ver1.globalTime();
- long time2 = ver2.globalTime();
+ int nodeOrder1 = ver1.nodeOrder();
+ int nodeOrder2 = ver2.nodeOrder();
- if (time1 == time2) {
- int nodeOrder1 = ver1.nodeOrder();
- int nodeOrder2 = ver2.nodeOrder();
+ if (nodeOrder1 == nodeOrder2) {
+ long order1 = ver1.order();
+ long order2 = ver2.order();
- if (nodeOrder1 == nodeOrder2) {
- long order1 = ver1.order();
- long order2 = ver2.order();
+ assert order1 != order2;
- assert order1 != order2;
-
- return order1 > order2 ? 1 : -1;
- }
- else
- return nodeOrder1 > nodeOrder2 ? 1 : -1;
+ return order1 > order2 ? 1 : -1;
}
else
- return time1 > time2 ? 1 : -1;
+ return nodeOrder1 > nodeOrder2 ? 1 : -1;
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 1c59390..45d2c4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -981,12 +981,11 @@ public class GridCacheUtils {
public static byte[] versionToBytes(GridCacheVersion ver) {
assert ver != null;
- byte[] bytes = new byte[28];
+ byte[] bytes = new byte[20];
U.intToBytes(ver.topologyVersion(), bytes, 0);
- U.longToBytes(ver.globalTime(), bytes, 4);
- U.longToBytes(ver.order(), bytes, 12);
- U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20);
+ U.longToBytes(ver.order(), bytes, 4);
+ U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 12);
return bytes;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/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 1fe2d69..e49e266 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
@@ -73,7 +73,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda
private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
/** Dummy version sent to older nodes for backward compatibility, */
- private static final GridCacheVersion DUMMY_VER = new GridCacheVersion(0, 0, 0, 0);
+ private static final GridCacheVersion DUMMY_VER = new GridCacheVersion(0, 0, 0);
/** Logger. */
private static IgniteLogger log;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 1691fd7..da371a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -72,16 +72,16 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
private static final long serialVersionUID = 0L;
/** Dummy version for non-existing entry read in SERIALIZABLE transaction. */
- public static final GridCacheVersion SER_READ_EMPTY_ENTRY_VER = new GridCacheVersion(0, 0, 0, 0);
+ public static final GridCacheVersion SER_READ_EMPTY_ENTRY_VER = new GridCacheVersion(0, 0, 0);
/** Dummy version for any existing entry read in SERIALIZABLE transaction. */
- public static final GridCacheVersion SER_READ_NOT_EMPTY_VER = new GridCacheVersion(0, 0, 0, 1);
+ public static final GridCacheVersion SER_READ_NOT_EMPTY_VER = new GridCacheVersion(0, 0, 1);
/** */
- public static final GridCacheVersion GET_ENTRY_INVALID_VER_UPDATED = new GridCacheVersion(0, 0, 0, 2);
+ public static final GridCacheVersion GET_ENTRY_INVALID_VER_UPDATED = new GridCacheVersion(0, 0, 2);
/** */
- public static final GridCacheVersion GET_ENTRY_INVALID_VER_AFTER_GET = new GridCacheVersion(0, 0, 0, 3);
+ public static final GridCacheVersion GET_ENTRY_INVALID_VER_AFTER_GET = new GridCacheVersion(0, 0, 3);
/** Prepared flag updater. */
private static final AtomicIntegerFieldUpdater<IgniteTxEntry> PREPARED_UPD =
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index a1a18fe..2f12a1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -2426,7 +2426,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
* @param nearVer Near transaction version.
*/
private CommittedVersion(GridCacheVersion ver, GridCacheVersion nearVer) {
- super(ver.topologyVersion(), ver.globalTime(), ver.order(), ver.nodeOrder(), ver.dataCenterId());
+ super(ver.topologyVersion(), ver.order(), ver.nodeOrder(), ver.dataCenterId());
assert nearVer != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
index c175e5a..f4d7e08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
@@ -110,11 +110,6 @@ public class GridCachePlainVersionedEntry<K, V> implements GridCacheVersionedEnt
}
/** {@inheritDoc} */
- @Override public long globalTime() {
- return isStartVer ? 0L : ver.globalTime();
- }
-
- /** {@inheritDoc} */
@Override public GridCacheVersion version() {
return ver;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
index b7c96b4..7513935 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
@@ -170,11 +170,6 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen
}
/** {@inheritDoc} */
- @Override public long globalTime() {
- return ver.globalTime();
- }
-
- /** {@inheritDoc} */
@Override public GridCacheVersion version() {
return ver;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/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 ccc17e5..ea06a52 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
@@ -50,9 +50,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** Node order (used as global order) and DR ID. */
private int nodeOrderDrId;
- /** Globally adjusted time. */
- private long globalTime;
-
/** Order. */
private long order;
@@ -65,12 +62,11 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/**
* @param topVer Topology version plus number of seconds from the start time of the first grid node.
- * @param globalTime Globally adjusted time.
* @param order Version order.
* @param nodeOrder Node order.
* @param dataCenterId Replication data center ID.
*/
- public GridCacheVersion(int topVer, long globalTime, long order, int nodeOrder, int dataCenterId) {
+ public GridCacheVersion(int topVer, long order, int nodeOrder, int dataCenterId) {
assert topVer >= 0 : topVer;
assert order >= 0 : order;
assert nodeOrder >= 0 : nodeOrder;
@@ -80,7 +76,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
throw new IllegalArgumentException("Node order overflow: " + nodeOrder);
this.topVer = topVer;
- this.globalTime = globalTime;
this.order = order;
nodeOrderDrId = nodeOrder | (dataCenterId << DR_ID_SHIFT);
@@ -90,13 +85,11 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/**
* @param topVer Topology version plus number of seconds from the start time of the first grid node.
* @param nodeOrderDrId Node order and DR ID.
- * @param globalTime Globally adjusted time.
* @param order Version order.
*/
- public GridCacheVersion(int topVer, int nodeOrderDrId, long globalTime, long order) {
+ public GridCacheVersion(int topVer, int nodeOrderDrId, long order) {
this.topVer = topVer;
this.nodeOrderDrId = nodeOrderDrId;
- this.globalTime = globalTime;
this.order = order;
}
@@ -117,13 +110,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
}
/**
- * @return Adjusted time.
- */
- public long globalTime() {
- return globalTime;
- }
-
- /**
* @return Version order.
*/
public long order() {
@@ -187,7 +173,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
* @return Version represented as {@code GridUuid}
*/
public IgniteUuid asGridUuid() {
- return new IgniteUuid(new UUID(((long)topVer << 32) | nodeOrderDrId, globalTime), order);
+ return new IgniteUuid(new UUID(topVer, nodeOrderDrId), order);
}
/** {@inheritDoc} */
@@ -198,7 +184,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeInt(topVer);
- out.writeLong(globalTime);
out.writeLong(order);
out.writeInt(nodeOrderDrId);
}
@@ -206,7 +191,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException {
topVer = in.readInt();
- globalTime = in.readLong();
order = in.readLong();
nodeOrderDrId = in.readInt();
}
@@ -264,24 +248,18 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
switch (writer.state()) {
case 0:
- if (!writer.writeLong("globalTime", globalTime))
- return false;
-
- writer.incrementState();
-
- case 1:
if (!writer.writeInt("nodeOrderDrId", nodeOrderDrId))
return false;
writer.incrementState();
- case 2:
+ case 1:
if (!writer.writeLong("order", order))
return false;
writer.incrementState();
- case 3:
+ case 2:
if (!writer.writeInt("topVer", topVer))
return false;
@@ -301,14 +279,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
switch (reader.state()) {
case 0:
- globalTime = reader.readLong("globalTime");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
nodeOrderDrId = reader.readInt("nodeOrderDrId");
if (!reader.isLastRead())
@@ -316,7 +286,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
reader.incrementState();
- case 2:
+ case 1:
order = reader.readLong("order");
if (!reader.isLastRead())
@@ -324,7 +294,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
reader.incrementState();
- case 3:
+ case 2:
topVer = reader.readInt("topVer");
if (!reader.isLastRead())
@@ -344,13 +314,12 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 4;
+ return 3;
}
/** {@inheritDoc} */
@Override public String toString() {
return "GridCacheVersion [topVer=" + topologyVersion() +
- ", time=" + globalTime() +
", order=" + order() +
", nodeOrder=" + nodeOrder() + ']';
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index c89b941..27b4edc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -46,15 +46,14 @@ public class GridCacheVersionEx extends GridCacheVersion {
* Constructor.
*
* @param topVer Topology version.
- * @param globalTime Global time.
* @param order Order.
* @param nodeOrder Node order.
* @param dataCenterId Data center ID.
* @param drVer DR version.
*/
- public GridCacheVersionEx(int topVer, long globalTime, long order, int nodeOrder, byte dataCenterId,
+ public GridCacheVersionEx(int topVer, long order, int nodeOrder, byte dataCenterId,
GridCacheVersion drVer) {
- super(topVer, globalTime, order, nodeOrder, dataCenterId);
+ super(topVer, order, nodeOrder, dataCenterId);
assert drVer != null && !(drVer instanceof GridCacheVersionEx); // DR version can only be plain here.
@@ -66,12 +65,11 @@ public class GridCacheVersionEx extends GridCacheVersion {
*
* @param topVer Topology version.
* @param nodeOrderDrId Node order and DR ID.
- * @param globalTime Globally adjusted time.
* @param order Version order.
* @param drVer DR version.
*/
- public GridCacheVersionEx(int topVer, int nodeOrderDrId, long globalTime, long order, GridCacheVersion drVer) {
- super(topVer, nodeOrderDrId, globalTime, order);
+ public GridCacheVersionEx(int topVer, int nodeOrderDrId, long order, GridCacheVersion drVer) {
+ super(topVer, nodeOrderDrId, order);
assert drVer != null && !(drVer instanceof GridCacheVersionEx); // DR version can only be plain here.
@@ -90,7 +88,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 5;
+ return 4;
}
/** {@inheritDoc} */
@@ -108,7 +106,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
}
switch (writer.state()) {
- case 4:
+ case 3:
if (!writer.writeMessage("drVer", drVer))
return false;
@@ -130,7 +128,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
return false;
switch (reader.state()) {
- case 4:
+ case 3:
drVer = reader.readMessage("drVer");
if (!reader.isLastRead())
@@ -162,9 +160,8 @@ public class GridCacheVersionEx extends GridCacheVersion {
/** {@inheritDoc} */
@Override public String toString() {
return "GridCacheVersionEx [topVer=" + topologyVersion() +
- ", time=" + globalTime() +
", order=" + order() +
", nodeOrder=" + nodeOrder() +
", drVer=" + drVer + ']';
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
index 5a8904f..15a7d2a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
@@ -79,7 +79,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
/** {@inheritDoc} */
@Override public void start0() throws IgniteCheckedException {
- last = new GridCacheVersion(0, 0, order.get(), 0, dataCenterId);
+ last = new GridCacheVersion(0, order.get(), 0, dataCenterId);
cctx.gridEvents().addLocalEventListener(discoLsnr, EVT_NODE_METRICS_UPDATED);
}
@@ -103,7 +103,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
public void dataCenterId(byte dataCenterId) {
this.dataCenterId = dataCenterId;
- last = new GridCacheVersion(0, 0, order.get(), 0, dataCenterId);
+ last = new GridCacheVersion(0, order.get(), 0, dataCenterId);
}
/**
@@ -185,7 +185,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
topVer += (gridStartTime - TOP_VER_BASE_TIME) / 1000;
- ISOLATED_STREAMER_VER = new GridCacheVersion((int)topVer, 0, 0, 1, dataCenterId);
+ ISOLATED_STREAMER_VER = new GridCacheVersion((int)topVer, 0, 1, dataCenterId);
}
return ISOLATED_STREAMER_VER;
@@ -271,8 +271,6 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
if (topVer == -1)
topVer = cctx.kernalContext().discovery().topologyVersion();
- long globalTime = cctx.kernalContext().clockSync().adjustedTime(topVer);
-
if (addTime) {
if (gridStartTime == 0)
gridStartTime = cctx.kernalContext().discovery().gridStartTime();
@@ -286,7 +284,6 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
GridCacheVersion next = new GridCacheVersion(
(int)topVer,
- globalTime,
ord,
locNodeOrder,
dataCenterId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
index 06e7999..e685d79 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
@@ -71,11 +71,4 @@ public interface GridCacheVersionedEntry<K, V> {
* @return Entry's order in initiator data center
*/
public long order();
-
- /**
- * Gets entry's global time in initiator data center.
- *
- * @return Entry's global time in initiator data center
- */
- public long globalTime();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
index 8daef31..a736a37 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
@@ -47,9 +47,6 @@ public class GridClockServer {
/** Read worker. */
private GridWorker readWorker;
- /** Instance of time processor. */
- private GridClockSyncProcessor clockSync;
-
/**
* Starts server.
*
@@ -59,7 +56,6 @@ public class GridClockServer {
public void start(GridKernalContext ctx) throws IgniteCheckedException {
this.ctx = ctx;
- clockSync = ctx.clockSync();
log = ctx.log(GridClockServer.class);
try {
@@ -205,8 +201,6 @@ public class GridClockServer {
GridClockMessage msg = GridClockMessage.fromBytes(packet.getData(), packet.getOffset(),
packet.getLength());
-
- clockSync.onMessageReceived(msg, packet.getAddress(), packet.getPort());
}
catch (IgniteCheckedException e) {
U.warn(log, "Failed to assemble clock server message (will ignore the packet) [host=" +
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
deleted file mode 100644
index 257d0d9..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.net.InetAddress;
-import java.util.Collection;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.UUID;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.events.DiscoveryEvent;
-import org.apache.ignite.events.Event;
-import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.managers.communication.GridMessageListener;
-import org.apache.ignite.internal.managers.discovery.GridDiscoveryTopologySnapshot;
-import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
-import org.apache.ignite.internal.processors.GridProcessorAdapter;
-import org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap;
-import org.apache.ignite.internal.util.GridSpinReadWriteLock;
-import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.internal.LT;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.util.worker.GridWorker;
-import org.apache.ignite.thread.IgniteThread;
-
-import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
-import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
-import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
-import static org.apache.ignite.internal.GridTopic.TOPIC_TIME_SYNC;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TIME_SERVER_HOST;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TIME_SERVER_PORT;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
-
-/**
- * Time synchronization processor.
- */
-public class GridClockSyncProcessor extends GridProcessorAdapter {
- /** Maximum size for time sync history. */
- private static final int MAX_TIME_SYNC_HISTORY = 100;
-
- /** Time server instance. */
- private GridClockServer srv;
-
- /** Shutdown lock. */
- private GridSpinReadWriteLock rw = new GridSpinReadWriteLock();
-
- /** Stopping flag. */
- private volatile boolean stopping;
-
- /** Time coordinator thread. */
- private volatile TimeCoordinator timeCoord;
-
- /** Time delta history. Constructed on coordinator. */
- private NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> timeSyncHist =
- new GridBoundedConcurrentOrderedMap<>(MAX_TIME_SYNC_HISTORY);
-
- /** Last recorded. */
- private volatile T2<GridClockDeltaVersion, GridClockDeltaSnapshot> lastSnapshot;
-
- /** Time source. */
- private GridClockSource clockSrc;
-
- /**
- * @param ctx Kernal context.
- */
- public GridClockSyncProcessor(GridKernalContext ctx) {
- super(ctx);
- }
-
- /** {@inheritDoc} */
- @Override public void start() throws IgniteCheckedException {
- super.start();
-
- clockSrc = ctx.timeSource();
-
- srv = new GridClockServer();
-
- srv.start(ctx);
-
- ctx.io().addMessageListener(TOPIC_TIME_SYNC, new GridMessageListener() {
- @Override public void onMessage(UUID nodeId, Object msg) {
- assert msg instanceof GridClockDeltaSnapshotMessage;
-
- GridClockDeltaSnapshotMessage msg0 = (GridClockDeltaSnapshotMessage)msg;
-
- GridClockDeltaVersion ver = msg0.snapshotVersion();
-
- GridClockDeltaSnapshot snap = new GridClockDeltaSnapshot(ver, msg0.deltas());
-
- lastSnapshot = new T2<>(ver, snap);
-
- timeSyncHist.put(ver, snap);
- }
- });
-
- // We care only about node leave and fail events.
- ctx.event().addLocalEventListener(new GridLocalEventListener() {
- @Override public void onEvent(Event evt) {
- assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_JOINED;
-
- DiscoveryEvent discoEvt = (DiscoveryEvent)evt;
-
- if (evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED)
- checkLaunchCoordinator(discoEvt);
-
- TimeCoordinator timeCoord0 = timeCoord;
-
- if (timeCoord0 != null)
- timeCoord0.onDiscoveryEvent(discoEvt);
- }
- }, EVT_NODE_LEFT, EVT_NODE_FAILED, EVT_NODE_JOINED);
-
- ctx.addNodeAttribute(ATTR_TIME_SERVER_HOST, srv.host());
- ctx.addNodeAttribute(ATTR_TIME_SERVER_PORT, srv.port());
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStart() throws IgniteCheckedException {
- super.onKernalStart();
-
- srv.afterStart();
-
- // Check at startup if this node is a fragmentizer coordinator.
- DiscoveryEvent locJoinEvt = ctx.discovery().localJoinEvent();
-
- checkLaunchCoordinator(locJoinEvt);
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStop(boolean cancel) {
- super.onKernalStop(cancel);
-
- rw.writeLock();
-
- try {
- stopping = false;
-
- if (timeCoord != null) {
- timeCoord.cancel();
-
- U.join(timeCoord, log);
-
- timeCoord = null;
- }
-
- if (srv != null)
- srv.beforeStop();
- }
- finally {
- rw.writeUnlock();
- }
- }
-
- /** {@inheritDoc} */
- @Override public void stop(boolean cancel) throws IgniteCheckedException {
- super.stop(cancel);
-
- if (srv != null)
- srv.stop();
- }
-
- /**
- * Gets current time on local node.
- *
- * @return Current time in milliseconds.
- */
- private long currentTime() {
- return clockSrc.currentTimeMillis();
- }
-
- /**
- * @return Time sync history.
- */
- public NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> timeSyncHistory() {
- return timeSyncHist;
- }
-
- /**
- * Callback from server for message receiving.
- *
- * @param msg Received message.
- * @param addr Remote node address.
- * @param port Remote node port.
- */
- public void onMessageReceived(GridClockMessage msg, InetAddress addr, int port) {
- long rcvTs = currentTime();
-
- if (!msg.originatingNodeId().equals(ctx.localNodeId())) {
- // We received time request from remote node, set current time and reply back.
- msg.replyTimestamp(rcvTs);
-
- try {
- srv.sendPacket(msg, addr, port);
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to send time server reply to remote node: " + msg, e);
- }
- }
- else
- timeCoord.onMessage(msg, rcvTs);
- }
-
- /**
- * Checks if local node is the oldest node in topology and starts time coordinator if so.
- *
- * @param discoEvt Discovery event.
- */
- private void checkLaunchCoordinator(DiscoveryEvent discoEvt) {
- rw.readLock();
-
- try {
- if (stopping)
- return;
-
- if (timeCoord == null) {
- long minNodeOrder = Long.MAX_VALUE;
-
- Collection<ClusterNode> nodes = discoEvt.topologyNodes();
-
- for (ClusterNode node : nodes) {
- if (node.order() < minNodeOrder)
- minNodeOrder = node.order();
- }
-
- ClusterNode locNode = ctx.discovery().localNode();
-
- if (locNode.order() == minNodeOrder) {
- if (log.isDebugEnabled())
- log.debug("Detected local node to be the eldest node in topology, starting time " +
- "coordinator thread [discoEvt=" + discoEvt + ", locNode=" + locNode + ']');
-
- synchronized (this) {
- if (timeCoord == null && !stopping) {
- timeCoord = new TimeCoordinator(discoEvt);
-
- IgniteThread th = new IgniteThread(timeCoord);
-
- th.setPriority(Thread.MAX_PRIORITY);
-
- th.start();
- }
- }
- }
- }
- }
- finally {
- rw.readUnlock();
- }
- }
-
- /**
- * Gets time adjusted with time coordinator on given topology version.
- *
- * @param topVer Topology version.
- * @return Adjusted time.
- */
- public long adjustedTime(long topVer) {
- T2<GridClockDeltaVersion, GridClockDeltaSnapshot> fastSnap = lastSnapshot;
-
- GridClockDeltaSnapshot snap;
-
- if (fastSnap != null && fastSnap.get1().topologyVersion() == topVer)
- snap = fastSnap.get2();
- else {
- // Get last synchronized time on given topology version.
- Map.Entry<GridClockDeltaVersion, GridClockDeltaSnapshot> entry = timeSyncHistory().lowerEntry(
- new GridClockDeltaVersion(0, topVer + 1));
-
- snap = entry == null ? null : entry.getValue();
- }
-
- long now = clockSrc.currentTimeMillis();
-
- if (snap == null)
- return now;
-
- Long delta = snap.deltas().get(ctx.localNodeId());
-
- if (delta == null)
- delta = 0L;
-
- return now + delta;
- }
-
- /**
- * Publishes snapshot to topology.
- *
- * @param snapshot Snapshot to publish.
- * @param top Topology to send given snapshot to.
- */
- private void publish(GridClockDeltaSnapshot snapshot, GridDiscoveryTopologySnapshot top) {
- if (!rw.tryReadLock())
- return;
-
- try {
- lastSnapshot = new T2<>(snapshot.version(), snapshot);
-
- timeSyncHist.put(snapshot.version(), snapshot);
-
- for (ClusterNode n : top.topologyNodes()) {
- GridClockDeltaSnapshotMessage msg = new GridClockDeltaSnapshotMessage(
- snapshot.version(), snapshot.deltas());
-
- try {
- ctx.io().send(n, TOPIC_TIME_SYNC, msg, SYSTEM_POOL);
- }
- catch (IgniteCheckedException e) {
- if (ctx.discovery().pingNodeNoError(n.id()))
- U.error(log, "Failed to send time sync snapshot to remote node (did not leave grid?) " +
- "[nodeId=" + n.id() + ", msg=" + msg + ", err=" + e.getMessage() + ']');
- else if (log.isDebugEnabled())
- log.debug("Failed to send time sync snapshot to remote node (did not leave grid?) " +
- "[nodeId=" + n.id() + ", msg=" + msg + ", err=" + e.getMessage() + ']');
- }
- }
- }
- finally {
- rw.readUnlock();
- }
- }
-
- /**
- * Time coordinator thread.
- */
- private class TimeCoordinator extends GridWorker {
- /** Last discovery topology snapshot. */
- private volatile GridDiscoveryTopologySnapshot lastSnapshot;
-
- /** Snapshot being constructed. May be not null only on coordinator node. */
- private volatile GridClockDeltaSnapshot pendingSnapshot;
-
- /** Version counter. */
- private long verCnt = 1;
-
- /**
- * Time coordinator thread constructor.
- *
- * @param evt Discovery event on which this node became a coordinator.
- */
- protected TimeCoordinator(DiscoveryEvent evt) {
- super(ctx.gridName(), "grid-time-coordinator", GridClockSyncProcessor.this.log);
-
- lastSnapshot = new GridDiscoveryTopologySnapshot(evt.topologyVersion(), evt.topologyNodes());
- }
-
- /** {@inheritDoc} */
- @Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException {
- while (!isCancelled()) {
- GridDiscoveryTopologySnapshot top = lastSnapshot;
-
- if (log.isDebugEnabled())
- log.debug("Creating time sync snapshot for topology: " + top);
-
- GridClockDeltaSnapshot snapshot = new GridClockDeltaSnapshot(
- new GridClockDeltaVersion(verCnt++, top.topologyVersion()),
- ctx.localNodeId(),
- top,
- ctx.config().getClockSyncSamples());
-
- pendingSnapshot = snapshot;
-
- while (!snapshot.ready()) {
- if (log.isDebugEnabled())
- log.debug("Requesting time from remote nodes: " + snapshot.pendingNodeIds());
-
- for (UUID nodeId : snapshot.pendingNodeIds())
- requestTime(nodeId);
-
- if (log.isDebugEnabled())
- log.debug("Waiting for snapshot to be ready: " + snapshot);
-
- // Wait for all replies
- snapshot.awaitReady(1000);
- }
-
- // No more messages should be processed.
- pendingSnapshot = null;
-
- if (log.isDebugEnabled())
- log.debug("Collected time sync results: " + snapshot.deltas());
-
- publish(snapshot, top);
-
- synchronized (this) {
- if (top.topologyVersion() == lastSnapshot.topologyVersion())
- wait(ctx.config().getClockSyncFrequency());
- }
- }
- }
-
- /**
- * @param evt Discovery event.
- */
- public void onDiscoveryEvent(DiscoveryEvent evt) {
- if (log.isDebugEnabled())
- log.debug("Processing discovery event: " + evt);
-
- if (evt.type() == EventType.EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT)
- onNodeLeft(evt.eventNode().id());
-
- synchronized (this) {
- lastSnapshot = new GridDiscoveryTopologySnapshot(evt.topologyVersion(), evt.topologyNodes());
-
- notifyAll();
- }
- }
-
- /**
- * @param msg Message received from remote node.
- * @param rcvTs Receive timestamp.
- */
- private void onMessage(GridClockMessage msg, long rcvTs) {
- GridClockDeltaSnapshot curr = pendingSnapshot;
-
- if (curr != null) {
- long delta = (msg.originatingTimestamp() + rcvTs) / 2 - msg.replyTimestamp();
-
- boolean needMore = curr.onDeltaReceived(msg.targetNodeId(), delta);
-
- if (needMore)
- requestTime(msg.targetNodeId());
- }
- }
-
- /**
- * Requests time from remote node.
- *
- * @param rmtNodeId Remote node ID.
- */
- private void requestTime(UUID rmtNodeId) {
- ClusterNode node = ctx.discovery().node(rmtNodeId);
-
- if (node != null) {
- InetAddress addr = node.attribute(ATTR_TIME_SERVER_HOST);
- int port = node.attribute(ATTR_TIME_SERVER_PORT);
-
- try {
- GridClockMessage req = new GridClockMessage(ctx.localNodeId(), rmtNodeId, currentTime(), 0);
-
- srv.sendPacket(req, addr, port);
- }
- catch (IgniteCheckedException e) {
- LT.error(log, e, "Failed to send time request to remote node [rmtNodeId=" + rmtNodeId +
- ", addr=" + addr + ", port=" + port + ']');
- }
- }
- else
- onNodeLeft(rmtNodeId);
- }
-
- /**
- * Node left callback.
- *
- * @param nodeId Left node ID.
- */
- private void onNodeLeft(UUID nodeId) {
- GridClockDeltaSnapshot curr = pendingSnapshot;
-
- if (curr != null)
- curr.onNodeLeft(nodeId);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index f6c8163..374b02c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9219,10 +9219,6 @@ public abstract class IgniteUtils {
off += 4;
- GridUnsafe.putLong(arr, off, drVer.globalTime());
-
- off += 8;
-
GridUnsafe.putLong(arr, off, drVer.order());
off += 8;
@@ -9236,10 +9232,6 @@ public abstract class IgniteUtils {
off += 4;
- GridUnsafe.putLong(arr, off, ver.globalTime());
-
- off += 8;
-
GridUnsafe.putLong(arr, off, ver.order());
off += 8;
@@ -9255,16 +9247,14 @@ public abstract class IgniteUtils {
public static GridCacheVersion readVersion(long ptr, boolean verEx) {
GridCacheVersion ver = new GridCacheVersion(GridUnsafe.getInt(ptr),
GridUnsafe.getInt(ptr + 4),
- GridUnsafe.getLong(ptr + 8),
- GridUnsafe.getLong(ptr + 16));
+ GridUnsafe.getLong(ptr + 8));
if (verEx) {
- ptr += 24;
+ ptr += 16;
ver = new GridCacheVersionEx(GridUnsafe.getInt(ptr),
GridUnsafe.getInt(ptr + 4),
GridUnsafe.getLong(ptr + 8),
- GridUnsafe.getLong(ptr + 16),
ver);
}
@@ -9286,15 +9276,11 @@ public abstract class IgniteUtils {
off += 4;
- long globalTime = GridUnsafe.getLong(arr, off);
-
- off += 8;
-
long order = GridUnsafe.getLong(arr, off);
off += 8;
- GridCacheVersion ver = new GridCacheVersion(topVer, nodeOrderDrId, globalTime, order);
+ GridCacheVersion ver = new GridCacheVersion(topVer, nodeOrderDrId, order);
if (verEx) {
topVer = GridUnsafe.getInt(arr, off);
@@ -9305,13 +9291,9 @@ public abstract class IgniteUtils {
off += 4;
- globalTime = GridUnsafe.getLong(arr, off);
-
- off += 8;
-
order = GridUnsafe.getLong(arr, off);
- ver = new GridCacheVersionEx(topVer, nodeOrderDrId, globalTime, order, ver);
+ ver = new GridCacheVersionEx(topVer, nodeOrderDrId, order, ver);
}
return ver;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
index ff2d62d..827b0a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
@@ -73,7 +73,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
UUID id = UUID.randomUUID();
- GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0, 0);
+ GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0);
GridCacheMvccCandidate c = new GridCacheMvccCandidate(
entry,
@@ -114,7 +114,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
UUID id = UUID.randomUUID();
- GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0, 0);
+ GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0);
GridCacheMvccCandidate c = new GridCacheMvccCandidate(
entry,
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
index 9da6ea6..2fb5d25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
@@ -604,9 +604,9 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
public void testSerializableReadLocksAdd() throws Exception {
GridCacheAdapter<String, String> cache = grid.internalCache();
- GridCacheVersion serOrder1 = new GridCacheVersion(0, 0, 10, 1);
- GridCacheVersion serOrder2 = new GridCacheVersion(0, 0, 20, 1);
- GridCacheVersion serOrder3 = new GridCacheVersion(0, 0, 15, 1);
+ GridCacheVersion serOrder1 = new GridCacheVersion(0, 0, 1);
+ GridCacheVersion serOrder2 = new GridCacheVersion(0, 0, 1);
+ GridCacheVersion serOrder3 = new GridCacheVersion(0, 0, 1);
{
GridCacheMvcc mvcc = new GridCacheMvcc(cache.context());
@@ -681,9 +681,9 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
public void testSerializableReadLocksAssign() throws Exception {
GridCacheAdapter<String, String> cache = grid.internalCache();
- GridCacheVersion serOrder1 = new GridCacheVersion(0, 0, 10, 1);
- GridCacheVersion serOrder2 = new GridCacheVersion(0, 0, 20, 1);
- GridCacheVersion serOrder3 = new GridCacheVersion(0, 0, 15, 1);
+ GridCacheVersion serOrder1 = new GridCacheVersion(0, 0, 1);
+ GridCacheVersion serOrder2 = new GridCacheVersion(0, 0, 1);
+ GridCacheVersion serOrder3 = new GridCacheVersion(0, 0, 1);
{
GridCacheMvcc mvcc = new GridCacheMvcc(cache.context());
@@ -859,7 +859,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
1,
version(2),
0,
- new GridCacheVersion(0, 0, 30, 1),
+ new GridCacheVersion(0, 0, 1),
false,
true,
false,
@@ -883,10 +883,10 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
GridCacheTestEntryEx e = new GridCacheTestEntryEx(cache.context(), "1");
- GridCacheVersion serOrder1 = new GridCacheVersion(0, 0, 10, 1);
- GridCacheVersion serOrder2 = new GridCacheVersion(0, 0, 20, 1);
- GridCacheVersion serOrder3 = new GridCacheVersion(0, 0, 15, 1);
- GridCacheVersion serOrder4 = new GridCacheVersion(0, 0, 30, 1);
+ GridCacheVersion serOrder1 = new GridCacheVersion(0, 0, 1);
+ GridCacheVersion serOrder2 = new GridCacheVersion(0, 0, 1);
+ GridCacheVersion serOrder3 = new GridCacheVersion(0, 0, 1);
+ GridCacheVersion serOrder4 = new GridCacheVersion(0, 0, 1);
GridCacheVersion ver1 = incVer ? version(1) : version(4);
GridCacheVersion ver2 = incVer ? version(2) : version(3);
@@ -991,7 +991,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @return Version.
*/
private GridCacheVersion version(int order) {
- return new GridCacheVersion(1, 0, order, order, 0);
+ return new GridCacheVersion(1, order, order, 0);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
index d352e26..e15a20f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
@@ -174,8 +174,8 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
checkOrder(cands, ver1, ver5, ver3, ver2);
entry.orderCompleted(
- new GridCacheVersion(1, 0, 2, 0, 0),
- Arrays.asList(new GridCacheVersion(1, 0, 3, 4, 0), ver2, new GridCacheVersion(1, 0, 5, 6, 0)),
+ new GridCacheVersion(1, 2, 0, 0),
+ Arrays.asList(new GridCacheVersion(1, 3, 4, 0), ver2, new GridCacheVersion(1, 5, 6, 0)),
Collections.<GridCacheVersion>emptyList()
);
@@ -1053,7 +1053,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
entry.orderCompleted(
ver2 /*local version.*/,
- Arrays.asList(new GridCacheVersion(1, 0, 1, 2, 0), ver3, new GridCacheVersion(1, 0, 5, 6, 0)),
+ Arrays.asList(new GridCacheVersion(1, 1, 2, 0), ver3, new GridCacheVersion(1, 5, 6, 0)),
Collections.<GridCacheVersion>emptyList()
);
@@ -1619,7 +1619,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* @return Version.
*/
private GridCacheVersion version(int order) {
- return new GridCacheVersion(1, 0, order, order, 0);
+ return new GridCacheVersion(1, order, order, 0);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
index e76ab40..821807f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
@@ -52,7 +52,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
private long ttl;
/** Version. */
- private GridCacheVersion ver = new GridCacheVersion(0, 0, 0, 1, 0);
+ private GridCacheVersion ver = new GridCacheVersion(0, 0, 1, 0);
/** Obsolete version. */
private GridCacheVersion obsoleteVer = ver;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
index 8179dc5..475ccb5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
@@ -79,7 +79,7 @@ public class GridCacheVersionSelfTest extends GridCommonAbstractTest {
*/
public void testMarshalling() throws Exception {
GridCacheVersion ver = version(1, 1);
- GridCacheVersionEx verEx = new GridCacheVersionEx(2, 2, 0, 0, ver);
+ GridCacheVersionEx verEx = new GridCacheVersionEx(2, 2, 0, ver);
OptimizedMarshaller marsh = new OptimizedMarshaller(false);
@@ -101,6 +101,6 @@ public class GridCacheVersionSelfTest extends GridCommonAbstractTest {
* @return Cache version.
*/
private GridCacheVersion version(int nodeOrder, int drId) {
- return new GridCacheVersion(0, 0, 0, nodeOrder, drId);
+ return new GridCacheVersion(0, 0, nodeOrder, drId);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
index b0a407c..3d1064c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/DepthFirstSearchTest.java
@@ -38,22 +38,22 @@ import static org.apache.ignite.internal.processors.cache.transactions.TxDeadloc
*/
public class DepthFirstSearchTest extends TestCase {
/** Tx 1. */
- private static final GridCacheVersion T1 = new GridCacheVersion(1, 0, 0, 0);
+ private static final GridCacheVersion T1 = new GridCacheVersion(1, 0, 0);
/** Tx 2. */
- private static final GridCacheVersion T2 = new GridCacheVersion(2, 0, 0, 0);
+ private static final GridCacheVersion T2 = new GridCacheVersion(2, 0, 0);
/** Tx 3. */
- private static final GridCacheVersion T3 = new GridCacheVersion(3, 0, 0, 0);
+ private static final GridCacheVersion T3 = new GridCacheVersion(3, 0, 0);
/** Tx 4. */
- private static final GridCacheVersion T4 = new GridCacheVersion(4, 0, 0, 0);
+ private static final GridCacheVersion T4 = new GridCacheVersion(4, 0, 0);
/** Tx 5. */
- private static final GridCacheVersion T5 = new GridCacheVersion(5, 0, 0, 0);
+ private static final GridCacheVersion T5 = new GridCacheVersion(5, 0, 0);
/** Tx 6. */
- private static final GridCacheVersion T6 = new GridCacheVersion(6, 0, 0, 0);
+ private static final GridCacheVersion T6 = new GridCacheVersion(6, 0, 0);
/** All transactions. */
private static final List<GridCacheVersion> ALL = Arrays.asList(T1, T2, T3, T4, T5, T6);
@@ -291,19 +291,19 @@ public class DepthFirstSearchTest extends TestCase {
int n = rnd.nextInt(nodesCnt);
if (n != j) {
- waitForNodes.add(new GridCacheVersion(n, 0, 0, 0));
+ waitForNodes.add(new GridCacheVersion(n, 0, 0));
k++;
}
}
}
- wfg.put(new GridCacheVersion(j, 0, 0, 0), waitForNodes);
+ wfg.put(new GridCacheVersion(j, 0, 0), waitForNodes);
}
}
for (int j = 0; j < nodesCnt; j++) {
try {
- List<GridCacheVersion> cycle = findCycle(wfg, new GridCacheVersion(j, 0, 0, 0));
+ List<GridCacheVersion> cycle = findCycle(wfg, new GridCacheVersion(j, 0, 0));
if (cycle == null)
cyclesNotFound++;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f858129/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
deleted file mode 100644
index f5ba07d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.util.NavigableMap;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.GridKernalContextImpl;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.util.typedef.PA;
-import org.apache.ignite.lifecycle.LifecycleBean;
-import org.apache.ignite.lifecycle.LifecycleEventType;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-/**
- * Time sync processor self test.
- */
-public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest {
- /** IP finder. */
- private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
- /** Number of grids in test. */
- public static final int GRID_CNT = 4;
-
- /** Starting grid index. */
- private int idx;
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
-
- discoSpi.setIpFinder(IP_FINDER);
-
- cfg.setDiscoverySpi(discoSpi);
-
- cfg.setLifecycleBeans(new TimeShiftLifecycleBean(idx * 2000));
-
- idx++;
-
- return cfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTimeSync() throws Exception {
- startGrids(GRID_CNT);
-
- try {
- // Check coordinator time deltas.
- final IgniteKernal kernal = (IgniteKernal)grid(0);
-
- // Wait for latest time sync history.
- GridTestUtils.waitForCondition(new PA() {
- @Override public boolean apply() {
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> hist = kernal.context().clockSync()
- .timeSyncHistory();
-
- info("Checking time sync history: " + hist);
-
- for (GridClockDeltaVersion ver : hist.keySet()) {
- if (ver.topologyVersion() == 4)
- return true;
- }
-
- return false;
- }
- }, 10000);
-
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> history = kernal.context().clockSync()
- .timeSyncHistory();
-
- GridClockDeltaSnapshot snap = history.lastEntry().getValue();
-
- assertEquals(3, snap.deltas().size());
-
- for (int i = 1; i < GRID_CNT; i++) {
- Long delta = snap.deltas().get(grid(i).localNode().id());
-
- // Give 300ms range for test?
- int idealDelta = - i * 2000;
-
- int threshold = 100;
-
- assertTrue("Invalid time delta for node [expected=" + idealDelta + ", " +
- "actual=" + delta + ", threshold=" + threshold,
- delta <= idealDelta + threshold && delta >= idealDelta - threshold);
- }
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTimeSyncChangeCoordinator() throws Exception {
- startGrids(GRID_CNT);
-
- try {
- for (int i = 0; i < GRID_CNT; i++) {
- // Not coordinator now.
- stopGrid(i);
-
- startGrid(i);
- }
-
- // Check coordinator time deltas.
- final IgniteKernal kernal = (IgniteKernal)grid(0);
-
- assertEquals(6, kernal.localNode().order());
-
- // Wait for latest time sync history.
- GridTestUtils.waitForCondition(new PA() {
- @Override public boolean apply() {
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> hist = kernal.context().clockSync()
- .timeSyncHistory();
-
- info("Checking time sync history: " + hist);
-
- for (GridClockDeltaVersion ver : hist.keySet()) {
- if (ver.topologyVersion() == 12)
- return true;
- }
-
- return false;
- }
- }, 10000);
-
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> history = kernal.context().clockSync()
- .timeSyncHistory();
-
- GridClockDeltaSnapshot snap = history.lastEntry().getValue();
-
- assertEquals(3, snap.deltas().size());
-
- for (int i = 1; i < GRID_CNT; i++) {
- Long delta = snap.deltas().get(grid(i).localNode().id());
-
- // Give 300ms range for test?
- int idealDelta = - i * 2000;
-
- int threshold = 100;
-
- assertTrue("Invalid time delta for node [expected=" + idealDelta + ", " +
- "actual=" + delta + ", threshold=" + threshold,
- delta <= idealDelta + threshold && delta >= idealDelta - threshold);
- }
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
- * Time bean that sets shifted time source to context.
- */
- private static class TimeShiftLifecycleBean implements LifecycleBean {
- /** Injected grid. */
- @IgniteInstanceResource
- private Ignite g;
-
- /** Time delta. */
- private int delta;
-
- /**
- * Constructs lifecycle bean.
- *
- * @param delta Time delta.
- */
- private TimeShiftLifecycleBean(int delta) {
- this.delta = delta;
- }
-
- /** {@inheritDoc} */
- @Override public void onLifecycleEvent(LifecycleEventType evt) {
- if (evt == LifecycleEventType.BEFORE_NODE_START)
- ((GridKernalContextImpl)((IgniteKernal)g).context()).timeSource(new TimeShiftClockSource(delta));
- }
- }
-
- /**
- * Time shift time source.
- */
- private static class TimeShiftClockSource implements GridClockSource {
- /** Time shift delta. */
- private int delta;
-
- /**
- * @param delta Time shift delta.
- */
- private TimeShiftClockSource(int delta) {
- this.delta = delta;
- }
-
- /** {@inheritDoc} */
- @Override public long currentTimeMillis() {
- return System.currentTimeMillis() + delta;
- }
- }
-}
\ No newline at end of file
[25/39] ignite git commit: Remove GridClockSyncProcessor,
GridTimeSyncProcessorSelfTest and related.
Posted by ag...@apache.org.
Remove GridClockSyncProcessor, GridTimeSyncProcessorSelfTest and related.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/decc8021
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/decc8021
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/decc8021
Branch: refs/heads/ignite-4587
Commit: decc8021f7ae5c0073f8cf15c7ca64a57305aa3b
Parents: 6265f33
Author: Max Kozlov <dr...@gmail.com>
Authored: Thu Mar 9 14:34:40 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Thu Mar 9 14:34:40 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContext.java | 8 -
.../ignite/internal/GridKernalContextImpl.java | 12 -
.../apache/ignite/internal/IgniteKernal.java | 2 -
.../cache/version/GridCacheVersionManager.java | 3 +-
.../processors/clock/GridClockServer.java | 6 -
.../clock/GridClockSyncProcessor.java | 481 -------------------
.../clock/GridTimeSyncProcessorSelfTest.java | 224 ---------
7 files changed, 2 insertions(+), 734 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/decc8021/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 00696c7..1c39f9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -37,7 +37,6 @@ import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
import org.apache.ignite.internal.processors.clock.GridClockSource;
-import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
@@ -178,13 +177,6 @@ public interface GridKernalContext extends Iterable<GridComponent> {
public GridTimeoutProcessor timeout();
/**
- * Gets time processor.
- *
- * @return Time processor.
- */
- public GridClockSyncProcessor clockSync();
-
- /**
* Gets resource processor.
*
* @return Resource processor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/decc8021/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index e80ec6b..24bb97a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -52,7 +52,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
import org.apache.ignite.internal.processors.clock.GridClockSource;
-import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
import org.apache.ignite.internal.processors.clock.GridJvmClockSource;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
@@ -186,10 +185,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/** */
@GridToStringInclude
- private GridClockSyncProcessor clockSyncProc;
-
- /** */
- @GridToStringInclude
private GridResourceProcessor rsrcProc;
/** */
@@ -514,8 +509,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
jobProc = (GridJobProcessor)comp;
else if (comp instanceof GridTimeoutProcessor)
timeProc = (GridTimeoutProcessor)comp;
- else if (comp instanceof GridClockSyncProcessor)
- clockSyncProc = (GridClockSyncProcessor)comp;
else if (comp instanceof GridResourceProcessor)
rsrcProc = (GridResourceProcessor)comp;
else if (comp instanceof GridJobMetricsProcessor)
@@ -637,11 +630,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
}
/** {@inheritDoc} */
- @Override public GridClockSyncProcessor clockSync() {
- return clockSyncProc;
- }
-
- /** {@inheritDoc} */
@Override public GridResourceProcessor resource() {
return rsrcProc;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/decc8021/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index cdbe2e3..77ba212 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -108,7 +108,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
-import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
@@ -891,7 +890,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Start processors before discovery manager, so they will
// be able to start receiving messages once discovery completes.
startProcessor(createComponent(DiscoveryNodeValidationProcessor.class, ctx));
- startProcessor(new GridClockSyncProcessor(ctx));
startProcessor(new GridAffinityProcessor(ctx));
startProcessor(createComponent(GridSegmentationProcessor.class, ctx));
startProcessor(createComponent(IgniteCacheObjectProcessor.class, ctx));
http://git-wip-us.apache.org/repos/asf/ignite/blob/decc8021/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
index 5a8904f..9e5e37e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
@@ -271,7 +271,8 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
if (topVer == -1)
topVer = cctx.kernalContext().discovery().topologyVersion();
- long globalTime = cctx.kernalContext().clockSync().adjustedTime(topVer);
+// long globalTime = cctx.kernalContext().clockSync().adjustedTime(topVer);
+ long globalTime = 0;
if (addTime) {
if (gridStartTime == 0)
http://git-wip-us.apache.org/repos/asf/ignite/blob/decc8021/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
index 8daef31..a736a37 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
@@ -47,9 +47,6 @@ public class GridClockServer {
/** Read worker. */
private GridWorker readWorker;
- /** Instance of time processor. */
- private GridClockSyncProcessor clockSync;
-
/**
* Starts server.
*
@@ -59,7 +56,6 @@ public class GridClockServer {
public void start(GridKernalContext ctx) throws IgniteCheckedException {
this.ctx = ctx;
- clockSync = ctx.clockSync();
log = ctx.log(GridClockServer.class);
try {
@@ -205,8 +201,6 @@ public class GridClockServer {
GridClockMessage msg = GridClockMessage.fromBytes(packet.getData(), packet.getOffset(),
packet.getLength());
-
- clockSync.onMessageReceived(msg, packet.getAddress(), packet.getPort());
}
catch (IgniteCheckedException e) {
U.warn(log, "Failed to assemble clock server message (will ignore the packet) [host=" +
http://git-wip-us.apache.org/repos/asf/ignite/blob/decc8021/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
deleted file mode 100644
index 257d0d9..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.net.InetAddress;
-import java.util.Collection;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.UUID;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.events.DiscoveryEvent;
-import org.apache.ignite.events.Event;
-import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.managers.communication.GridMessageListener;
-import org.apache.ignite.internal.managers.discovery.GridDiscoveryTopologySnapshot;
-import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
-import org.apache.ignite.internal.processors.GridProcessorAdapter;
-import org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap;
-import org.apache.ignite.internal.util.GridSpinReadWriteLock;
-import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.internal.LT;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.util.worker.GridWorker;
-import org.apache.ignite.thread.IgniteThread;
-
-import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
-import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
-import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
-import static org.apache.ignite.internal.GridTopic.TOPIC_TIME_SYNC;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TIME_SERVER_HOST;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TIME_SERVER_PORT;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
-
-/**
- * Time synchronization processor.
- */
-public class GridClockSyncProcessor extends GridProcessorAdapter {
- /** Maximum size for time sync history. */
- private static final int MAX_TIME_SYNC_HISTORY = 100;
-
- /** Time server instance. */
- private GridClockServer srv;
-
- /** Shutdown lock. */
- private GridSpinReadWriteLock rw = new GridSpinReadWriteLock();
-
- /** Stopping flag. */
- private volatile boolean stopping;
-
- /** Time coordinator thread. */
- private volatile TimeCoordinator timeCoord;
-
- /** Time delta history. Constructed on coordinator. */
- private NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> timeSyncHist =
- new GridBoundedConcurrentOrderedMap<>(MAX_TIME_SYNC_HISTORY);
-
- /** Last recorded. */
- private volatile T2<GridClockDeltaVersion, GridClockDeltaSnapshot> lastSnapshot;
-
- /** Time source. */
- private GridClockSource clockSrc;
-
- /**
- * @param ctx Kernal context.
- */
- public GridClockSyncProcessor(GridKernalContext ctx) {
- super(ctx);
- }
-
- /** {@inheritDoc} */
- @Override public void start() throws IgniteCheckedException {
- super.start();
-
- clockSrc = ctx.timeSource();
-
- srv = new GridClockServer();
-
- srv.start(ctx);
-
- ctx.io().addMessageListener(TOPIC_TIME_SYNC, new GridMessageListener() {
- @Override public void onMessage(UUID nodeId, Object msg) {
- assert msg instanceof GridClockDeltaSnapshotMessage;
-
- GridClockDeltaSnapshotMessage msg0 = (GridClockDeltaSnapshotMessage)msg;
-
- GridClockDeltaVersion ver = msg0.snapshotVersion();
-
- GridClockDeltaSnapshot snap = new GridClockDeltaSnapshot(ver, msg0.deltas());
-
- lastSnapshot = new T2<>(ver, snap);
-
- timeSyncHist.put(ver, snap);
- }
- });
-
- // We care only about node leave and fail events.
- ctx.event().addLocalEventListener(new GridLocalEventListener() {
- @Override public void onEvent(Event evt) {
- assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_JOINED;
-
- DiscoveryEvent discoEvt = (DiscoveryEvent)evt;
-
- if (evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED)
- checkLaunchCoordinator(discoEvt);
-
- TimeCoordinator timeCoord0 = timeCoord;
-
- if (timeCoord0 != null)
- timeCoord0.onDiscoveryEvent(discoEvt);
- }
- }, EVT_NODE_LEFT, EVT_NODE_FAILED, EVT_NODE_JOINED);
-
- ctx.addNodeAttribute(ATTR_TIME_SERVER_HOST, srv.host());
- ctx.addNodeAttribute(ATTR_TIME_SERVER_PORT, srv.port());
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStart() throws IgniteCheckedException {
- super.onKernalStart();
-
- srv.afterStart();
-
- // Check at startup if this node is a fragmentizer coordinator.
- DiscoveryEvent locJoinEvt = ctx.discovery().localJoinEvent();
-
- checkLaunchCoordinator(locJoinEvt);
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStop(boolean cancel) {
- super.onKernalStop(cancel);
-
- rw.writeLock();
-
- try {
- stopping = false;
-
- if (timeCoord != null) {
- timeCoord.cancel();
-
- U.join(timeCoord, log);
-
- timeCoord = null;
- }
-
- if (srv != null)
- srv.beforeStop();
- }
- finally {
- rw.writeUnlock();
- }
- }
-
- /** {@inheritDoc} */
- @Override public void stop(boolean cancel) throws IgniteCheckedException {
- super.stop(cancel);
-
- if (srv != null)
- srv.stop();
- }
-
- /**
- * Gets current time on local node.
- *
- * @return Current time in milliseconds.
- */
- private long currentTime() {
- return clockSrc.currentTimeMillis();
- }
-
- /**
- * @return Time sync history.
- */
- public NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> timeSyncHistory() {
- return timeSyncHist;
- }
-
- /**
- * Callback from server for message receiving.
- *
- * @param msg Received message.
- * @param addr Remote node address.
- * @param port Remote node port.
- */
- public void onMessageReceived(GridClockMessage msg, InetAddress addr, int port) {
- long rcvTs = currentTime();
-
- if (!msg.originatingNodeId().equals(ctx.localNodeId())) {
- // We received time request from remote node, set current time and reply back.
- msg.replyTimestamp(rcvTs);
-
- try {
- srv.sendPacket(msg, addr, port);
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to send time server reply to remote node: " + msg, e);
- }
- }
- else
- timeCoord.onMessage(msg, rcvTs);
- }
-
- /**
- * Checks if local node is the oldest node in topology and starts time coordinator if so.
- *
- * @param discoEvt Discovery event.
- */
- private void checkLaunchCoordinator(DiscoveryEvent discoEvt) {
- rw.readLock();
-
- try {
- if (stopping)
- return;
-
- if (timeCoord == null) {
- long minNodeOrder = Long.MAX_VALUE;
-
- Collection<ClusterNode> nodes = discoEvt.topologyNodes();
-
- for (ClusterNode node : nodes) {
- if (node.order() < minNodeOrder)
- minNodeOrder = node.order();
- }
-
- ClusterNode locNode = ctx.discovery().localNode();
-
- if (locNode.order() == minNodeOrder) {
- if (log.isDebugEnabled())
- log.debug("Detected local node to be the eldest node in topology, starting time " +
- "coordinator thread [discoEvt=" + discoEvt + ", locNode=" + locNode + ']');
-
- synchronized (this) {
- if (timeCoord == null && !stopping) {
- timeCoord = new TimeCoordinator(discoEvt);
-
- IgniteThread th = new IgniteThread(timeCoord);
-
- th.setPriority(Thread.MAX_PRIORITY);
-
- th.start();
- }
- }
- }
- }
- }
- finally {
- rw.readUnlock();
- }
- }
-
- /**
- * Gets time adjusted with time coordinator on given topology version.
- *
- * @param topVer Topology version.
- * @return Adjusted time.
- */
- public long adjustedTime(long topVer) {
- T2<GridClockDeltaVersion, GridClockDeltaSnapshot> fastSnap = lastSnapshot;
-
- GridClockDeltaSnapshot snap;
-
- if (fastSnap != null && fastSnap.get1().topologyVersion() == topVer)
- snap = fastSnap.get2();
- else {
- // Get last synchronized time on given topology version.
- Map.Entry<GridClockDeltaVersion, GridClockDeltaSnapshot> entry = timeSyncHistory().lowerEntry(
- new GridClockDeltaVersion(0, topVer + 1));
-
- snap = entry == null ? null : entry.getValue();
- }
-
- long now = clockSrc.currentTimeMillis();
-
- if (snap == null)
- return now;
-
- Long delta = snap.deltas().get(ctx.localNodeId());
-
- if (delta == null)
- delta = 0L;
-
- return now + delta;
- }
-
- /**
- * Publishes snapshot to topology.
- *
- * @param snapshot Snapshot to publish.
- * @param top Topology to send given snapshot to.
- */
- private void publish(GridClockDeltaSnapshot snapshot, GridDiscoveryTopologySnapshot top) {
- if (!rw.tryReadLock())
- return;
-
- try {
- lastSnapshot = new T2<>(snapshot.version(), snapshot);
-
- timeSyncHist.put(snapshot.version(), snapshot);
-
- for (ClusterNode n : top.topologyNodes()) {
- GridClockDeltaSnapshotMessage msg = new GridClockDeltaSnapshotMessage(
- snapshot.version(), snapshot.deltas());
-
- try {
- ctx.io().send(n, TOPIC_TIME_SYNC, msg, SYSTEM_POOL);
- }
- catch (IgniteCheckedException e) {
- if (ctx.discovery().pingNodeNoError(n.id()))
- U.error(log, "Failed to send time sync snapshot to remote node (did not leave grid?) " +
- "[nodeId=" + n.id() + ", msg=" + msg + ", err=" + e.getMessage() + ']');
- else if (log.isDebugEnabled())
- log.debug("Failed to send time sync snapshot to remote node (did not leave grid?) " +
- "[nodeId=" + n.id() + ", msg=" + msg + ", err=" + e.getMessage() + ']');
- }
- }
- }
- finally {
- rw.readUnlock();
- }
- }
-
- /**
- * Time coordinator thread.
- */
- private class TimeCoordinator extends GridWorker {
- /** Last discovery topology snapshot. */
- private volatile GridDiscoveryTopologySnapshot lastSnapshot;
-
- /** Snapshot being constructed. May be not null only on coordinator node. */
- private volatile GridClockDeltaSnapshot pendingSnapshot;
-
- /** Version counter. */
- private long verCnt = 1;
-
- /**
- * Time coordinator thread constructor.
- *
- * @param evt Discovery event on which this node became a coordinator.
- */
- protected TimeCoordinator(DiscoveryEvent evt) {
- super(ctx.gridName(), "grid-time-coordinator", GridClockSyncProcessor.this.log);
-
- lastSnapshot = new GridDiscoveryTopologySnapshot(evt.topologyVersion(), evt.topologyNodes());
- }
-
- /** {@inheritDoc} */
- @Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException {
- while (!isCancelled()) {
- GridDiscoveryTopologySnapshot top = lastSnapshot;
-
- if (log.isDebugEnabled())
- log.debug("Creating time sync snapshot for topology: " + top);
-
- GridClockDeltaSnapshot snapshot = new GridClockDeltaSnapshot(
- new GridClockDeltaVersion(verCnt++, top.topologyVersion()),
- ctx.localNodeId(),
- top,
- ctx.config().getClockSyncSamples());
-
- pendingSnapshot = snapshot;
-
- while (!snapshot.ready()) {
- if (log.isDebugEnabled())
- log.debug("Requesting time from remote nodes: " + snapshot.pendingNodeIds());
-
- for (UUID nodeId : snapshot.pendingNodeIds())
- requestTime(nodeId);
-
- if (log.isDebugEnabled())
- log.debug("Waiting for snapshot to be ready: " + snapshot);
-
- // Wait for all replies
- snapshot.awaitReady(1000);
- }
-
- // No more messages should be processed.
- pendingSnapshot = null;
-
- if (log.isDebugEnabled())
- log.debug("Collected time sync results: " + snapshot.deltas());
-
- publish(snapshot, top);
-
- synchronized (this) {
- if (top.topologyVersion() == lastSnapshot.topologyVersion())
- wait(ctx.config().getClockSyncFrequency());
- }
- }
- }
-
- /**
- * @param evt Discovery event.
- */
- public void onDiscoveryEvent(DiscoveryEvent evt) {
- if (log.isDebugEnabled())
- log.debug("Processing discovery event: " + evt);
-
- if (evt.type() == EventType.EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT)
- onNodeLeft(evt.eventNode().id());
-
- synchronized (this) {
- lastSnapshot = new GridDiscoveryTopologySnapshot(evt.topologyVersion(), evt.topologyNodes());
-
- notifyAll();
- }
- }
-
- /**
- * @param msg Message received from remote node.
- * @param rcvTs Receive timestamp.
- */
- private void onMessage(GridClockMessage msg, long rcvTs) {
- GridClockDeltaSnapshot curr = pendingSnapshot;
-
- if (curr != null) {
- long delta = (msg.originatingTimestamp() + rcvTs) / 2 - msg.replyTimestamp();
-
- boolean needMore = curr.onDeltaReceived(msg.targetNodeId(), delta);
-
- if (needMore)
- requestTime(msg.targetNodeId());
- }
- }
-
- /**
- * Requests time from remote node.
- *
- * @param rmtNodeId Remote node ID.
- */
- private void requestTime(UUID rmtNodeId) {
- ClusterNode node = ctx.discovery().node(rmtNodeId);
-
- if (node != null) {
- InetAddress addr = node.attribute(ATTR_TIME_SERVER_HOST);
- int port = node.attribute(ATTR_TIME_SERVER_PORT);
-
- try {
- GridClockMessage req = new GridClockMessage(ctx.localNodeId(), rmtNodeId, currentTime(), 0);
-
- srv.sendPacket(req, addr, port);
- }
- catch (IgniteCheckedException e) {
- LT.error(log, e, "Failed to send time request to remote node [rmtNodeId=" + rmtNodeId +
- ", addr=" + addr + ", port=" + port + ']');
- }
- }
- else
- onNodeLeft(rmtNodeId);
- }
-
- /**
- * Node left callback.
- *
- * @param nodeId Left node ID.
- */
- private void onNodeLeft(UUID nodeId) {
- GridClockDeltaSnapshot curr = pendingSnapshot;
-
- if (curr != null)
- curr.onNodeLeft(nodeId);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/decc8021/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
deleted file mode 100644
index f5ba07d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.util.NavigableMap;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.GridKernalContextImpl;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.util.typedef.PA;
-import org.apache.ignite.lifecycle.LifecycleBean;
-import org.apache.ignite.lifecycle.LifecycleEventType;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-/**
- * Time sync processor self test.
- */
-public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest {
- /** IP finder. */
- private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
- /** Number of grids in test. */
- public static final int GRID_CNT = 4;
-
- /** Starting grid index. */
- private int idx;
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
-
- discoSpi.setIpFinder(IP_FINDER);
-
- cfg.setDiscoverySpi(discoSpi);
-
- cfg.setLifecycleBeans(new TimeShiftLifecycleBean(idx * 2000));
-
- idx++;
-
- return cfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTimeSync() throws Exception {
- startGrids(GRID_CNT);
-
- try {
- // Check coordinator time deltas.
- final IgniteKernal kernal = (IgniteKernal)grid(0);
-
- // Wait for latest time sync history.
- GridTestUtils.waitForCondition(new PA() {
- @Override public boolean apply() {
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> hist = kernal.context().clockSync()
- .timeSyncHistory();
-
- info("Checking time sync history: " + hist);
-
- for (GridClockDeltaVersion ver : hist.keySet()) {
- if (ver.topologyVersion() == 4)
- return true;
- }
-
- return false;
- }
- }, 10000);
-
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> history = kernal.context().clockSync()
- .timeSyncHistory();
-
- GridClockDeltaSnapshot snap = history.lastEntry().getValue();
-
- assertEquals(3, snap.deltas().size());
-
- for (int i = 1; i < GRID_CNT; i++) {
- Long delta = snap.deltas().get(grid(i).localNode().id());
-
- // Give 300ms range for test?
- int idealDelta = - i * 2000;
-
- int threshold = 100;
-
- assertTrue("Invalid time delta for node [expected=" + idealDelta + ", " +
- "actual=" + delta + ", threshold=" + threshold,
- delta <= idealDelta + threshold && delta >= idealDelta - threshold);
- }
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTimeSyncChangeCoordinator() throws Exception {
- startGrids(GRID_CNT);
-
- try {
- for (int i = 0; i < GRID_CNT; i++) {
- // Not coordinator now.
- stopGrid(i);
-
- startGrid(i);
- }
-
- // Check coordinator time deltas.
- final IgniteKernal kernal = (IgniteKernal)grid(0);
-
- assertEquals(6, kernal.localNode().order());
-
- // Wait for latest time sync history.
- GridTestUtils.waitForCondition(new PA() {
- @Override public boolean apply() {
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> hist = kernal.context().clockSync()
- .timeSyncHistory();
-
- info("Checking time sync history: " + hist);
-
- for (GridClockDeltaVersion ver : hist.keySet()) {
- if (ver.topologyVersion() == 12)
- return true;
- }
-
- return false;
- }
- }, 10000);
-
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> history = kernal.context().clockSync()
- .timeSyncHistory();
-
- GridClockDeltaSnapshot snap = history.lastEntry().getValue();
-
- assertEquals(3, snap.deltas().size());
-
- for (int i = 1; i < GRID_CNT; i++) {
- Long delta = snap.deltas().get(grid(i).localNode().id());
-
- // Give 300ms range for test?
- int idealDelta = - i * 2000;
-
- int threshold = 100;
-
- assertTrue("Invalid time delta for node [expected=" + idealDelta + ", " +
- "actual=" + delta + ", threshold=" + threshold,
- delta <= idealDelta + threshold && delta >= idealDelta - threshold);
- }
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
- * Time bean that sets shifted time source to context.
- */
- private static class TimeShiftLifecycleBean implements LifecycleBean {
- /** Injected grid. */
- @IgniteInstanceResource
- private Ignite g;
-
- /** Time delta. */
- private int delta;
-
- /**
- * Constructs lifecycle bean.
- *
- * @param delta Time delta.
- */
- private TimeShiftLifecycleBean(int delta) {
- this.delta = delta;
- }
-
- /** {@inheritDoc} */
- @Override public void onLifecycleEvent(LifecycleEventType evt) {
- if (evt == LifecycleEventType.BEFORE_NODE_START)
- ((GridKernalContextImpl)((IgniteKernal)g).context()).timeSource(new TimeShiftClockSource(delta));
- }
- }
-
- /**
- * Time shift time source.
- */
- private static class TimeShiftClockSource implements GridClockSource {
- /** Time shift delta. */
- private int delta;
-
- /**
- * @param delta Time shift delta.
- */
- private TimeShiftClockSource(int delta) {
- this.delta = delta;
- }
-
- /** {@inheritDoc} */
- @Override public long currentTimeMillis() {
- return System.currentTimeMillis() + delta;
- }
- }
-}
\ No newline at end of file
[10/39] ignite git commit: Remove CacheAtomicWriteOrderMode.java and
refactoring core module.
Posted by ag...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index ab4d593..823c700 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -103,7 +103,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCO_FAILED_CLIENT_RECONNECT_DELAY;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.testframework.config.GridTestProperties.BINARY_MARSHALLER_USE_SIMPLE_NAME_MAPPER;
@@ -1396,7 +1395,6 @@ public abstract class GridAbstractTest extends TestCase {
CacheConfiguration cfg = new CacheConfiguration();
cfg.setStartSize(1024);
- cfg.setAtomicWriteOrderMode(PRIMARY);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setNearConfiguration(new NearCacheConfiguration());
cfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 7ab76f3..2fab472 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
@@ -43,7 +43,6 @@ import org.apache.ignite.IgniteEvents;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteMessaging;
import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.affinity.Affinity;
[33/39] ignite git commit: Fix bugs.
Posted by ag...@apache.org.
Fix bugs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4f3ceea3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4f3ceea3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4f3ceea3
Branch: refs/heads/ignite-4587
Commit: 4f3ceea3df8481c756e88ab13856b6170554ae02
Parents: 2cbfb86
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 15 15:45:34 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 15 15:45:34 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheUtils.java | 6 +++---
.../org/apache/ignite/internal/util/IgniteUtils.java | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f3ceea3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 6b235dd..45d2c4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -981,11 +981,11 @@ public class GridCacheUtils {
public static byte[] versionToBytes(GridCacheVersion ver) {
assert ver != null;
- byte[] bytes = new byte[28];
+ byte[] bytes = new byte[20];
U.intToBytes(ver.topologyVersion(), bytes, 0);
- U.longToBytes(ver.order(), bytes, 12);
- U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20);
+ U.longToBytes(ver.order(), bytes, 4);
+ U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 12);
return bytes;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f3ceea3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 928a31c..374b02c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9217,7 +9217,7 @@ public abstract class IgniteUtils {
GridUnsafe.putInt(arr, off, drVer.nodeOrderAndDrIdRaw());
- off += 12;
+ off += 4;
GridUnsafe.putLong(arr, off, drVer.order());
@@ -9230,7 +9230,7 @@ public abstract class IgniteUtils {
GridUnsafe.putInt(arr, off, ver.nodeOrderAndDrIdRaw());
- off += 12;
+ off += 4;
GridUnsafe.putLong(arr, off, ver.order());
@@ -9247,14 +9247,14 @@ public abstract class IgniteUtils {
public static GridCacheVersion readVersion(long ptr, boolean verEx) {
GridCacheVersion ver = new GridCacheVersion(GridUnsafe.getInt(ptr),
GridUnsafe.getInt(ptr + 4),
- GridUnsafe.getLong(ptr + 16));
+ GridUnsafe.getLong(ptr + 8));
if (verEx) {
- ptr += 24;
+ ptr += 16;
ver = new GridCacheVersionEx(GridUnsafe.getInt(ptr),
GridUnsafe.getInt(ptr + 4),
- GridUnsafe.getLong(ptr + 16),
+ GridUnsafe.getLong(ptr + 8),
ver);
}
@@ -9274,7 +9274,7 @@ public abstract class IgniteUtils {
int nodeOrderDrId = GridUnsafe.getInt(arr, off);
- off += 12;
+ off += 4;
long order = GridUnsafe.getLong(arr, off);
@@ -9289,7 +9289,7 @@ public abstract class IgniteUtils {
nodeOrderDrId = GridUnsafe.getInt(arr, off);
- off += 12;
+ off += 4;
order = GridUnsafe.getLong(arr, off);
[08/39] ignite git commit: Remove isFastMap method in
GridDhtAtomicCache class because always returns false.
Posted by ag...@apache.org.
Remove isFastMap method in GridDhtAtomicCache class because always returns false.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a61e5661
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a61e5661
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a61e5661
Branch: refs/heads/ignite-4587
Commit: a61e5661d182fec218f7a0ee6a3b8f484e9a7643
Parents: bc7a9bd
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 27 14:40:22 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 27 14:40:22 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/atomic/GridDhtAtomicCache.java | 14 +-------------
.../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +-
2 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a61e5661/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 b5b1a30..b101b3e 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
@@ -1332,8 +1332,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
CacheEntryPredicate[] filters = CU.filterArray(filter);
if (conflictPutVal == null &&
- conflictRmvVer == null &&
- !isFastMap(filters, op)) {
+ conflictRmvVer == null) {
return new GridNearAtomicSingleUpdateFuture(
ctx,
this,
@@ -1379,17 +1378,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/**
- * Whether this is fast-map operation.
- *
- * @param filters Filters.
- * @param op Operation.
- * @return {@code True} if fast-map.
- */
- public boolean isFastMap(CacheEntryPredicate[] filters, GridCacheOperation op) {
- return false;
- }
-
- /**
* Entry point for all public API remove methods.
*
* @param keys Keys to remove.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a61e5661/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 64163c8..5d12dce 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
@@ -149,7 +149,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
this.conflictPutVals = conflictPutVals;
this.conflictRmvVals = conflictRmvVals;
- fastMap = cache.isFastMap(filter, op);
+ fastMap = false;
}
/** {@inheritDoc} */
[14/39] ignite git commit: Refactoring yardstick module.
Posted by ag...@apache.org.
Refactoring yardstick module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97fdb0e0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97fdb0e0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97fdb0e0
Branch: refs/heads/ignite-4587
Commit: 97fdb0e03492047fe64191059a1725775e335b7b
Parents: 72c15e5
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 1 16:04:13 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 1 16:04:47 2017 +0300
----------------------------------------------------------------------
modules/yardstick/README.txt | 1 -
.../ignite/yardstick/IgniteBenchmarkArguments.java | 15 +--------------
2 files changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97fdb0e0/modules/yardstick/README.txt
----------------------------------------------------------------------
diff --git a/modules/yardstick/README.txt b/modules/yardstick/README.txt
index 5903fd4..32f198b 100644
--- a/modules/yardstick/README.txt
+++ b/modules/yardstick/README.txt
@@ -132,7 +132,6 @@ would behave like a `servers`.
`PESSIMISTIC` (defined in `CacheTxConcurrency`)
* `-txi <value>` or `--txIsolation <value>` - Cache transaction isolation (defined in `CacheTxIsolation`)
* `-wb` or `--writeBehind` - Enable or disable writeBehind for cache store
-* `-wom <mode>` or `--writeOrderMode <mode>` - Write order mode for ATOMIC caches (defined in `CacheAtomicWriteOrderMode`)
For example if we need to run 2 `IgniteNode` servers on localhost with `PutBenchmark` benchmark on localhost,
with number of backups set to 1, synchronization mode set to `PRIMARY_SYNC`, then the following configuration
http://git-wip-us.apache.org/repos/asf/ignite/blob/97fdb0e0/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
index 6ccd04c..46a56c7 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
@@ -18,7 +18,6 @@
package org.apache.ignite.yardstick;
import com.beust.jcommander.Parameter;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
import org.apache.ignite.transactions.TransactionConcurrency;
@@ -65,10 +64,6 @@ public class IgniteBenchmarkArguments {
private int nearCacheSize;
/** */
- @Parameter(names = {"-wom", "--writeOrderMode"}, description = "Write ordering mode")
- private CacheAtomicWriteOrderMode orderMode;
-
- /** */
@Parameter(names = {"-txc", "--txConcurrency"}, description = "Transaction concurrency")
private TransactionConcurrency txConcurrency = TransactionConcurrency.PESSIMISTIC;
@@ -246,13 +241,6 @@ public class IgniteBenchmarkArguments {
}
/**
- * @return Cache write ordering mode.
- */
- public CacheAtomicWriteOrderMode orderMode() {
- return orderMode;
- }
-
- /**
* @return Backups.
*/
public int backups() {
@@ -418,8 +406,7 @@ public class IgniteBenchmarkArguments {
*/
public String description() {
return "-nn=" + nodes + "-b=" + backups + "-sm=" + syncMode + "-cl=" + clientOnly + "-nc=" + nearCacheFlag +
- (orderMode == null ? "" : "-wom=" + orderMode) + "-txc=" + txConcurrency + "-rd=" + restartDelay +
- "-rs=" + restartSleep;
+ "-txc=" + txConcurrency + "-rd=" + restartDelay + "-rs=" + restartSleep;
}
/** {@inheritDoc} */
[23/39] ignite git commit: Remove and rename tests.
Posted by ag...@apache.org.
Remove and rename tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6265f33b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6265f33b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6265f33b
Branch: refs/heads/ignite-4587
Commit: 6265f33bf9401bf8c5449bb3da7daeadca086b3b
Parents: 32d2308
Author: Max Kozlov <dr...@gmail.com>
Authored: Thu Mar 2 01:21:35 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Thu Mar 2 01:21:35 2017 +0300
----------------------------------------------------------------------
...erceptorAtomicPrimaryWriteOrderSelfTest.java | 39 ---------------
...omicReplicatedPrimaryWriteOrderSelfTest.java | 40 ----------------
...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 50 --------------------
...maryWriteOrderNearEnabledStoreValueTest.java | 31 ------------
...heAtomicPrimaryWriteOrderStoreValueTest.java | 24 ----------
...micPrimaryWriteOrderWithStoreInvokeTest.java | 32 -------------
.../IgniteCacheAtomicWithStoreInvokeTest.java | 32 +++++++++++++
.../IgniteCacheInterceptorSelfTestSuite.java | 2 -
.../dht/GridCacheAtomicNearCacheSelfTest.java | 4 +-
...EnabledPrimaryWriteOrderFullApiSelfTest.java | 31 ------------
...eAtomicPrimaryWriteOrderFullApiSelfTest.java | 24 ----------
...tomicPrimaryWriteOrderReloadAllSelfTest.java | 24 ----------
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 32 -------------
...tomicPrimaryWriteOrderRemoveFailureTest.java | 46 ------------------
...micPrimaryWriteOrderNearEnabledSelfTest.java | 31 ------------
...sistencyAtomicPrimaryWriteOrderSelfTest.java | 24 ----------
...PutRetryAtomicPrimaryWriteOrderSelfTest.java | 25 ----------
...LateAffDisabledMultiNodeFullApiSelfTest.java | 35 ++++++++++++++
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 35 --------------
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 31 ------------
...icNoStripedPoolMultiNodeFullApiSelfTest.java | 35 ++++++++++++++
...derFairAffinityMultiNodeFullApiSelfTest.java | 36 --------------
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 24 ----------
...rderMultiNodeP2PDisabledFullApiSelfTest.java | 25 ----------
...cPrimaryWriteOrderNearRemoveFailureTest.java | 45 ------------------
...erNoStripedPoolMultiNodeFullApiSelfTest.java | 35 --------------
...PrimaryWriteOrderOffHeapFullApiSelfTest.java | 24 ----------
...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 -------------
...ityOrderOffHeapMultiNodeFullApiSelfTest.java | 25 ----------
...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 -------------
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 25 ----------
...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 24 ----------
...rimaryWriteOrderOffheapExpiryPolicyTest.java | 31 ------------
...maryWriteOrderWithStoreExpiryPolicyTest.java | 32 -------------
...teOrderWithStoreOffheapExpiryPolicyTest.java | 31 ------------
.../IgniteCacheExpiryPolicyTestSuite.java | 4 --
...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 ------------
...rderFairAffinityMultiJvmFullApiSelfTest.java | 31 ------------
...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 ------------
...OrderMultiJvmP2PDisabledFullApiSelfTest.java | 31 ------------
...rityOrderOffHeapMultiJvmFullApiSelfTest.java | 31 ------------
...derOffHeapTieredMultiJvmFullApiSelfTest.java | 36 --------------
...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 ------------
...FailoverAtomicPrimaryWriteOrderSelfTest.java | 43 -----------------
...tinuousQueryAsyncFailoverAtomicSelfTest.java | 43 +++++++++++++++++
...ryFailoverAtomicNearEnabledSelfSelfTest.java | 2 +-
...ousQueryFailoverAtomicOffheapTieredTest.java | 33 +++++++++++++
...tomicPrimaryWriteOrderOffheapTieredTest.java | 33 -------------
...FailoverAtomicPrimaryWriteOrderSelfTest.java | 36 --------------
...usQueryFailoverAtomicReplicatedSelfTest.java | 2 +-
...heContinuousQueryFailoverAtomicSelfTest.java | 36 ++++++++++++++
.../IgniteCacheFailoverTestSuite.java | 4 --
.../IgniteCacheFailoverTestSuite2.java | 2 -
.../IgniteCacheFailoverTestSuite3.java | 2 -
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 14 ------
.../IgniteCacheFullApiSelfTestSuite.java | 32 ++-----------
.../ignite/testsuites/IgniteCacheTestSuite.java | 6 +--
.../testsuites/IgniteCacheTestSuite3.java | 4 --
.../testsuites/IgniteCacheTestSuite4.java | 4 --
.../IgniteCacheQuerySelfTestSuite4.java | 12 ++---
60 files changed, 230 insertions(+), 1354 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
deleted file mode 100644
index e4ba56b..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheInterceptor;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-
-/**
- * Tests {@link CacheInterceptor}.
- */
-public class GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest extends GridCacheInterceptorAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return ATOMIC;
- }
-
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return null;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
deleted file mode 100644
index 662dd91..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMode;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-
-/**
- * Tests {@link org.apache.ignite.cache.CacheInterceptor}.
- */
-public class GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest
- extends GridCacheInterceptorAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return ATOMIC;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return REPLICATED;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java
deleted file mode 100644
index 768f066..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderInvokeTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-
-/**
- *
- */
-public class IgniteCacheAtomicPrimaryWriteOrderInvokeTest extends IgniteCacheInvokeAbstractTest {
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 3;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return ATOMIC;
- }
-
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return null;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.java
deleted file mode 100644
index 38e544d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.configuration.NearCacheConfiguration;
-
-/**
- *
- */
-public class IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest
- extends IgniteCacheAtomicPrimaryWriteOrderStoreValueTest {
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return new NearCacheConfiguration();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
deleted file mode 100644
index d445bf7..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-/**
- *
- */
-public class IgniteCacheAtomicPrimaryWriteOrderStoreValueTest extends IgniteCacheAtomicStoreValueTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderWithStoreInvokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderWithStoreInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderWithStoreInvokeTest.java
deleted file mode 100644
index 792cc1a..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderWithStoreInvokeTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import javax.cache.configuration.Factory;
-import org.apache.ignite.cache.store.CacheStore;
-
-/**
- *
- */
-public class IgniteCacheAtomicPrimaryWriteOrderWithStoreInvokeTest extends
- IgniteCacheAtomicPrimaryWriteOrderInvokeTest {
- /** {@inheritDoc} */
- @Override protected Factory<CacheStore> cacheStoreFactory() {
- return new TestStoreFactory();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicWithStoreInvokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicWithStoreInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicWithStoreInvokeTest.java
new file mode 100644
index 0000000..661c0ed
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicWithStoreInvokeTest.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import javax.cache.configuration.Factory;
+import org.apache.ignite.cache.store.CacheStore;
+
+/**
+ *
+ */
+public class IgniteCacheAtomicWithStoreInvokeTest extends
+ IgniteCacheAtomicInvokeTest {
+ /** {@inheritDoc} */
+ @Override protected Factory<CacheStore> cacheStoreFactory() {
+ return new TestStoreFactory();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
index 17d88ae..e87ea1c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
@@ -39,11 +39,9 @@ public class IgniteCacheInterceptorSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheInterceptorAtomicSelfTest.class);
suite.addTestSuite(GridCacheInterceptorAtomicNearEnabledSelfTest.class);
suite.addTestSuite(GridCacheInterceptorAtomicWithStoreSelfTest.class);
- suite.addTestSuite(GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.class);
suite.addTestSuite(GridCacheInterceptorAtomicReplicatedSelfTest.class);
suite.addTestSuite(GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.class);
- suite.addTestSuite(GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.class);
suite.addTestSuite(GridCacheInterceptorSelfTest.class);
suite.addTestSuite(GridCacheInterceptorNearEnabledSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/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 79188c8..4a644da 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
@@ -98,7 +98,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testNoBackupsPrimaryWriteOrder() throws Exception {
+ public void testNoBackups() throws Exception {
startGridsLocal(0);
checkNearCache();
@@ -107,7 +107,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testWithBackupsPrimaryWriteOrder() throws Exception {
+ public void testWithBackups() throws Exception {
startGridsLocal(2);
checkNearCache();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.java
deleted file mode 100644
index b039f40..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht;
-
-import org.apache.ignite.configuration.NearCacheConfiguration;
-
-/**
- * Tests atomic cache with near cache enabled.
- */
-public class GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest
- extends GridCacheAtomicPrimaryWriteOrderFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return new NearCacheConfiguration();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java
deleted file mode 100644
index c192046..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderFullApiSelfTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht;
-
-/**
- * Test for atomic cache with primary write order mode.
- */
-public class GridCacheAtomicPrimaryWriteOrderFullApiSelfTest extends GridCacheAtomicFullApiSelfTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java
deleted file mode 100644
index 72c5e17..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht;
-
-/**
- * Tests reloadAll for colocated cache with primary write order.
- */
-public class GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest extends GridCacheAtomicReloadAllSelfTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
deleted file mode 100644
index dec8ad2..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- *
- */
-public class GridCacheAtomicPrimaryWriteOrderFailoverSelfTest extends GridCacheAtomicFailoverSelfTest {
- /** {@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/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java
deleted file mode 100644
index 0eb13a5..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-
-/**
- * Tests that removes are not lost when topology changes.
- */
-public class GridCacheAtomicPrimaryWriteOrderRemoveFailureTest extends GridCacheAbstractRemoveFailureTest {
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return ATOMIC;
- }
-
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearCache() {
- return null;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java
deleted file mode 100644
index d0a044d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-
-import org.apache.ignite.configuration.NearCacheConfiguration;
-
-/**
- * Tests cache value consistency for ATOMIC mode with near cache enabled.
- */
-public class GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest
- extends GridCacheValueConsistencyAtomicSelfTest {
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return new NearCacheConfiguration();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java
deleted file mode 100644
index 878d580..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-
-/**
- *
- */
-public class GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest extends GridCacheValueConsistencyAtomicSelfTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java
deleted file mode 100644
index f703355..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-
-import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest;
-
-/**
- *
- */
-public class IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest extends IgniteCachePutRetryAtomicSelfTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..100f87c
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.configuration.IgniteConfiguration;
+
+/**
+ *
+ */
+public class GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest extends
+ GridCacheAtomicMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ cfg.setLateAffinityAssignment(false);
+
+ return cfg;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java
deleted file mode 100644
index c0fbb7b..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-import org.apache.ignite.configuration.IgniteConfiguration;
-
-/**
- *
- */
-public class GridCacheAtomicLateAffDisabledPrimaryWriteOrderMultiNodeFullApiSelfTest extends
- GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- cfg.setLateAffinityAssignment(false);
-
- return cfg;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java
deleted file mode 100644
index 6355595..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-import org.apache.ignite.configuration.NearCacheConfiguration;
-
-/**
- * Multi-node tests for atomic cache with primary write order mode and near cache enabled.
- */
-public class GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest
- extends GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest{
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return new NearCacheConfiguration();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNoStripedPoolMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNoStripedPoolMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNoStripedPoolMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..87e81e3
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNoStripedPoolMultiNodeFullApiSelfTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.configuration.IgniteConfiguration;
+
+/**
+ *
+ */
+public class GridCacheAtomicNoStripedPoolMultiNodeFullApiSelfTest extends
+ GridCacheAtomicMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ cfg.setStripedPoolSize(-1);
+
+ return cfg;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java
deleted file mode 100644
index 44ca9d5..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-import org.apache.ignite.cache.affinity.fair.FairAffinityFunction;
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- *
- */
-public class GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest
- extends GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration cfg = super.cacheConfiguration(gridName);
-
- cfg.setAffinity(new FairAffinityFunction());
-
- return cfg;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
deleted file mode 100644
index 53b3349..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-/**
- * Multi-node tests for atomic cache with primary write order mode.
- */
-public class GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest extends GridCacheAtomicMultiNodeFullApiSelfTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java
deleted file mode 100644
index 66c18b4..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-/**
- * Multi-node tests for partitioned cache with primary write order.
- */
-public class GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest extends
- GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
deleted file mode 100644
index bee025b..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-
-/**
- * Tests that removes are not lost when topology changes.
- */
-public class GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest extends GridCacheAbstractRemoveFailureTest {
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return CacheAtomicityMode.ATOMIC;
- }
-
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearCache() {
- return new NearCacheConfiguration();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNoStripedPoolMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNoStripedPoolMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNoStripedPoolMultiNodeFullApiSelfTest.java
deleted file mode 100644
index e8175e5..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNoStripedPoolMultiNodeFullApiSelfTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-import org.apache.ignite.configuration.IgniteConfiguration;
-
-/**
- *
- */
-public class GridCacheAtomicPrimaryWriteOrderNoStripedPoolMultiNodeFullApiSelfTest extends
- GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- cfg.setStripedPoolSize(-1);
-
- return cfg;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java
deleted file mode 100644
index 5b6a927..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-/**
- * Tests partitioned cache with values being stored off-heap and with primary write order.
- */
-public class GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest extends GridCacheAtomicOffHeapFullApiSelfTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapTieredFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapTieredFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapTieredFullApiSelfTest.java
deleted file mode 100644
index 6df18be..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapTieredFullApiSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
-
-/**
- * Tests partitioned cache with off-heap tiered mode.
- */
-public class GridCacheAtomicPrimaryWriteOrderOffHeapTieredFullApiSelfTest extends
- GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return OFFHEAP_TIERED;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java
deleted file mode 100644
index 5fe1efb..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-/**
- * Tests partitioned cache with values being stored off-heap and with primary write order.
- */
-public class GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest extends
- GridCacheAtomicOffHeapMultiNodeFullApiSelfTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest.java
deleted file mode 100644
index f2e3b12..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
-
-/**
- * Tests partitioned cache with off-heap tiered mode.
- */
-public class GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest extends
- GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return OFFHEAP_TIERED;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
deleted file mode 100644
index bc67554..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.replicated;
-
-/**
- * Multi-node tests for replicated atomic cache with primary write order.
- */
-public class GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest extends
- GridCacheReplicatedAtomicMultiNodeFullApiSelfTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java
deleted file mode 100644
index 2761f5e..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.expiry;
-
-/**
- *
- */
-public class IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest extends IgniteCacheAtomicExpiryPolicyTest {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderOffheapExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderOffheapExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderOffheapExpiryPolicyTest.java
deleted file mode 100644
index 594a6d9..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderOffheapExpiryPolicyTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.expiry;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- *
- */
-public class IgniteCacheAtomicPrimaryWriteOrderOffheapExpiryPolicyTest extends
- IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderWithStoreExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderWithStoreExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderWithStoreExpiryPolicyTest.java
deleted file mode 100644
index 8fc5f07..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderWithStoreExpiryPolicyTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.expiry;
-
-import javax.cache.configuration.Factory;
-import org.apache.ignite.cache.store.CacheStore;
-
-/**
- *
- */
-public class IgniteCacheAtomicPrimaryWriteOrderWithStoreExpiryPolicyTest extends
- IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest{
- /** {@inheritDoc} */
- @Override protected Factory<CacheStore> cacheStoreFactory() {
- return new TestStoreFactory();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderWithStoreOffheapExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderWithStoreOffheapExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderWithStoreOffheapExpiryPolicyTest.java
deleted file mode 100644
index 51d8ba2..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderWithStoreOffheapExpiryPolicyTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.expiry;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- *
- */
-public class IgniteCacheAtomicPrimaryWriteOrderWithStoreOffheapExpiryPolicyTest extends
- IgniteCacheAtomicPrimaryWriteOrderWithStoreExpiryPolicyTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyTestSuite.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyTestSuite.java
index e371dc7..6258f74 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyTestSuite.java
@@ -37,8 +37,6 @@ public class IgniteCacheExpiryPolicyTestSuite extends TestSuite {
suite.addTestSuite(IgniteCacheAtomicLocalExpiryPolicyTest.class);
suite.addTestSuite(IgniteCacheAtomicExpiryPolicyTest.class);
suite.addTestSuite(IgniteCacheAtomicWithStoreExpiryPolicyTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderWithStoreExpiryPolicyTest.class);
suite.addTestSuite(IgniteCacheAtomicReplicatedExpiryPolicyTest.class);
suite.addTestSuite(IgniteCacheTxLocalExpiryPolicyTest.class);
@@ -50,8 +48,6 @@ public class IgniteCacheExpiryPolicyTestSuite extends TestSuite {
suite.addTestSuite(IgniteCacheAtomicLocalOffheapExpiryPolicyTest.class);
suite.addTestSuite(IgniteCacheAtomicOffheapExpiryPolicyTest.class);
suite.addTestSuite(IgniteCacheAtomicWithStoreOffheapExpiryPolicyTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderOffheapExpiryPolicyTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderWithStoreOffheapExpiryPolicyTest.class);
suite.addTestSuite(IgniteCacheAtomicReplicatedOffheapExpiryPolicyTest.class);
suite.addTestSuite(IgniteCacheTxLocalOffheapExpiryPolicyTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.java
deleted file mode 100644
index a86edc2..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.multijvm;
-
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest;
-
-/**
- * Multi-JVM tests.
- */
-public class GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest extends
- GridCacheAtomicNearEnabledPrimaryWriteOrderMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- protected boolean isMultiJvm() {
- return true;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.java
deleted file mode 100644
index c55f06f6..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.multijvm;
-
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest;
-
-/**
- * Multi-JVM tests.
- */
-public class GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest extends
- GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- protected boolean isMultiJvm() {
- return true;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java
deleted file mode 100644
index db01292..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.multijvm;
-
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest;
-
-/**
- * Multi-JVM tests.
- */
-public class GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest extends
- GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- protected boolean isMultiJvm() {
- return true;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6265f33b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.java
deleted file mode 100644
index caaa20a..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.multijvm;
-
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest;
-
-/**
- * Multi-JVM tests.
- */
-public class GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest extends
- GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest {
- /** {@inheritDoc} */
- protected boolean isMultiJvm() {
- return true;
- }
-}
\ No newline at end of file
[02/39] ignite git commit: Delete use CLOCK for ignite-core.
Posted by ag...@apache.org.
Delete use CLOCK for ignite-core.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a37ff761
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a37ff761
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a37ff761
Branch: refs/heads/ignite-4587
Commit: a37ff76168613007d3ca09c06688bc6456e4c330
Parents: f0dcbbd
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 13 12:27:28 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 13 12:27:28 2017 +0300
----------------------------------------------------------------------
.../dht/atomic/GridDhtAtomicCache.java | 27 +++-----------------
.../GridNearAtomicAbstractUpdateFuture.java | 3 +--
.../GridNearAtomicSingleUpdateFuture.java | 17 +-----------
.../dht/atomic/GridNearAtomicUpdateFuture.java | 17 +-----------
4 files changed, 7 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a37ff761/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 940c74e..f09f073 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
@@ -106,7 +106,6 @@ import org.jsr166.ConcurrentLinkedDeque8;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_DEFERRED_ACK_TIMEOUT;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
@@ -203,15 +202,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
updateReplyClos = new CI2<GridNearAtomicAbstractUpdateRequest, GridNearAtomicUpdateResponse>() {
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
@Override public void apply(GridNearAtomicAbstractUpdateRequest req, GridNearAtomicUpdateResponse res) {
- if (ctx.config().getAtomicWriteOrderMode() == CLOCK) {
- assert req.writeSynchronizationMode() != FULL_ASYNC : req;
-
- // Always send reply in CLOCK ordering mode.
- sendNearUpdateReply(res.nodeId(), res);
-
- return;
- }
-
// Request should be for primary keys only in PRIMARY ordering mode.
assert req.hasPrimary() : req;
@@ -1308,7 +1298,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
*/
public boolean isFastMap(CacheEntryPredicate[] filters, GridCacheOperation op) {
return F.isEmpty(filters) && op != TRANSFORM && ctx.config().getWriteSynchronizationMode() == FULL_SYNC &&
- ctx.config().getAtomicWriteOrderMode() == CLOCK &&
!(ctx.writeThrough() && ctx.config().getInterceptor() != null);
}
@@ -2398,7 +2387,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
true,
true,
primary,
- ctx.config().getAtomicWriteOrderMode() == CLOCK, // Check version in CLOCK mode on primary node.
+ false,
topVer,
req.filter(),
replicate ? primary ? DR_PRIMARY : DR_BACKUP : DR_NONE,
@@ -2678,7 +2667,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/*event*/true,
/*metrics*/true,
primary,
- ctx.config().getAtomicWriteOrderMode() == CLOCK, // Check version in CLOCK mode on primary node.
+ false,
topVer,
null,
replicate ? primary ? DR_PRIMARY : DR_BACKUP : DR_NONE,
@@ -2825,11 +2814,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
return Collections.singletonList(entry);
}
catch (GridDhtInvalidPartitionException e) {
- // Ignore invalid partition exception in CLOCK ordering mode.
- if (ctx.config().getAtomicWriteOrderMode() == CLOCK)
- return Collections.singletonList(null);
- else
- throw e;
+ throw e;
}
}
}
@@ -2844,11 +2829,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
locked.add(entry);
}
catch (GridDhtInvalidPartitionException e) {
- // Ignore invalid partition exception in CLOCK ordering mode.
- if (ctx.config().getAtomicWriteOrderMode() == CLOCK)
- locked.add(null);
- else
- throw e;
+ throw e;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a37ff761/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index 2fbabaa..619f3b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
@@ -39,7 +39,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
/**
@@ -245,7 +244,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt
* @return {@code True} future is stored by {@link GridCacheMvccManager#addAtomicFuture}.
*/
protected boolean storeFuture() {
- return cctx.config().getAtomicWriteOrderMode() == CLOCK || syncMode != FULL_ASYNC;
+ return syncMode != FULL_ASYNC;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a37ff761/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 bd231cf..9b618c1 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
@@ -52,7 +52,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteProductVersion;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
/**
@@ -454,21 +453,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
GridCacheVersion futVer = cctx.versions().next(topVer);
- GridCacheVersion updVer;
-
- // Assign version on near node in CLOCK ordering mode even if fastMap is false.
- if (cctx.config().getAtomicWriteOrderMode() == CLOCK) {
- updVer = this.updVer;
-
- if (updVer == null) {
- updVer = cctx.versions().next(topVer);
-
- if (log.isDebugEnabled())
- log.debug("Assigned fast-map version for update on near node: " + updVer);
- }
- }
- else
- updVer = null;
+ GridCacheVersion updVer = null;
try {
singleReq0 = mapSingleUpdate(topVer, futVer, updVer);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a37ff761/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 cd64117..840a805 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
@@ -58,7 +58,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
@@ -628,21 +627,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
GridCacheVersion futVer = cctx.versions().next(topVer);
- GridCacheVersion updVer;
-
- // Assign version on near node in CLOCK ordering mode even if fastMap is false.
- if (cctx.config().getAtomicWriteOrderMode() == CLOCK) {
- updVer = this.updVer;
-
- if (updVer == null) {
- updVer = cctx.versions().next(topVer);
-
- if (log.isDebugEnabled())
- log.debug("Assigned fast-map version for update on near node: " + updVer);
- }
- }
- else
- updVer = null;
+ GridCacheVersion updVer = null;
try {
if (size == 1 && !fastMap) {
[28/39] ignite git commit: wip
Posted by ag...@apache.org.
wip
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea3d5de8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea3d5de8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea3d5de8
Branch: refs/heads/ignite-4587
Commit: ea3d5de8437df5cafcf8315dde1ac6d113eef6ad
Parents: 9b02f81 20a87f8
Author: Max Kozlov <dr...@gmail.com>
Authored: Thu Mar 9 18:35:52 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Thu Mar 9 18:35:52 2017 +0300
----------------------------------------------------------------------
.../processors/cache/version/GridCacheVersion.java | 12 ++++++------
.../processors/cache/GridCacheMvccSelfTest.java | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea3d5de8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea3d5de8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
index ad50a40,e15a20f..4e9a8ff
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
@@@ -174,8 -174,8 +174,8 @@@ public class GridCacheMvccSelfTest exte
checkOrder(cands, ver1, ver5, ver3, ver2);
entry.orderCompleted(
- new GridCacheVersion(1, 2, 0, 0),
- Arrays.asList(new GridCacheVersion(1, 3, 4, 0), ver2, new GridCacheVersion(1, 5, 6, 0)),
+ new GridCacheVersion(1, 2, 0, 0),
- Arrays.asList(new GridCacheVersion(1, 3, 4, 0), ver2, new GridCacheVersion(1, 5, 6, 0)),
++ Arrays.asList(new GridCacheVersion(1, 3, 4, 0), ver2, new GridCacheVersion(1, 5, 6, 0)),
Collections.<GridCacheVersion>emptyList()
);
[21/39] ignite git commit: Delete atomicWriteOrderMode in config cpp
platform.
Posted by ag...@apache.org.
Delete atomicWriteOrderMode in config cpp platform.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/32d23086
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/32d23086
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/32d23086
Branch: refs/heads/ignite-4587
Commit: 32d2308647646027fa5792d05e532a041a974e73
Parents: 59af036
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 1 23:44:55 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 1 23:44:55 2017 +0300
----------------------------------------------------------------------
modules/platforms/cpp/core-test/config/cache-test.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/32d23086/modules/platforms/cpp/core-test/config/cache-test.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-test.xml b/modules/platforms/cpp/core-test/config/cache-test.xml
index 0ea5876..6aeafc0 100644
--- a/modules/platforms/cpp/core-test/config/cache-test.xml
+++ b/modules/platforms/cpp/core-test/config/cache-test.xml
@@ -66,7 +66,6 @@
<property name="name" value="partitioned_atomic"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="ATOMIC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
</bean>
<bean parent="cache-template">
@@ -82,7 +81,6 @@
<property name="name" value="partitioned_atomic_near"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="ATOMIC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
<property name="nearConfiguration">
<bean class="org.apache.ignite.configuration.NearCacheConfiguration" />
</property>
@@ -98,7 +96,6 @@
<property name="name" value="replicated_atomic"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="ATOMIC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
</bean>
</list>
</property>
[15/39] ignite git commit: Refactoring idexing module.
Posted by ag...@apache.org.
Refactoring idexing module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82790a86
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82790a86
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82790a86
Branch: refs/heads/ignite-4587
Commit: 82790a862f93378a09a8e8a7b52956bbe77f9085
Parents: 97fdb0e
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 1 16:05:32 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 1 16:05:32 2017 +0300
----------------------------------------------------------------------
.../processors/cache/CacheOperationsWithExpirationTest.java | 2 --
.../processors/cache/CacheRandomOperationsMultithreadedTest.java | 2 --
.../processors/cache/IgniteCacheCrossCacheJoinRandomTest.java | 2 --
.../cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java | 2 --
.../cache/IgniteCacheDistributedJoinCustomAffinityMapper.java | 2 --
.../processors/cache/IgniteCacheDistributedJoinNoIndexTest.java | 2 --
.../IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java | 2 --
.../cache/IgniteCacheDistributedJoinQueryConditionsTest.java | 2 --
.../IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java | 2 --
.../cache/IgniteCacheJoinPartitionedAndReplicatedTest.java | 2 --
10 files changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
index 6c60586..9d3facd 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
@@ -39,7 +39,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -71,7 +70,6 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest {
ccfg.setOffHeapMaxMemory(offheapMem);
ccfg.setSwapEnabled(false);
ccfg.setBackups(1);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setWriteSynchronizationMode(PRIMARY_SYNC);
ccfg.setStatisticsEnabled(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
index c1e94f0..26b4d68 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
@@ -48,7 +48,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -408,7 +407,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setEvictionPolicy(evictionPlc);
ccfg.setOffHeapMaxMemory(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
index 4d5a44e..434fb29 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
@@ -43,7 +43,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -178,7 +177,6 @@ public class IgniteCacheCrossCacheJoinRandomTest extends AbstractH2CompareQueryT
ccfg.setName(name);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setCacheMode(cacheMode);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
index 7881c44..45e9135 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
@@ -40,7 +40,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -155,7 +154,6 @@ public class IgniteCacheDistributedJoinCollocatedAndNotTest extends GridCommonAb
ccfg.setName(name);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
index 1d4f7b2..a7918a6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
@@ -38,7 +38,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -141,7 +140,6 @@ public class IgniteCacheDistributedJoinCustomAffinityMapper extends GridCommonAb
ccfg.setName(name);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setBackups(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
index 95c56fa..ff65818 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
@@ -40,7 +40,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -113,7 +112,6 @@ public class IgniteCacheDistributedJoinNoIndexTest extends GridCommonAbstractTes
ccfg.setName(name);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setBackups(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
index d7610dc..f1a38f1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
@@ -39,7 +39,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -87,7 +86,6 @@ public class IgniteCacheDistributedJoinPartitionedAndReplicatedTest extends Grid
ccfg.setName(name);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setCacheMode(cacheMode);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
index af56c91..3a98bf6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
@@ -38,7 +38,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
@@ -579,7 +578,6 @@ public class IgniteCacheDistributedJoinQueryConditionsTest extends GridCommonAbs
ccfg.setName(name);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setBackups(0);
ccfg.setMemoryMode(memMode);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
index fa9032d..ef7a6de 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
@@ -39,7 +39,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -139,7 +138,6 @@ public class IgniteCacheJoinPartitionedAndReplicatedCollocationTest extends Abst
ccfg.setName(name);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82790a86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
index 1d528c9..5869f12 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
@@ -38,7 +38,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -134,7 +133,6 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstr
ccfg.setName(name);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setAtomicityMode(ATOMIC);
ccfg.setBackups(1);
[11/39] ignite git commit: Remove CacheAtomicWriteOrderMode.java and
refactoring core module.
Posted by ag...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 a8cd7e3..891e4ba 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
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -30,13 +28,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
*/
public class GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest
extends GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest {
- /**
- * @return Write order mode for atomic cache.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
/** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
@@ -61,8 +52,6 @@ public class GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
-
return ccfg;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
index 3548edb..15497f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
@@ -17,13 +17,11 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
@@ -41,11 +39,6 @@ public class GridCacheAtomicNearRemoveFailureTest extends GridCacheAbstractRemov
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearCache() {
return new NearCacheConfiguration();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
index 55374d1..c194eb0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
@@ -17,25 +17,16 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
* Tests partitioned cache with values being stored off-heap.
*/
public class GridCacheAtomicOffHeapFullApiSelfTest extends GridCachePartitionedOffHeapFullApiSelfTest {
- /**
- * @return Write order mode for atomic cache.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
/** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
@@ -60,8 +51,6 @@ public class GridCacheAtomicOffHeapFullApiSelfTest extends GridCachePartitionedO
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
-
return ccfg;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
index d854fce..d973144 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -30,13 +28,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
*/
public class GridCacheAtomicOffHeapMultiNodeFullApiSelfTest extends
GridCachePartitionedOffHeapMultiNodeFullApiSelfTest {
- /**
- * @return Write order mode for atomic cache.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
/** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
@@ -61,8 +52,6 @@ public class GridCacheAtomicOffHeapMultiNodeFullApiSelfTest extends
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
-
return ccfg;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
index b5cb0e1..c647fdb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractMetricsSelfTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -42,7 +41,6 @@ public class GridCacheAtomicPartitionedMetricsSelfTest extends GridCacheAbstract
cfg.setRebalanceMode(SYNC);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setAtomicityMode(ATOMIC);
- cfg.setAtomicWriteOrderMode(PRIMARY);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
index d8b5dfe..53b3349 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
@@ -17,16 +17,8 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
* Multi-node tests for atomic cache with primary write order mode.
*/
public class GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest extends GridCacheAtomicMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java
index 4adda3c..66c18b4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest.java
@@ -17,17 +17,9 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
* Multi-node tests for partitioned cache with primary write order.
*/
public class GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest extends
GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
index f6e7e2f..bee025b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java
@@ -17,13 +17,11 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
@@ -41,11 +39,6 @@ public class GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest extends GridC
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearCache() {
return new NearCacheConfiguration();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java
index dbb461f..5b6a927 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest.java
@@ -17,16 +17,8 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
* Tests partitioned cache with values being stored off-heap and with primary write order.
*/
public class GridCacheAtomicPrimaryWriteOrderOffHeapFullApiSelfTest extends GridCacheAtomicOffHeapFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java
index e49c60b..5fe1efb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.java
@@ -17,17 +17,9 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
* Tests partitioned cache with values being stored off-heap and with primary write order.
*/
public class GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest extends
GridCacheAtomicOffHeapMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index df59436..e64d0ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -33,7 +33,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -60,7 +59,6 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
cc.setBackups(1);
cc.setRebalanceMode(SYNC);
cc.setAtomicityMode(atomicityMode());
- cc.setAtomicWriteOrderMode(PRIMARY);
NearCacheConfiguration nearCfg = new NearCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 73a5015..3789873 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -50,7 +50,6 @@ import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.transactions.Transaction;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_LOCKED;
import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNLOCKED;
@@ -110,7 +109,6 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio
CacheConfiguration cfg = super.cacheConfiguration(gridName);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setAtomicWriteOrderMode(PRIMARY);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
index 5f68e92..fdafd42 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
@@ -22,7 +22,6 @@ import java.util.TreeMap;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -33,7 +32,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -66,25 +64,23 @@ public class NearCacheSyncUpdateTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNearCacheSyncUpdateAtomic() throws Exception {
- nearCacheSyncUpdateTx(ATOMIC, PRIMARY);
+ nearCacheSyncUpdateTx(ATOMIC);
}
/**
* @throws Exception If failed.
*/
public void testNearCacheSyncUpdateTx() throws Exception {
- nearCacheSyncUpdateTx(TRANSACTIONAL, null);
+ nearCacheSyncUpdateTx(TRANSACTIONAL);
}
/**
* @param atomicityMode Atomicity mode.
- * @param writeOrderMode Write order mode.
* @throws Exception If failed.
*/
- private void nearCacheSyncUpdateTx(CacheAtomicityMode atomicityMode,
- CacheAtomicWriteOrderMode writeOrderMode) throws Exception {
+ private void nearCacheSyncUpdateTx(CacheAtomicityMode atomicityMode) throws Exception {
final IgniteCache<Integer, Integer> cache =
- ignite(0).createCache(cacheConfiguration(atomicityMode, writeOrderMode));
+ ignite(0).createCache(cacheConfiguration(atomicityMode));
try {
final AtomicInteger idx = new AtomicInteger();
@@ -140,18 +136,15 @@ public class NearCacheSyncUpdateTest extends GridCommonAbstractTest {
/**
* @param atomicityMode Atomicity mode.
- * @param writeOrderMode Write order mode.
* @return Cache configuration.
*/
- private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheAtomicityMode atomicityMode,
- CacheAtomicWriteOrderMode writeOrderMode) {
+ private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheAtomicityMode atomicityMode) {
CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
ccfg.setCacheMode(PARTITIONED);
ccfg.setBackups(1);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicityMode(atomicityMode);
- ccfg.setAtomicWriteOrderMode(writeOrderMode);
ccfg.setNearConfiguration(new NearCacheConfiguration<Integer, Integer>());
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
index 62fc5e9..07e54d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
@@ -60,7 +60,6 @@ import org.apache.ignite.services.ServiceContext;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
/**
@@ -158,7 +157,6 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
cfg.setCacheMode(CacheMode.PARTITIONED);
cfg.setName(TEST_CACHE_NAME);
cfg.setAffinity(new RendezvousAffinityFunction(true /* machine-safe */, 271));
- cfg.setAtomicWriteOrderMode(PRIMARY);
cfg.setBackups(1);
cfg.setRebalanceMode(CacheRebalanceMode.SYNC);
cfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java
index 68f5119..4ceab8a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.ignite.Ignite;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
@@ -53,7 +52,6 @@ public class GridCacheRebalancingPartitionDistributionTest extends GridRollingRe
.setCacheMode(CacheMode.PARTITIONED)
.setBackups(1)
.setAffinity(new RendezvousAffinityFunction(true /* machine-safe */, 271))
- .setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY)
.setRebalanceMode(CacheRebalanceMode.SYNC)
.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java
index fb995b5..3da266b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractMetricsSelfTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -37,7 +36,6 @@ public class GridCacheAtomicReplicatedMetricsSelfTest extends GridCacheAbstractM
cfg.setCacheMode(REPLICATED);
cfg.setAtomicityMode(ATOMIC);
- cfg.setAtomicWriteOrderMode(PRIMARY);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 92670d7..7a157ed 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
@@ -17,24 +17,15 @@
package org.apache.ignite.internal.processors.cache.distributed.replicated;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
* Multi-node tests for replicated atomic cache.
*/
public class GridCacheReplicatedAtomicMultiNodeFullApiSelfTest extends GridCacheReplicatedMultiNodeFullApiSelfTest {
- /**
- * @return Write order mode for atomic cache.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
/** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
@@ -54,8 +45,6 @@ public class GridCacheReplicatedAtomicMultiNodeFullApiSelfTest extends GridCache
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
-
return ccfg;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
index 9c4c77a..bc67554 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.java
@@ -17,17 +17,9 @@
package org.apache.ignite.internal.processors.cache.distributed.replicated;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
* Multi-node tests for replicated atomic cache with primary write order.
*/
public class GridCacheReplicatedAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest extends
GridCacheReplicatedAtomicMultiNodeFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
index ba2a1db..9871315 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.expiry;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -46,11 +44,6 @@ public class IgniteCacheAtomicExpiryPolicyTest extends IgniteCacheExpiryPolicyAb
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java
index e214273..1898c3b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyWithStoreTest.java
@@ -17,11 +17,9 @@
package org.apache.ignite.internal.processors.cache.expiry;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -43,9 +41,4 @@ public class IgniteCacheAtomicExpiryPolicyWithStoreTest extends IgniteCacheExpir
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java
index 7ba2cf0..2761f5e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest.java
@@ -17,16 +17,8 @@
package org.apache.ignite.internal.processors.cache.expiry;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
*
*/
public class IgniteCacheAtomicPrimaryWriteOrderExpiryPolicyTest extends IgniteCacheAtomicExpiryPolicyTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index ad7151f..981f314 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -59,7 +59,6 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -878,7 +877,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
IgniteCache<Integer, Integer> cache1 = jcache(1);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
+ if (atomicityMode() == ATOMIC)
Thread.sleep(100);
// Update from another node.
@@ -886,7 +885,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
checkTtl(key, 61_000L);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
+ if (atomicityMode() == ATOMIC)
Thread.sleep(100);
// Update from another node with provided TTL.
@@ -901,7 +900,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
checkTtl(key, 60_000L);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
+ if (atomicityMode() == ATOMIC)
Thread.sleep(100);
// Update from near node with provided TTL.
@@ -930,7 +929,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
for (Integer key : vals.keySet())
checkTtl(key, 60_000L);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
+ if (atomicityMode() == ATOMIC)
Thread.sleep(100);
IgniteCache<Integer, Integer> cache1 = jcache(1);
@@ -941,7 +940,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
for (Integer key : vals.keySet())
checkTtl(key, 61_000L);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
+ if (atomicityMode() == ATOMIC)
Thread.sleep(100);
// Update from another node with provided TTL.
@@ -955,7 +954,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
// Try create again.
cache0.putAll(vals);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
+ if (atomicityMode() == ATOMIC)
Thread.sleep(100);
// Update from near node with provided TTL.
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java
index 273224e..7db288f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoadAllTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.integration;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -49,9 +47,4 @@ public class IgniteCacheAtomicLoadAllTest extends IgniteCacheLoadAllAbstractTest
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java
index ebfe2c2..0e9224e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLoaderWriterTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.integration;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -46,11 +44,6 @@ public class IgniteCacheAtomicLoaderWriterTest extends IgniteCacheLoaderWriterAb
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java
index e5537aa..6467dbc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoLoadPreviousValueTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.integration;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -49,9 +47,4 @@ public class IgniteCacheAtomicNoLoadPreviousValueTest extends IgniteCacheNoLoadP
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
index 228d8c3..374bb8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.integration;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -49,9 +47,4 @@ public class IgniteCacheAtomicNoReadThroughTest extends IgniteCacheNoReadThrough
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java
index 5654273..cd36a66 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoWriteThroughTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.integration;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -49,9 +47,4 @@ public class IgniteCacheAtomicNoWriteThroughTest extends IgniteCacheNoWriteThrou
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java
index 9351d96..cd0b7dc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache.integration;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -49,9 +47,4 @@ public class IgniteCacheAtomicStoreSessionTest extends IgniteCacheStoreSessionAb
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java
index 0c343ef..68583e5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicStoreSessionWriteBehindTest.java
@@ -17,10 +17,8 @@
package org.apache.ignite.internal.processors.cache.integration;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -31,9 +29,4 @@ public class IgniteCacheAtomicStoreSessionWriteBehindTest extends IgniteCacheSto
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java
index 5eeb993..1c29098 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheJdbcBlobStoreNodeRestartTest.java
@@ -17,15 +17,12 @@
package org.apache.ignite.internal.processors.cache.integration;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStore;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
public class IgniteCacheJdbcBlobStoreNodeRestartTest extends IgniteCacheStoreNodeRestartAbstractTest {
/** {@inheritDoc} */
@Override protected CacheStore getStore() {
@@ -46,9 +43,4 @@ public class IgniteCacheJdbcBlobStoreNodeRestartTest extends IgniteCacheStoreNod
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java
index 0ecef84..09f5a3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.local;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractMetricsSelfTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -37,7 +36,6 @@ public class GridCacheAtomicLocalMetricsSelfTest extends GridCacheAbstractMetric
cfg.setCacheMode(LOCAL);
cfg.setAtomicityMode(ATOMIC);
- cfg.setAtomicWriteOrderMode(PRIMARY);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index 94c8d00..08cb9c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@ -37,7 +37,6 @@ import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -95,8 +94,6 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
ccfg.setAtomicityMode(atomicityMode);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
-
ccfg.setWriteSynchronizationMode(FULL_SYNC);
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java
index 62fd984..b2047a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java
@@ -17,21 +17,14 @@
package org.apache.ignite.internal.processors.cache.query.continuous;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
*
*/
public class CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest
extends CacheContinuousQueryFailoverAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
/** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
index 0605bc8..3e81fc0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
@@ -56,7 +56,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -885,7 +884,6 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
index 1a52909..3a20e97 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
@@ -49,7 +49,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -90,7 +89,6 @@ public class CacheContinuousQueryExecuteInPrimaryTest extends GridCommonAbstract
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(CacheMemoryMode.ONHEAP_TIERED);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index ca0fbb8..545b439 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -53,7 +53,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
import org.apache.ignite.cache.CacheEntryProcessor;
@@ -107,7 +106,6 @@ import org.apache.ignite.transactions.Transaction;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -155,7 +153,6 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
ccfg.setCacheMode(cacheMode());
ccfg.setAtomicityMode(atomicityMode());
- ccfg.setAtomicWriteOrderMode(writeOrderMode());
ccfg.setBackups(backups);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setNearConfiguration(nearCacheConfiguration());
@@ -219,13 +216,6 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
protected abstract CacheAtomicityMode atomicityMode();
/**
- * @return Write order mode for atomic cache.
- */
- protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
-
- /**
* @throws Exception If failed.
*/
public void testFirstFilteredEvent() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
index b3c18a9..88999a3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
@@ -17,11 +17,9 @@
package org.apache.ignite.internal.processors.cache.query.continuous;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
@@ -35,11 +33,6 @@ public class CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearCacheConfiguration() {
return super.nearCacheConfiguration();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java
index e33db45..44fe81a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest.java
@@ -17,22 +17,14 @@
package org.apache.ignite.internal.processors.cache.query.continuous;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
/**
*
*/
public class CacheContinuousQueryFailoverAtomicPrimaryWriteOrderSelfTest extends CacheContinuousQueryFailoverAbstractSelfTest {
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
return CacheMode.PARTITIONED;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java
index 84c9131..80c65e5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicReplicatedSelfTest.java
@@ -17,10 +17,8 @@
package org.apache.ignite.internal.processors.cache.query.continuous;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheMode;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
/**
@@ -32,9 +30,4 @@ public class CacheContinuousQueryFailoverAtomicReplicatedSelfTest
@Override protected CacheMode cacheMode() {
return REPLICATED;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
index 0d027a9..161a6b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
@@ -61,7 +61,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -526,7 +525,6 @@ public class CacheContinuousQueryOperationFromCallbackTest extends GridCommonAbs
ccfg.setAtomicityMode(atomicityMode);
ccfg.setCacheMode(cacheMode);
ccfg.setWriteSynchronizationMode(writeMode);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
index 97f9e0e..e1c0bae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
@@ -41,7 +41,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
@@ -293,7 +292,6 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
index 7d975f2..b2e9fb7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
@@ -60,7 +60,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -621,7 +620,6 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(writeMode);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index a6c33bb..91a1764 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -76,7 +76,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static javax.cache.event.EventType.CREATED;
import static javax.cache.event.EventType.REMOVED;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -1635,7 +1634,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
index 605181f..c09dd38 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
@@ -39,7 +39,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.config.GridTestProperties;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -375,7 +374,6 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java
index 55047e9..1bcaba0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java
@@ -17,10 +17,8 @@
package org.apache.ignite.internal.processors.cache.store;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -31,9 +29,4 @@ public class IgnteCacheClientWriteBehindStoreAtomicTest extends IgnteCacheClient
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 45eba6c..9b3fc7d 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
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -31,7 +30,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
/**
@@ -150,23 +148,21 @@ public class DataStreamerUpdateAfterLoadTest extends GridCommonAbstractTest {
private List<CacheConfiguration<Integer, Integer>> cacheConfigurations() {
List<CacheConfiguration<Integer, Integer>> ccfgs = new ArrayList<>();
- ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, PRIMARY, 1, "cache-" + ccfgs.size()));
- ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, PRIMARY, 0, "cache-" + ccfgs.size()));
- ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, null, 1, "cache-" + ccfgs.size()));
- ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, null, 0, "cache-" + ccfgs.size()));
+ ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, 1, "cache-" + ccfgs.size()));
+ ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, 0, "cache-" + ccfgs.size()));
+ ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, 1, "cache-" + ccfgs.size()));
+ ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, 0, "cache-" + ccfgs.size()));
return ccfgs;
}
/**
* @param atomicityMode Cache atomicity mode.
- * @param writeOrderMode Cache write order mode.
* @param backups Number of backups.
* @param name Cache name.
* @return Cache configuration.
*/
private CacheConfiguration<Integer, Integer> cacheConfiguration(CacheAtomicityMode atomicityMode,
- CacheAtomicWriteOrderMode writeOrderMode,
int backups,
String name) {
CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
@@ -174,7 +170,6 @@ public class DataStreamerUpdateAfterLoadTest extends GridCommonAbstractTest {
ccfg.setName(name);
ccfg.setAtomicityMode(atomicityMode);
ccfg.setBackups(backups);
- ccfg.setAtomicWriteOrderMode(writeOrderMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
index 5b446cc..2880d59 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
@@ -37,7 +37,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -87,8 +86,7 @@ public class ServicePredicateAccessCacheTest extends GridCommonAbstractTest {
.setName("testCache")
.setAtomicityMode(ATOMIC)
.setCacheMode(REPLICATED)
- .setWriteSynchronizationMode(FULL_SYNC)
- .setAtomicWriteOrderMode(PRIMARY));
+ .setWriteSynchronizationMode(FULL_SYNC));
latch = new CountDownLatch(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
index 4666581..bcec71a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
@@ -26,7 +26,6 @@ import javax.cache.event.CacheEntryCreatedListener;
import javax.cache.event.CacheEntryEventFilter;
import javax.cache.event.CacheEntryListener;
import javax.cache.event.CacheEntryListenerException;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheInterceptorAdapter;
import org.apache.ignite.cache.CacheMemoryMode;
@@ -120,7 +119,6 @@ public class ConfigVariations {
Parameters.objectParameters("setSwapEnabled", true),
asArray(SIMPLE_CACHE_STORE_PARAM),
Parameters.objectParameters("setWriteSynchronizationMode", CacheWriteSynchronizationMode.FULL_SYNC),
- Parameters.objectParameters("setAtomicWriteOrderMode", CacheAtomicWriteOrderMode.PRIMARY),
Parameters.objectParameters("setStartSize", 1024),
};
@@ -154,7 +152,6 @@ public class ConfigVariations {
),
// Set default parameters.
Parameters.objectParameters("setWriteSynchronizationMode", CacheWriteSynchronizationMode.FULL_SYNC),
- Parameters.objectParameters("setAtomicWriteOrderMode", CacheAtomicWriteOrderMode.PRIMARY),
Parameters.objectParameters("setStartSize", 1024),
};
[04/39] ignite git commit: Delete CLOCK, and remove check FULL_SYNC.
Posted by ag...@apache.org.
Delete CLOCK, and remove check FULL_SYNC.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fcc4d856
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fcc4d856
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fcc4d856
Branch: refs/heads/ignite-4587
Commit: fcc4d8567b9ec39bb9632cf64da5f4b4390a5928
Parents: 25d4ea5
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 13 16:14:25 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 13 16:14:25 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheProcessor.java | 6 ------
.../GridCacheRebalancingPartitionDistributionTest.java | 2 +-
.../testframework/junits/common/GridCommonAbstractTest.java | 5 -----
3 files changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fcc4d856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 0be2072..baef2e8 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -284,12 +284,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (cfg.getAtomicityMode() == ATOMIC) {
if (cfg.getAtomicWriteOrderMode() == null) {
- cfg.setAtomicWriteOrderMode(cfg.getWriteSynchronizationMode() == FULL_SYNC ?
- CacheAtomicWriteOrderMode.CLOCK :
- CacheAtomicWriteOrderMode.PRIMARY);
- }
- else if (cfg.getWriteSynchronizationMode() != FULL_SYNC &&
- cfg.getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.CLOCK) {
cfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY);
U.warn(log, "Automatically set write order mode to PRIMARY for better performance " +
http://git-wip-us.apache.org/repos/asf/ignite/blob/fcc4d856/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java
index 61ee9ea..68f5119 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java
@@ -53,7 +53,7 @@ public class GridCacheRebalancingPartitionDistributionTest extends GridRollingRe
.setCacheMode(CacheMode.PARTITIONED)
.setBackups(1)
.setAffinity(new RendezvousAffinityFunction(true /* machine-safe */, 271))
- .setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.CLOCK)
+ .setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY)
.setRebalanceMode(CacheRebalanceMode.SYNC)
.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fcc4d856/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 549c486..7ab76f3 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
@@ -1120,11 +1120,6 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
*/
protected void atomicClockModeDelay(IgniteCache cache) throws Exception {
CacheConfiguration ccfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
-
- if (ccfg.getCacheMode() != LOCAL &&
- ccfg.getAtomicityMode() == CacheAtomicityMode.ATOMIC &&
- ccfg.getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.CLOCK)
- U.sleep(50);
}
/**
[35/39] ignite git commit: Remove updateTime
Posted by ag...@apache.org.
Remove updateTime
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea61e629
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea61e629
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea61e629
Branch: refs/heads/ignite-4587
Commit: ea61e6299589bdbff8a67542f95df66742cab8fe
Parents: 6265f33
Author: Max Kozlov <dr...@gmail.com>
Authored: Thu Mar 16 12:59:51 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Thu Mar 16 12:59:51 2017 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/cache/CacheEntry.java | 11 -----------
.../internal/processors/cache/CacheEntryImplEx.java | 8 +-------
.../cache/version/CacheVersionedEntryAbstractTest.java | 2 --
3 files changed, 1 insertion(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea61e629/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
index 19585a3..90f30a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
@@ -82,15 +82,4 @@ public interface CacheEntry<K, V> extends Cache.Entry<K, V> {
* @return Version of this cache entry.
*/
public Comparable version();
-
- /**
- * Returns the time when the cache entry for the given key has been updated or initially created.
- * <p>
- * It is valid to compare cache entries' update time for the same key. In this case the latter update will
- * be represented by higher update time. The result of update time comparison of cache entries of different keys is
- * undefined.
- *
- * @return Time in milliseconds.
- */
- public long updateTime();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea61e629/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
index af926c6..664b216 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
@@ -70,11 +70,6 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach
}
/** {@inheritDoc} */
- @Override public long updateTime() {
- return ver.globalTime();
- }
-
- /** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal(out);
@@ -96,8 +91,7 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach
if (ver != null && ver != GET_ENTRY_INVALID_VER_AFTER_GET && ver != GET_ENTRY_INVALID_VER_UPDATED) {
res += ", topVer=" + ver.topologyVersion() +
", nodeOrder=" + ver.nodeOrder() +
- ", order=" + ver.order() +
- ", updateTime=" + ver.globalTime();
+ ", order=" + ver.order();
}
else
res += ", ver=n/a";
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea61e629/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
index 37cf26d..d1c0f31 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
@@ -155,7 +155,6 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
});
assert ver1.version().compareTo(ver2.version()) < 0;
- assert ver1.updateTime() <= ver2.updateTime();
}
/**
@@ -165,7 +164,6 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
assertNotNull(entry);
assertNotNull(entry.version());
- assert entry.updateTime() > 0;
assertNotNull(entry.getKey());
assertNotNull(entry.getValue());
[34/39] ignite git commit: Merge branch 'master' into ignite-4587
Posted by ag...@apache.org.
Merge branch 'master' into ignite-4587
# Conflicts:
# modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug
# modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7db3b40c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7db3b40c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7db3b40c
Branch: refs/heads/ignite-4587
Commit: 7db3b40cd4dfe4184d5929a74dc14b16940fe25c
Parents: 4f3ceea 94c1e7c
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 15 15:49:01 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 15 15:49:01 2017 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 20 +
assembly/dependencies-hadoop.xml | 3 +
assembly/release-base.xml | 5 -
assembly/release-fabric-base.xml | 5 +
assembly/release-sources.xml | 3 +-
config/example-kube.xml | 53 +
doap_Ignite.rdf | 1 -
examples/pom-standalone-lgpl.xml | 6 +
examples/pom-standalone.xml | 6 +
modules/clients/src/test/config/jdbc-config.xml | 2 +-
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 49 +-
.../jdbc2/JdbcInsertStatementSelfTest.java | 51 +
.../jdbc2/JdbcMergeStatementSelfTest.java | 51 +
.../internal/jdbc2/JdbcStreamingSelfTest.java | 187 ++
.../jdbc2/JdbcUpdateStatementSelfTest.java | 50 +
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 1 +
.../src/main/java/org/apache/ignite/Ignite.java | 1 +
.../java/org/apache/ignite/IgniteCompute.java | 44 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 30 +
.../apache/ignite/IgniteSystemProperties.java | 38 +
.../cache/eviction/AbstractEvictionPolicy.java | 203 +++
.../ignite/cache/eviction/EvictionPolicy.java | 2 -
.../cache/eviction/fifo/FifoEvictionPolicy.java | 158 +-
.../cache/eviction/lru/LruEvictionPolicy.java | 159 +-
.../eviction/random/RandomEvictionPolicy.java | 124 --
.../random/RandomEvictionPolicyMBean.java | 42 -
.../eviction/sorted/SortedEvictionPolicy.java | 159 +-
.../configuration/CacheConfiguration.java | 41 +
.../ignite/internal/binary/BinaryContext.java | 3 +
.../ignite/internal/binary/BinaryTreeMap.java | 6 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 72 +-
.../internal/jdbc2/JdbcPreparedStatement.java | 34 +-
.../ignite/internal/jdbc2/JdbcStatement.java | 20 +-
.../jdbc2/JdbcStreamedPreparedStatement.java | 59 +
.../managers/communication/GridIoManager.java | 107 +-
.../internal/managers/discovery/DiscoCache.java | 310 ++++
.../discovery/GridDiscoveryManager.java | 550 ++----
.../eventstorage/DiscoveryEventListener.java | 33 +
.../eventstorage/GridEventStorageManager.java | 162 +-
.../affinity/GridAffinityAssignmentCache.java | 7 +-
.../cache/CacheAffinitySharedManager.java | 35 +-
.../processors/cache/EntryGetResult.java | 40 +-
.../processors/cache/EntryGetWithTtlResult.java | 58 +
.../processors/cache/GridCacheAdapter.java | 69 +-
.../cache/GridCacheAffinityManager.java | 24 +-
.../processors/cache/GridCacheContext.java | 122 +-
.../processors/cache/GridCacheEntryEx.java | 2 +-
.../cache/GridCacheManagerAdapter.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 29 +-
.../GridCachePartitionExchangeManager.java | 64 +-
.../processors/cache/GridCacheProcessor.java | 5 +-
.../processors/cache/IgniteCacheProxy.java | 6 +-
.../dht/GridClientPartitionTopology.java | 20 +-
.../dht/GridDhtAssignmentFetchFuture.java | 7 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 24 +-
.../distributed/dht/GridDhtGetSingleFuture.java | 24 +-
.../dht/GridDhtPartitionTopologyImpl.java | 44 +-
.../dht/GridPartitionedGetFuture.java | 19 +-
.../dht/GridPartitionedSingleGetFuture.java | 7 +-
.../dht/atomic/GridDhtAtomicCache.java | 12 +-
.../dht/colocated/GridDhtColocatedCache.java | 15 +-
.../GridDhtPartitionsExchangeFuture.java | 33 +-
.../distributed/near/GridNearGetFuture.java | 9 +-
.../cache/distributed/near/GridNearTxLocal.java | 8 +-
.../local/atomic/GridLocalAtomicCache.java | 13 +-
.../cache/query/GridCacheSqlQuery.java | 127 +-
.../transactions/IgniteTxLocalAdapter.java | 65 +-
.../closure/GridClosureProcessor.java | 2 +-
.../processors/cluster/GridUpdateNotifier.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 3 +-
.../datastructures/GridCacheLockImpl.java | 17 +-
.../processors/hadoop/HadoopJobProperty.java | 2 +-
.../processors/query/GridQueryIndexing.java | 58 +-
.../processors/query/GridQueryProcessor.java | 214 ++-
.../messages/GridQueryNextPageRequest.java | 29 +-
.../messages/GridQueryNextPageResponse.java | 29 +-
.../service/GridServiceProcessor.java | 21 +-
.../ignite/internal/util/IgniteUtils.java | 14 +-
.../visor/cache/VisorCacheClearTask.java | 57 +-
.../internal/visor/query/VisorQueryArgV3.java | 51 +
.../internal/visor/query/VisorQueryJob.java | 6 +-
.../internal/visor/util/VisorTaskUtils.java | 8 +-
.../communication/tcp/TcpCommunicationSpi.java | 25 +
.../resources/META-INF/classnames.properties | 8 +-
.../internal/GridCacheRecreateLockTest.java | 78 +
...ridFailFastNodeFailureDetectionSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 20 +-
...idCacheConfigurationConsistencySelfTest.java | 6 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
...sExchangeOnDiscoveryHistoryOverflowTest.java | 183 ++
.../CacheLockReleaseNodeLeaveTest.java | 64 +-
.../GridCacheRebalancingSyncSelfTest.java | 69 +-
.../cache/eviction/EvictionAbstractTest.java | 4 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 42 +
.../tcp/TcpCommunicationSpiDropNodesTest.java | 3 +-
.../TcpCommunicationSpiFaultyClientTest.java | 3 +-
.../junits/common/GridCommonAbstractTest.java | 77 +
.../testsuites/IgniteCacheTestSuite5.java | 3 +
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
modules/docker/1.9.0/Dockerfile | 46 +
modules/docker/1.9.0/run.sh | 51 +
modules/docker/Dockerfile | 4 +-
.../query/h2/opt/GridH2SpatialIndex.java | 56 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 409 +++--
.../h2/GridH2IndexingSegmentedGeoSelfTest.java | 37 +
.../testsuites/GeoSpatialIndexingTestSuite.java | 2 +
.../hadoop/shuffle/HadoopShuffleJob.java | 3 +-
.../cache/query/GridCacheTwoStepQuery.java | 17 +
.../query/h2/DmlStatementsProcessor.java | 267 ++-
.../processors/query/h2/IgniteH2Indexing.java | 402 ++++-
.../query/h2/dml/UpdatePlanBuilder.java | 2 +-
.../query/h2/opt/DistributedJoinMode.java | 51 +
.../query/h2/opt/GridH2CollocationModel.java | 82 +-
.../query/h2/opt/GridH2IndexBase.java | 348 +++-
.../query/h2/opt/GridH2QueryContext.java | 84 +-
.../query/h2/opt/GridH2RowDescriptor.java | 5 -
.../query/h2/opt/GridH2ScanIndex.java | 273 +++
.../processors/query/h2/opt/GridH2Table.java | 244 +--
.../query/h2/opt/GridH2TreeIndex.java | 151 +-
.../processors/query/h2/sql/DmlAstUtils.java | 54 +-
.../processors/query/h2/sql/GridSqlAlias.java | 13 +-
.../processors/query/h2/sql/GridSqlArray.java | 8 +-
.../processors/query/h2/sql/GridSqlAst.java | 61 +
.../processors/query/h2/sql/GridSqlColumn.java | 85 +-
.../processors/query/h2/sql/GridSqlConst.java | 6 +-
.../processors/query/h2/sql/GridSqlElement.java | 43 +-
.../query/h2/sql/GridSqlFunction.java | 18 +-
.../processors/query/h2/sql/GridSqlJoin.java | 35 +-
.../processors/query/h2/sql/GridSqlKeyword.java | 3 +-
.../query/h2/sql/GridSqlOperation.java | 6 +-
.../query/h2/sql/GridSqlOperationType.java | 4 +-
.../query/h2/sql/GridSqlParameter.java | 4 +-
.../query/h2/sql/GridSqlPlaceholder.java | 2 +-
.../processors/query/h2/sql/GridSqlQuery.java | 91 +-
.../query/h2/sql/GridSqlQueryParser.java | 248 ++-
.../query/h2/sql/GridSqlQuerySplitter.java | 1684 +++++++++++++++---
.../processors/query/h2/sql/GridSqlSelect.java | 121 +-
.../query/h2/sql/GridSqlSortColumn.java | 41 +
.../query/h2/sql/GridSqlStatement.java | 11 +-
.../query/h2/sql/GridSqlSubquery.java | 31 +-
.../processors/query/h2/sql/GridSqlTable.java | 19 +-
.../processors/query/h2/sql/GridSqlType.java | 6 +-
.../processors/query/h2/sql/GridSqlUnion.java | 66 +-
.../processors/query/h2/sql/GridSqlValue.java | 25 -
.../query/h2/twostep/GridMapQueryExecutor.java | 313 +++-
.../query/h2/twostep/GridMergeIndex.java | 647 +++++--
.../query/h2/twostep/GridMergeIndexSorted.java | 380 ++++
.../h2/twostep/GridMergeIndexUnsorted.java | 101 +-
.../query/h2/twostep/GridMergeTable.java | 70 +-
.../h2/twostep/GridReduceQueryExecutor.java | 211 ++-
.../query/h2/twostep/GridResultPage.java | 34 +-
.../h2/twostep/msg/GridH2IndexRangeRequest.java | 60 +-
.../twostep/msg/GridH2IndexRangeResponse.java | 62 +-
.../h2/twostep/msg/GridH2QueryRequest.java | 19 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 6 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 10 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 14 +
.../IgniteCacheUpdateSqlQuerySelfTest.java | 11 +-
.../cache/IncorrectCacheTypeMetadataTest.java | 72 +
.../cache/IncorrectQueryEntityTest.java | 75 +
.../query/IgniteSqlSegmentedIndexSelfTest.java | 263 +++
.../query/IgniteSqlSplitterSelfTest.java | 331 +++-
.../h2/GridIndexingSpiAbstractSelfTest.java | 26 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 21 +-
.../query/h2/sql/GridQueryParsingTest.java | 72 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 58 +-
.../FetchingQueryCursorStressTest.java | 277 +++
.../IgniteCacheQuerySelfTestSuite.java | 8 +
.../processors/query/h2/sql/bigQuery.sql | 36 +-
modules/kubernetes/config/Dockerfile | 17 +
.../kubernetes/config/ignite-deployment.yaml | 15 +
modules/kubernetes/config/ignite-service.yaml | 15 +
.../cpp/common/project/vs/common.vcxproj | 1 -
.../common/project/vs/common.vcxproj.filters | 6 -
.../platforms/cpp/common/project/vs/targetver.h | 25 -
modules/platforms/cpp/core-test/Makefile.am | 1 +
.../cpp/core-test/config/cache-store.xml | 71 +
.../cpp/core-test/project/vs/core-test.vcxproj | 5 +
.../project/vs/core-test.vcxproj.filters | 9 +
.../src/binary_identity_resolver_test.cpp | 2 +-
.../src/binary_reader_writer_raw_test.cpp | 2 +-
.../core-test/src/binary_reader_writer_test.cpp | 2 +-
.../cpp/core-test/src/binary_session_test.cpp | 2 +-
.../cpp/core-test/src/cache_query_test.cpp | 2 +-
.../cpp/core-test/src/cache_store_test.cpp | 151 ++
.../cpp/core-test/src/continuous_query_test.cpp | 2 +-
.../cpp/core-test/src/handle_registry_test.cpp | 2 +-
.../cpp/core-test/src/ignite_error_test.cpp | 2 +-
.../cpp/core-test/src/ignition_test.cpp | 2 +-
.../cpp/core-test/src/interop_memory_test.cpp | 2 +-
.../cpp/core-test/src/reference_test.cpp | 2 +-
.../platforms/cpp/core-test/src/test_utils.cpp | 7 +
.../cpp/core-test/src/transactions_test.cpp | 2 +-
.../cpp/core/include/ignite/cache/cache.h | 54 +-
.../cache/query/continuous/continuous_query.h | 2 +-
.../core/include/ignite/impl/cache/cache_impl.h | 19 +
.../ignite/impl/interop/interop_target.h | 25 +
.../cpp/core/src/impl/cache/cache_impl.cpp | 48 +
.../core/src/impl/interop/interop_target.cpp | 36 +-
.../platforms/cpp/jni/project/vs/jni.vcxproj | 1 -
.../cpp/jni/project/vs/jni.vcxproj.filters | 3 -
.../platforms/cpp/jni/project/vs/targetver.h | 25 -
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../ant/beautifier/GridJavadocAntTask.java | 1 +
modules/web-console/backend/app/agent.js | 50 +-
modules/web-console/backend/app/browser.js | 36 +-
modules/web-console/backend/app/settings.js | 8 +-
modules/web-console/backend/index.js | 10 -
modules/web-console/frontend/.eslintrc | 1 +
modules/web-console/frontend/.gitignore | 1 +
modules/web-console/frontend/app/app.config.js | 12 +-
modules/web-console/frontend/app/app.js | 7 +-
.../activities-user-dialog.jade | 36 -
.../activities-user-dialog.tpl.pug | 36 +
.../components/activities-user-dialog/index.js | 2 +-
.../form-field-datepicker.jade | 55 -
.../form-field-datepicker.pug | 55 +
.../list-of-registered-users/index.js | 2 +-
.../list-of-registered-users.controller.js | 11 +-
.../list-of-registered-users.jade | 58 -
.../list-of-registered-users.tpl.pug | 58 +
.../ui-grid-header/ui-grid-header.jade | 27 -
.../ui-grid-header/ui-grid-header.scss | 1 +
.../ui-grid-header/ui-grid-header.tpl.pug | 27 +
.../ui-grid-settings/ui-grid-settings.jade | 33 -
.../ui-grid-settings/ui-grid-settings.pug | 33 +
.../ui-grid-settings/ui-grid-settings.scss | 35 +
.../app/directives/centered/centered.css | 37 -
.../directives/centered/centered.directive.js | 2 +-
.../app/directives/centered/centered.scss | 37 +
.../information/information.directive.js | 4 +-
.../app/directives/information/information.jade | 20 -
.../app/directives/information/information.pug | 20 +
.../ui-ace-docker/ui-ace-docker.directive.js | 4 +-
.../directives/ui-ace-docker/ui-ace-docker.jade | 31 -
.../directives/ui-ace-docker/ui-ace-docker.pug | 31 +
.../ui-ace-java/ui-ace-java.directive.js | 4 +-
.../app/directives/ui-ace-java/ui-ace-java.jade | 22 -
.../app/directives/ui-ace-java/ui-ace-java.pug | 22 +
.../ui-ace-pojos/ui-ace-pojos.directive.js | 4 +-
.../directives/ui-ace-pojos/ui-ace-pojos.jade | 40 -
.../directives/ui-ace-pojos/ui-ace-pojos.pug | 40 +
.../ui-ace-pom/ui-ace-pom.directive.js | 4 +-
.../app/directives/ui-ace-pom/ui-ace-pom.jade | 17 -
.../app/directives/ui-ace-pom/ui-ace-pom.pug | 17 +
.../ui-ace-sharp/ui-ace-sharp.directive.js | 4 +-
.../directives/ui-ace-sharp/ui-ace-sharp.jade | 22 -
.../directives/ui-ace-sharp/ui-ace-sharp.pug | 22 +
.../ui-ace-spring/ui-ace-spring.directive.js | 4 +-
.../directives/ui-ace-spring/ui-ace-spring.jade | 17 -
.../directives/ui-ace-spring/ui-ace-spring.pug | 17 +
.../frontend/app/helpers/jade/form.jade | 28 -
.../frontend/app/helpers/jade/form.pug | 28 +
.../helpers/jade/form/form-field-checkbox.jade | 38 -
.../helpers/jade/form/form-field-checkbox.pug | 38 +
.../helpers/jade/form/form-field-datalist.jade | 51 -
.../helpers/jade/form/form-field-datalist.pug | 51 +
.../app/helpers/jade/form/form-field-down.jade | 18 -
.../app/helpers/jade/form/form-field-down.pug | 18 +
.../helpers/jade/form/form-field-dropdown.jade | 51 -
.../helpers/jade/form/form-field-dropdown.pug | 51 +
.../helpers/jade/form/form-field-feedback.jade | 32 -
.../helpers/jade/form/form-field-feedback.pug | 32 +
.../app/helpers/jade/form/form-field-label.jade | 23 -
.../app/helpers/jade/form/form-field-label.pug | 23 +
.../helpers/jade/form/form-field-number.jade | 53 -
.../app/helpers/jade/form/form-field-number.pug | 53 +
.../helpers/jade/form/form-field-password.jade | 47 -
.../helpers/jade/form/form-field-password.pug | 47 +
.../app/helpers/jade/form/form-field-text.jade | 64 -
.../app/helpers/jade/form/form-field-text.pug | 64 +
.../app/helpers/jade/form/form-field-up.jade | 18 -
.../app/helpers/jade/form/form-field-up.pug | 18 +
.../app/helpers/jade/form/form-group.jade | 23 -
.../app/helpers/jade/form/form-group.pug | 23 +
.../frontend/app/helpers/jade/mixins.jade | 609 -------
.../frontend/app/helpers/jade/mixins.pug | 609 +++++++
.../frontend/app/modules/agent/agent.module.js | 14 +-
.../modules/branding/header-logo.directive.js | 4 +-
.../app/modules/branding/header-logo.jade | 18 -
.../app/modules/branding/header-logo.pug | 18 +
.../branding/powered-by-apache.directive.js | 4 +-
.../app/modules/branding/powered-by-apache.jade | 18 -
.../app/modules/branding/powered-by-apache.pug | 18 +
.../frontend/app/modules/demo/Demo.module.js | 3 +-
.../app/modules/dialog/dialog.factory.js | 2 +-
.../frontend/app/modules/dialog/dialog.jade | 26 -
.../frontend/app/modules/dialog/dialog.tpl.pug | 26 +
.../getting-started/GettingStarted.provider.js | 3 +-
.../frontend/app/modules/loading/loading.css | 73 -
.../app/modules/loading/loading.directive.js | 8 +-
.../frontend/app/modules/loading/loading.jade | 23 -
.../frontend/app/modules/loading/loading.pug | 23 +
.../frontend/app/modules/loading/loading.scss | 73 +
.../frontend/app/modules/nodes/Nodes.service.js | 4 +-
.../app/modules/nodes/nodes-dialog.jade | 35 -
.../app/modules/nodes/nodes-dialog.tpl.pug | 35 +
.../app/modules/sql/notebook.controller.js | 4 +-
.../frontend/app/modules/sql/sql.controller.js | 39 +-
.../frontend/app/modules/sql/sql.module.js | 15 +-
.../frontend/app/modules/states/admin.state.js | 4 +-
.../app/modules/states/configuration.state.js | 23 +-
.../states/configuration/caches/affinity.jade | 82 -
.../states/configuration/caches/affinity.pug | 82 +
.../configuration/caches/client-near-cache.jade | 50 -
.../configuration/caches/client-near-cache.pug | 50 +
.../configuration/caches/concurrency.jade | 54 -
.../states/configuration/caches/concurrency.pug | 54 +
.../states/configuration/caches/general.jade | 69 -
.../states/configuration/caches/general.pug | 69 +
.../states/configuration/caches/memory.jade | 109 --
.../states/configuration/caches/memory.pug | 108 ++
.../configuration/caches/near-cache-client.jade | 51 -
.../configuration/caches/near-cache-client.pug | 51 +
.../configuration/caches/near-cache-server.jade | 52 -
.../configuration/caches/near-cache-server.pug | 52 +
.../configuration/caches/node-filter.jade | 59 -
.../states/configuration/caches/node-filter.pug | 59 +
.../states/configuration/caches/query.jade | 114 --
.../states/configuration/caches/query.pug | 114 ++
.../states/configuration/caches/rebalance.jade | 66 -
.../states/configuration/caches/rebalance.pug | 66 +
.../states/configuration/caches/statistics.jade | 39 -
.../states/configuration/caches/statistics.pug | 39 +
.../states/configuration/caches/store.jade | 250 ---
.../states/configuration/caches/store.pug | 250 +++
.../states/configuration/clusters/atomic.jade | 54 -
.../states/configuration/clusters/atomic.pug | 54 +
.../configuration/clusters/attributes.jade | 57 -
.../configuration/clusters/attributes.pug | 57 +
.../states/configuration/clusters/binary.jade | 77 -
.../states/configuration/clusters/binary.pug | 77 +
.../configuration/clusters/cache-key-cfg.jade | 50 -
.../configuration/clusters/cache-key-cfg.pug | 50 +
.../configuration/clusters/checkpoint.jade | 86 -
.../configuration/clusters/checkpoint.pug | 86 +
.../configuration/clusters/checkpoint/fs.jade | 66 -
.../configuration/clusters/checkpoint/fs.pug | 66 +
.../configuration/clusters/checkpoint/jdbc.jade | 48 -
.../configuration/clusters/checkpoint/jdbc.pug | 48 +
.../configuration/clusters/checkpoint/s3.jade | 178 --
.../configuration/clusters/checkpoint/s3.pug | 178 ++
.../configuration/clusters/collision.jade | 63 -
.../states/configuration/clusters/collision.pug | 63 +
.../clusters/collision/custom.jade | 24 -
.../configuration/clusters/collision/custom.pug | 24 +
.../clusters/collision/fifo-queue.jade | 27 -
.../clusters/collision/fifo-queue.pug | 27 +
.../clusters/collision/job-stealing.jade | 63 -
.../clusters/collision/job-stealing.pug | 63 +
.../clusters/collision/priority-queue.jade | 42 -
.../clusters/collision/priority-queue.pug | 42 +
.../configuration/clusters/communication.jade | 100 --
.../configuration/clusters/communication.pug | 100 ++
.../configuration/clusters/connector.jade | 104 --
.../states/configuration/clusters/connector.pug | 104 ++
.../configuration/clusters/deployment.jade | 237 ---
.../configuration/clusters/deployment.pug | 237 +++
.../configuration/clusters/discovery.jade | 88 -
.../states/configuration/clusters/discovery.pug | 88 +
.../states/configuration/clusters/events.jade | 68 -
.../states/configuration/clusters/events.pug | 68 +
.../states/configuration/clusters/failover.jade | 73 -
.../states/configuration/clusters/failover.pug | 73 +
.../states/configuration/clusters/general.jade | 76 -
.../states/configuration/clusters/general.pug | 76 +
.../clusters/general/discovery/cloud.jade | 134 --
.../clusters/general/discovery/cloud.pug | 134 ++
.../clusters/general/discovery/google.jade | 38 -
.../clusters/general/discovery/google.pug | 38 +
.../clusters/general/discovery/jdbc.jade | 31 -
.../clusters/general/discovery/jdbc.pug | 31 +
.../clusters/general/discovery/multicast.jade | 99 -
.../clusters/general/discovery/multicast.pug | 99 +
.../clusters/general/discovery/s3.jade | 27 -
.../clusters/general/discovery/s3.pug | 27 +
.../clusters/general/discovery/shared.jade | 23 -
.../clusters/general/discovery/shared.pug | 23 +
.../clusters/general/discovery/vm.jade | 79 -
.../clusters/general/discovery/vm.pug | 79 +
.../clusters/general/discovery/zookeeper.jade | 85 -
.../clusters/general/discovery/zookeeper.pug | 85 +
.../bounded-exponential-backoff.jade | 27 -
.../retrypolicy/bounded-exponential-backoff.pug | 27 +
.../discovery/zookeeper/retrypolicy/custom.jade | 24 -
.../discovery/zookeeper/retrypolicy/custom.pug | 24 +
.../retrypolicy/exponential-backoff.jade | 27 -
.../retrypolicy/exponential-backoff.pug | 27 +
.../zookeeper/retrypolicy/forever.jade | 22 -
.../discovery/zookeeper/retrypolicy/forever.pug | 22 +
.../zookeeper/retrypolicy/n-times.jade | 25 -
.../discovery/zookeeper/retrypolicy/n-times.pug | 25 +
.../zookeeper/retrypolicy/one-time.jade | 23 -
.../zookeeper/retrypolicy/one-time.pug | 23 +
.../zookeeper/retrypolicy/until-elapsed.jade | 25 -
.../zookeeper/retrypolicy/until-elapsed.pug | 25 +
.../states/configuration/clusters/igfs.jade | 38 -
.../states/configuration/clusters/igfs.pug | 38 +
.../configuration/clusters/load-balancing.jade | 107 --
.../configuration/clusters/load-balancing.pug | 107 ++
.../states/configuration/clusters/logger.jade | 66 -
.../states/configuration/clusters/logger.pug | 66 +
.../configuration/clusters/logger/custom.jade | 25 -
.../configuration/clusters/logger/custom.pug | 25 +
.../configuration/clusters/logger/log4j.jade | 50 -
.../configuration/clusters/logger/log4j.pug | 50 +
.../configuration/clusters/logger/log4j2.jade | 39 -
.../configuration/clusters/logger/log4j2.pug | 39 +
.../configuration/clusters/marshaller.jade | 76 -
.../configuration/clusters/marshaller.pug | 76 +
.../states/configuration/clusters/metrics.jade | 51 -
.../states/configuration/clusters/metrics.pug | 51 +
.../states/configuration/clusters/odbc.jade | 48 -
.../states/configuration/clusters/odbc.pug | 48 +
.../states/configuration/clusters/ssl.jade | 110 --
.../states/configuration/clusters/ssl.pug | 110 ++
.../states/configuration/clusters/swap.jade | 72 -
.../states/configuration/clusters/swap.pug | 72 +
.../states/configuration/clusters/thread.jade | 48 -
.../states/configuration/clusters/thread.pug | 48 +
.../states/configuration/clusters/time.jade | 39 -
.../states/configuration/clusters/time.pug | 39 +
.../configuration/clusters/transactions.jade | 69 -
.../configuration/clusters/transactions.pug | 69 +
.../states/configuration/domains/general.jade | 52 -
.../states/configuration/domains/general.pug | 52 +
.../states/configuration/domains/query.jade | 172 --
.../states/configuration/domains/query.pug | 172 ++
.../states/configuration/domains/store.jade | 127 --
.../states/configuration/domains/store.pug | 127 ++
.../modules/states/configuration/igfs/dual.jade | 42 -
.../modules/states/configuration/igfs/dual.pug | 42 +
.../states/configuration/igfs/fragmentizer.jade | 43 -
.../states/configuration/igfs/fragmentizer.pug | 43 +
.../states/configuration/igfs/general.jade | 57 -
.../states/configuration/igfs/general.pug | 57 +
.../modules/states/configuration/igfs/ipc.jade | 60 -
.../modules/states/configuration/igfs/ipc.pug | 60 +
.../modules/states/configuration/igfs/misc.jade | 108 --
.../modules/states/configuration/igfs/misc.pug | 108 ++
.../states/configuration/igfs/secondary.jade | 45 -
.../states/configuration/igfs/secondary.pug | 45 +
.../configuration/summary/summary.controller.js | 5 +
.../frontend/app/modules/states/errors.state.js | 4 +-
.../app/modules/states/password.state.js | 6 +-
.../app/modules/states/profile.state.js | 4 +-
.../frontend/app/modules/states/signin.state.js | 2 +-
.../frontend/app/services/Clone.service.js | 4 +-
.../frontend/app/services/Confirm.service.js | 4 +-
.../app/services/ConfirmBatch.service.js | 4 +-
.../frontend/controllers/caches-controller.js | 4 +-
.../frontend/controllers/domains-controller.js | 4 +-
.../frontend/gulpfile.babel.js/paths.js | 28 +-
.../frontend/gulpfile.babel.js/tasks/build.js | 2 +-
.../frontend/gulpfile.babel.js/tasks/bundle.js | 8 +-
.../frontend/gulpfile.babel.js/tasks/jade.js | 49 -
.../frontend/gulpfile.babel.js/tasks/watch.js | 5 +-
.../gulpfile.babel.js/webpack/common.js | 292 +--
.../webpack/environments/development.js | 90 +-
.../webpack/environments/production.js | 41 +-
.../webpack/environments/test.js | 52 +-
.../frontend/gulpfile.babel.js/webpack/index.js | 4 +-
modules/web-console/frontend/package.json | 60 +-
.../frontend/public/stylesheets/style.scss | 8 +-
.../frontend/test/e2e/exampe.test.js | 4 +-
.../frontend/test/karma.conf.babel.js | 7 +-
.../frontend/test/protractor.conf.js | 16 +-
.../frontend/test/unit/JavaTransformer.test.js | 2 +-
.../frontend/test/unit/JavaTypes.test.js | 137 +-
.../frontend/test/unit/SharpTransformer.test.js | 2 +-
.../test/unit/SpringTransformer.test.js | 2 +-
.../frontend/test/unit/SqlTypes.test.js | 7 +-
.../frontend/test/unit/UserAuth.test.js | 4 +-
.../frontend/test/unit/Version.test.js | 1 +
.../test/unit/defaultName.filter.test.js | 27 +-
modules/web-console/frontend/views/403.jade | 22 -
modules/web-console/frontend/views/403.pug | 22 +
modules/web-console/frontend/views/404.jade | 22 -
modules/web-console/frontend/views/404.pug | 22 +
modules/web-console/frontend/views/base.jade | 22 -
modules/web-console/frontend/views/base.pug | 22 +
.../frontend/views/configuration/caches.jade | 55 -
.../frontend/views/configuration/caches.tpl.pug | 55 +
.../frontend/views/configuration/clusters.jade | 68 -
.../views/configuration/clusters.tpl.pug | 68 +
.../views/configuration/domains-import.jade | 170 --
.../views/configuration/domains-import.tpl.pug | 170 ++
.../frontend/views/configuration/domains.jade | 66 -
.../views/configuration/domains.tpl.pug | 66 +
.../frontend/views/configuration/igfs.jade | 51 -
.../frontend/views/configuration/igfs.tpl.pug | 51 +
.../frontend/views/configuration/sidebar.jade | 29 -
.../views/configuration/sidebar.tpl.pug | 29 +
.../summary-project-structure.jade | 27 -
.../summary-project-structure.tpl.pug | 28 +
.../views/configuration/summary-tabs.jade | 25 -
.../views/configuration/summary-tabs.pug | 25 +
.../frontend/views/configuration/summary.jade | 90 -
.../views/configuration/summary.tpl.pug | 90 +
.../frontend/views/includes/footer.jade | 23 -
.../frontend/views/includes/footer.pug | 23 +
.../frontend/views/includes/header.jade | 52 -
.../frontend/views/includes/header.pug | 52 +
modules/web-console/frontend/views/index.jade | 47 -
modules/web-console/frontend/views/index.pug | 47 +
modules/web-console/frontend/views/reset.jade | 48 -
.../web-console/frontend/views/reset.tpl.pug | 48 +
.../frontend/views/settings/admin.jade | 25 -
.../frontend/views/settings/admin.tpl.pug | 25 +
.../frontend/views/settings/profile.jade | 76 -
.../frontend/views/settings/profile.tpl.pug | 76 +
modules/web-console/frontend/views/signin.jade | 163 --
.../web-console/frontend/views/signin.tpl.pug | 163 ++
.../frontend/views/sql/cache-metadata.jade | 40 -
.../frontend/views/sql/cache-metadata.tpl.pug | 40 +
.../frontend/views/sql/chart-settings.jade | 40 -
.../frontend/views/sql/chart-settings.tpl.pug | 40 +
.../frontend/views/sql/notebook-new.jade | 33 -
.../frontend/views/sql/notebook-new.tpl.pug | 33 +
.../frontend/views/sql/paragraph-rate.jade | 31 -
.../frontend/views/sql/paragraph-rate.tpl.pug | 31 +
modules/web-console/frontend/views/sql/sql.jade | 278 ---
.../web-console/frontend/views/sql/sql.tpl.pug | 289 +++
.../views/templates/agent-download.jade | 50 -
.../views/templates/agent-download.tpl.pug | 50 +
.../frontend/views/templates/alert.jade | 21 -
.../frontend/views/templates/alert.tpl.pug | 21 +
.../frontend/views/templates/batch-confirm.jade | 34 -
.../views/templates/batch-confirm.tpl.pug | 34 +
.../frontend/views/templates/clone.jade | 39 -
.../frontend/views/templates/clone.tpl.pug | 39 +
.../frontend/views/templates/confirm.jade | 33 -
.../frontend/views/templates/confirm.tpl.pug | 33 +
.../frontend/views/templates/demo-info.jade | 47 -
.../frontend/views/templates/demo-info.tpl.pug | 47 +
.../frontend/views/templates/dropdown.jade | 24 -
.../frontend/views/templates/dropdown.tpl.pug | 24 +
.../views/templates/getting-started.jade | 34 -
.../views/templates/getting-started.tpl.pug | 34 +
.../frontend/views/templates/message.jade | 28 -
.../frontend/views/templates/message.tpl.pug | 28 +
.../frontend/views/templates/pagination.jade | 32 -
.../frontend/views/templates/select.jade | 26 -
.../frontend/views/templates/select.tpl.pug | 26 +
.../views/templates/validation-error.jade | 25 -
.../views/templates/validation-error.tpl.pug | 25 +
.../demo/service/DemoCachesLoadService.java | 26 +
modules/yardstick/config/ignite-base-config.xml | 25 +
.../yardstick/cache/IgniteGetAllBenchmark.java | 42 +
.../cache/IgniteGetAllOffHeapBenchmark.java | 30 +
.../yardstick/cache/IgniteGetBenchmark.java | 35 +
.../cache/IgnitePutAllOffHeapBenchmark.java | 30 +
.../cache/IgnitePutAllTxOffHeapBenchmark.java | 30 +
.../IgnitePutOffHeapIndexedValue8Benchmark.java | 30 +
.../IgnitePutRandomValueSizeBenchmark.java | 41 +
parent/pom.xml | 5 +-
564 files changed, 19551 insertions(+), 12501 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
index 0000000,962e6b5..7a8fed8
mode 000000,100644..100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
@@@ -1,0 -1,190 +1,183 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ package org.apache.ignite.internal.processors.cache;
+
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.concurrent.Callable;
+ import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+ import org.apache.ignite.cache.CacheAtomicityMode;
+ import org.apache.ignite.cache.CacheMode;
+ import org.apache.ignite.configuration.CacheConfiguration;
+ import org.apache.ignite.configuration.IgniteConfiguration;
+ import org.apache.ignite.configuration.NearCacheConfiguration;
+ import org.apache.ignite.events.Event;
+ import org.apache.ignite.internal.IgniteInternalFuture;
+ import org.apache.ignite.internal.util.typedef.P1;
+ import org.apache.ignite.lang.IgnitePredicate;
+ import org.apache.ignite.testframework.GridTestUtils;
+ import org.jetbrains.annotations.NotNull;
+
+ import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCOVERY_HISTORY_SIZE;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+ import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
+ import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
+ import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
+ import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
+
+ /**
+ * Test discovery history overflow.
+ */
+ public class PartitionsExchangeOnDiscoveryHistoryOverflowTest extends IgniteCacheAbstractTest {
+ /** */
+ private static final int CACHES_COUNT = 50;
+
+ /** */
+ private static final int DISCOVERY_HISTORY_SIZE = 10;
+
+ /** */
+ private static String histSize;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ histSize = System.getProperty(IGNITE_DISCOVERY_HISTORY_SIZE);
+
+ System.setProperty(IGNITE_DISCOVERY_HISTORY_SIZE, String.valueOf(DISCOVERY_HISTORY_SIZE));
+
+ super.beforeTestsStarted();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ if (histSize != null)
+ System.setProperty(IGNITE_DISCOVERY_HISTORY_SIZE, histSize);
+ else
+ System.getProperties().remove(IGNITE_DISCOVERY_HISTORY_SIZE);
+
+ super.afterTestsStopped();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 4;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return PARTITIONED;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return ATOMIC;
+ }
+
+ /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
+ @Override protected NearCacheConfiguration nearConfiguration() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ Map<IgnitePredicate<? extends Event>, int[]> map = new HashMap<>();
+
+ // To make partitions exchanges longer.
+ map.put(new P1<Event>() {
+ @Override public boolean apply(Event evt) {
+ try {
+ Thread.sleep(10);
+ }
+ catch (InterruptedException e) {
+ // No op.
+ }
+
+ return false;
+ }
+ }, new int[]{EVT_NODE_JOINED, EVT_NODE_FAILED, EVT_NODE_LEFT, EVT_DISCOVERY_CUSTOM_EVT});
+
+ cfg.setLocalEventListeners(map);
+
+ return cfg;
+ }
+
+ /**
+ * @throws Exception In case of error.
+ */
+ public void testDynamicCacheCreation() throws Exception {
+ for (int iter = 0; iter < 5; iter++) {
+ log.info("Iteration: " + iter);
+
+ IgniteInternalFuture[] futs = new IgniteInternalFuture[CACHES_COUNT];
+
+ for (int i = 0; i < CACHES_COUNT; i ++) {
+ final int cacheIdx = i;
+
+ final int gridIdx = cacheIdx % gridCount();
+
+ futs[i] = GridTestUtils.runAsync(new Callable<IgniteCache>() {
+ @Override public IgniteCache call() throws Exception {
+ return grid(gridIdx).createCache(cacheConfiguration(gridIdx, cacheIdx));
+ }
+ });
+ }
+
+ for (IgniteInternalFuture fut : futs) {
+ assertNotNull(fut);
+
+ fut.get();
+ }
+
+ for (int i = 0; i < CACHES_COUNT; i ++) {
+ final int cacheIdx = i;
+
+ final int gridIdx = cacheIdx % gridCount();
+
+ futs[i] = GridTestUtils.runAsync(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ grid(gridIdx).destroyCache(cacheConfiguration(gridIdx, cacheIdx).getName());
+
+ return null;
+ }
+ });
+ }
+
+ for (IgniteInternalFuture fut : futs) {
+ assertNotNull(fut);
+
+ fut.get();
+ }
+ }
+ }
+
+ /**
+ * @param gridIdx Grid index.
+ * @param cacheIdx Cache index.
+ * @return Newly created cache configuration.
+ * @throws Exception In case of error.
+ */
+ @NotNull private CacheConfiguration cacheConfiguration(int gridIdx, int cacheIdx) throws Exception {
+ CacheConfiguration cfg = cacheConfiguration(getTestGridName(gridIdx));
+
+ cfg.setName("dynamic-cache-" + cacheIdx);
+
+ return cfg;
+ }
+ }
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug
----------------------------------------------------------------------
diff --cc modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug
index 0000000,6458fbb..92bc8ab
mode 000000,100644..100644
--- a/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug
@@@ -1,0 -1,65 +1,54 @@@
+ //-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ include /app/helpers/jade/mixins
+
+ -var form = 'concurrency'
+ -var model = 'backupItem'
+
+ .panel.panel-default(ng-form=form novalidate)
+ .panel-heading(bs-collapse-toggle='' ng-click=`ui.loadPanel('${form}')`)
+ ignite-form-panel-chevron
+ label Concurrency control
+ ignite-form-field-tooltip.tipLabel
+ | Cache concurrent asynchronous operations settings
+ ignite-form-revert
+ .panel-collapse(role='tabpanel' bs-collapse-target id=`${form}`)
+ .panel-body(ng-if=`ui.isPanelLoaded('${form}')`)
+ .col-sm-6
+ .settings-row
+ +number('Max async operations:', `${model}.maxConcurrentAsyncOperations`, '"maxConcurrentAsyncOperations"', 'true', '500', '0',
+ 'Maximum number of allowed concurrent asynchronous operations<br/>\
+ If <b>0</b> then number of concurrent asynchronous operations is unlimited')
+ .settings-row
+ +number('Default lock timeout:', `${model}.defaultLockTimeout`, '"defaultLockTimeout"', 'true', '0', '0',
+ 'Default lock acquisition timeout in milliseconds<br/>\
+ If <b>0</b> then lock acquisition will never timeout')
- .settings-row(ng-hide=`${model}.atomicityMode === 'TRANSACTIONAL'`)
- +dropdown('Entry versioning:', `${model}.atomicWriteOrderMode`, '"atomicWriteOrderMode"', 'true', 'Choose versioning',
- '[\
- {value: "CLOCK", label: "CLOCK"},\
- {value: "PRIMARY", label: "PRIMARY"}\
- ]',
- 'Write ordering mode determines which node assigns the write version, sender or the primary node\
- <ul>\
- <li>CLOCK - in this mode write versions are assigned on a sender node which generally leads to better performance</li>\
- <li>PRIMARY - in this mode version is assigned only on primary node. This means that sender will only send write request to primary node, which in turn will assign write version and forward it to backups</li>\
- </ul>')
+ .settings-row
+ +dropdown('Write synchronization mode:', `${model}.writeSynchronizationMode`, '"writeSynchronizationMode"', 'true', 'PRIMARY_SYNC',
+ '[\
+ {value: "FULL_SYNC", label: "FULL_SYNC"},\
+ {value: "FULL_ASYNC", label: "FULL_ASYNC"},\
+ {value: "PRIMARY_SYNC", label: "PRIMARY_SYNC"}\
+ ]',
+ 'Write synchronization mode\
+ <ul>\
+ <li>FULL_SYNC - Ignite will wait for write or commit replies from all nodes</li>\
+ <li>FULL_ASYNC - Ignite will not wait for write or commit responses from participating nodes</li>\
+ <li>PRIMARY_SYNC - Makes sense for PARTITIONED mode. Ignite will wait for write or commit to complete on primary node</li>\
+ </ul>')
+ .col-sm-6
+ +preview-xml-java(model, 'cacheConcurrency')
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db3b40c/modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug
----------------------------------------------------------------------
diff --cc modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug
index 0000000,da781ba..1645a60
mode 000000,100644..100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/time.pug
@@@ -1,0 -1,47 +1,39 @@@
+ //-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ include /app/helpers/jade/mixins
+
+ -var form = 'time'
+ -var model = 'backupItem'
+
+ .panel.panel-default(ng-form=form novalidate)
+ .panel-heading(bs-collapse-toggle ng-click=`ui.loadPanel('${form}')`)
+ ignite-form-panel-chevron
+ label Time configuration
+ ignite-form-field-tooltip.tipLabel
+ | Time settings for CLOCK write ordering mode
+ ignite-form-revert
+ .panel-collapse(role='tabpanel' bs-collapse-target id=`${form}`)
+ .panel-body(ng-if=`ui.isPanelLoaded('${form}')`)
+ .col-sm-6
+ .settings-row
- +number('Samples size:', `${model}.clockSyncSamples`, '"clockSyncSamples"', 'true', '8', '0',
- 'Number of samples used to synchronize clocks between different nodes<br/>\
- Clock synchronization is used for cache version assignment in CLOCK order mode')
- .settings-row
- +number('Frequency:', `${model}.clockSyncFrequency`, '"clockSyncFrequency"', 'true', '120000', '0',
- 'Frequency at which clock is synchronized between nodes, in milliseconds<br/>\
- Clock synchronization is used for cache version assignment in CLOCK order mode')
- .settings-row
- +number-min-max('Port base:', `${model}.timeServerPortBase`, '"timeServerPortBase"', 'true', '31100', '0', '65535',
++ +number-min-max('Port base:', model + '.timeServerPortBase', '"timeServerPortBase"', 'true', '31100', '0', '65535',
+ 'Time server provides clock synchronization between nodes<br/>\
+ Base UPD port number for grid time server. Time server will be started on one of free ports in range')
+ .settings-row
+ +number('Port range:', `${model}.timeServerPortRange`, '"timeServerPortRange"', 'true', '100', '1', 'Time server port range')
+ .col-sm-6
+ +preview-xml-java(model, 'clusterTime')
[13/39] ignite git commit: Remove CacheAtomicWriteOrderMode.java and
refactoring core module.
Posted by ag...@apache.org.
Remove CacheAtomicWriteOrderMode.java and refactoring core module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72c15e59
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72c15e59
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72c15e59
Branch: refs/heads/ignite-4587
Commit: 72c15e5974fa253b919d001677e98a87ed219991
Parents: 8a96fdf
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 1 16:01:35 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 1 16:01:35 2017 +0300
----------------------------------------------------------------------
.../ignite/cache/CacheAtomicWriteOrderMode.java | 48 -----------
.../configuration/CacheConfiguration.java | 28 -------
.../processors/cache/GridCacheMapEntry.java | 5 +-
.../processors/cache/GridCacheProcessor.java | 11 ---
.../datastructures/DataStructuresProcessor.java | 2 -
.../utils/PlatformConfigurationUtils.java | 3 -
.../visor/cache/VisorCacheConfiguration.java | 12 ---
.../ignite/startup/BasicWarmupClosure.java | 1 -
.../resources/META-INF/classnames.properties | 1 -
.../IgniteClientReconnectCacheTest.java | 86 +++++++++-----------
.../CacheAtomicSingleMessageCountSelfTest.java | 2 -
.../cache/CacheEnumOperationsAbstractTest.java | 2 -
...torPartitionCounterRandomOperationsTest.java | 2 -
.../CacheStoreUsageMultinodeAbstractTest.java | 2 -
.../EntryVersionConsistencyReadThroughTest.java | 2 -
.../GridCacheAbstractLocalStoreSelfTest.java | 16 +---
.../GridCacheAbstractRemoveFailureTest.java | 9 --
.../GridCacheAtomicMessageCountSelfTest.java | 15 +---
.../cache/GridCacheEntryVersionSelfTest.java | 2 -
.../cache/GridCacheIncrementTransformTest.java | 2 -
.../GridCacheInterceptorAbstractSelfTest.java | 19 +----
...erceptorAtomicPrimaryWriteOrderSelfTest.java | 8 --
...omicReplicatedPrimaryWriteOrderSelfTest.java | 8 --
...acheInterceptorAtomicReplicatedSelfTest.java | 8 --
.../GridCacheInterceptorAtomicSelfTest.java | 8 --
...GridCacheInterceptorLocalAtomicSelfTest.java | 8 --
...HeapMultiThreadedUpdateAbstractSelfTest.java | 2 -
.../GridCacheOffHeapTieredAbstractSelfTest.java | 3 -
...heOffHeapTieredEvictionAbstractSelfTest.java | 3 -
.../GridCacheReturnValueTransferSelfTest.java | 15 +---
...ridCacheStoreManagerDeserializationTest.java | 10 ---
...idCacheValueConsistencyAbstractSelfTest.java | 10 ---
.../cache/GridCacheVersionMultinodeTest.java | 15 ----
.../GridCacheVersionTopologyChangeTest.java | 2 -
.../cache/IgniteCacheAbstractTest.java | 14 ----
.../cache/IgniteCacheAtomicInvokeTest.java | 7 --
.../cache/IgniteCacheAtomicPeekModesTest.java | 7 --
...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 7 --
...heAtomicPrimaryWriteOrderStoreValueTest.java | 8 --
.../cache/IgniteCacheAtomicStoreValueTest.java | 7 --
.../IgniteCacheEntryListenerAtomicTest.java | 7 --
...niteCacheEntryListenerExpiredEventsTest.java | 2 -
.../IgniteCacheEntryProcessorCallTest.java | 3 -
...gniteCacheInvokeReadThroughAbstractTest.java | 2 -
.../IgniteCacheP2pUnmarshallingErrorTest.java | 6 --
.../IgniteCacheReadThroughStoreCallTest.java | 2 -
.../cache/IgniteCacheTxPeekModesTest.java | 7 --
.../cache/IgniteExchangeFutureHistoryTest.java | 6 --
...logyValidatorPartitionedAtomicCacheTest.java | 7 --
...ologyValidatorReplicatedAtomicCacheTest.java | 7 --
.../IgniteCacheAtomicExecutionContextTest.java | 7 --
...iteCachePartitionedExecutionContextTest.java | 7 --
...niteCacheReplicatedExecutionContextTest.java | 7 --
.../IgniteCacheTxExecutionContextTest.java | 7 --
...CacheAtomicNearUpdateTopologyChangeTest.java | 7 --
.../CacheLateAffinityAssignmentTest.java | 2 -
...NearDisabledAtomicInvokeRestartSelfTest.java | 6 --
...dCacheMultithreadedFailoverAbstractTest.java | 15 +---
...chePartitionedReloadAllAbstractSelfTest.java | 11 ---
.../GridCacheTransformEventSelfTest.java | 2 -
.../IgniteCacheAtomicNodeJoinTest.java | 6 --
...niteCacheClientNodeChangingTopologyTest.java | 49 ++++-------
.../IgniteCacheMessageRecoveryAbstractTest.java | 2 -
...tPartitionedOnlyByteArrayValuesSelfTest.java | 4 -
.../dht/GridCacheAtomicFullApiSelfTest.java | 11 ---
.../dht/GridCacheAtomicNearCacheSelfTest.java | 17 +---
...eAtomicPrimaryWriteOrderFullApiSelfTest.java | 8 --
...tomicPrimaryWriteOrderReloadAllSelfTest.java | 8 --
.../GridCacheDhtAtomicRemoveFailureTest.java | 7 --
.../dht/IgniteCacheConcurrentPutGetRemove.java | 2 -
...artitionedBackupNodeFailureRecoveryTest.java | 7 --
.../IgniteCachePutRetryAbstractSelfTest.java | 15 ----
.../atomic/GridCacheAtomicFailoverSelfTest.java | 3 -
...eAtomicInvalidPartitionHandlingSelfTest.java | 23 ++----
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 4 -
...tomicPrimaryWriteOrderRemoveFailureTest.java | 7 --
.../GridCacheAtomicRemoveFailureTest.java | 7 --
...micPrimaryWriteOrderNearEnabledSelfTest.java | 8 --
...sistencyAtomicPrimaryWriteOrderSelfTest.java | 8 --
...PutRetryAtomicPrimaryWriteOrderSelfTest.java | 7 --
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 10 ---
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 11 ---
.../GridCacheAtomicNearRemoveFailureTest.java | 7 --
.../GridCacheAtomicOffHeapFullApiSelfTest.java | 11 ---
...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 11 ---
...idCacheAtomicPartitionedMetricsSelfTest.java | 2 -
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 8 --
...rderMultiNodeP2PDisabledFullApiSelfTest.java | 8 --
...cPrimaryWriteOrderNearRemoveFailureTest.java | 7 --
...PrimaryWriteOrderOffHeapFullApiSelfTest.java | 8 --
...ityOrderOffHeapMultiNodeFullApiSelfTest.java | 8 --
.../near/GridCacheNearEvictionSelfTest.java | 2 -
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 -
.../near/NearCacheSyncUpdateTest.java | 17 ++--
.../GridCacheRebalancingOrderingTest.java | 2 -
...cheRebalancingPartitionDistributionTest.java | 2 -
...ridCacheAtomicReplicatedMetricsSelfTest.java | 2 -
...eplicatedAtomicMultiNodeFullApiSelfTest.java | 11 ---
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 8 --
.../IgniteCacheAtomicExpiryPolicyTest.java | 7 --
...iteCacheAtomicExpiryPolicyWithStoreTest.java | 7 --
...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 8 --
.../IgniteCacheExpiryPolicyAbstractTest.java | 13 ++-
.../IgniteCacheAtomicLoadAllTest.java | 7 --
.../IgniteCacheAtomicLoaderWriterTest.java | 7 --
...gniteCacheAtomicNoLoadPreviousValueTest.java | 7 --
.../IgniteCacheAtomicNoReadThroughTest.java | 7 --
.../IgniteCacheAtomicNoWriteThroughTest.java | 7 --
.../IgniteCacheAtomicStoreSessionTest.java | 7 --
...eCacheAtomicStoreSessionWriteBehindTest.java | 7 --
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 8 --
.../GridCacheAtomicLocalMetricsSelfTest.java | 2 -
.../GridCacheSwapScanQueryAbstractSelfTest.java | 3 -
...FailoverAtomicPrimaryWriteOrderSelfTest.java | 7 --
...eContinuousQueryAsyncFilterListenerTest.java | 2 -
...acheContinuousQueryExecuteInPrimaryTest.java | 2 -
...ContinuousQueryFailoverAbstractSelfTest.java | 10 ---
...ryFailoverAtomicNearEnabledSelfSelfTest.java | 7 --
...FailoverAtomicPrimaryWriteOrderSelfTest.java | 8 --
...usQueryFailoverAtomicReplicatedSelfTest.java | 7 --
...ontinuousQueryOperationFromCallbackTest.java | 2 -
.../CacheContinuousQueryOperationP2PTest.java | 2 -
.../CacheContinuousQueryOrderingEventTest.java | 2 -
...acheContinuousQueryRandomOperationsTest.java | 2 -
.../CacheKeepBinaryIterationTest.java | 2 -
...teCacheClientWriteBehindStoreAtomicTest.java | 7 --
.../DataStreamerUpdateAfterLoadTest.java | 13 +--
.../ServicePredicateAccessCacheTest.java | 4 +-
.../configvariations/ConfigVariations.java | 3 -
.../testframework/junits/GridAbstractTest.java | 2 -
.../junits/common/GridCommonAbstractTest.java | 1 -
131 files changed, 95 insertions(+), 965 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
deleted file mode 100644
index 2595d29..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicWriteOrderMode.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache;
-
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Cache write ordering mode. This enumeration is taken into account only in {@link CacheAtomicityMode#ATOMIC}
- * atomicity mode. Write ordering mode determines which node assigns the write version, sender or the primary node.
- * <p>
- * For example, {@link #PRIMARY} mode would only send request to primary node, which in turn will assign write version
- * and forward it to backups.
- */
-public enum CacheAtomicWriteOrderMode {
- /**
- * Cache version is assigned only on primary node. This means that sender will only send write request
- * to primary node, which in turn will assign write version and forward it to backups.
- */
- PRIMARY;
-
- /** Enumerated values. */
- private static final CacheAtomicWriteOrderMode[] VALS = values();
-
- /**
- * Efficiently gets enumerated value from its ordinal.
- *
- * @param ord Ordinal value.
- * @return Enumerated value or {@code null} if ordinal out of range.
- */
- @Nullable public static CacheAtomicWriteOrderMode fromOrdinal(byte ord) {
- return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 0656dda..c65bcc0 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -42,7 +42,6 @@ import javax.cache.configuration.MutableConfiguration;
import javax.cache.expiry.ExpiryPolicy;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.CacheInterceptor;
@@ -293,9 +292,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Cache atomicity mode. */
private CacheAtomicityMode atomicityMode;
- /** Write ordering mode. */
- private CacheAtomicWriteOrderMode atomicWriteOrderMode;
-
/** Number of backups for cache. */
private int backups = DFLT_BACKUPS;
@@ -442,7 +438,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
aff = cc.getAffinity();
affMapper = cc.getAffinityMapper();
atomicityMode = cc.getAtomicityMode();
- atomicWriteOrderMode = cc.getAtomicWriteOrderMode();
backups = cc.getBackups();
cacheLoaderFactory = cc.getCacheLoaderFactory();
cacheMode = cc.getCacheMode();
@@ -1044,29 +1039,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Gets cache write ordering mode. This property can be enabled only for {@link CacheAtomicityMode#ATOMIC}
- * cache (for other atomicity modes it will be ignored).
- *
- * @return Cache write ordering mode.
- */
- public CacheAtomicWriteOrderMode getAtomicWriteOrderMode() {
- return atomicWriteOrderMode;
- }
-
- /**
- * Sets cache write ordering mode. This property can be enabled only for {@link CacheAtomicityMode#ATOMIC}
- * cache (for other atomicity modes it will be ignored).
- *
- * @param atomicWriteOrderMode Cache write ordering mode.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setAtomicWriteOrderMode(CacheAtomicWriteOrderMode atomicWriteOrderMode) {
- this.atomicWriteOrderMode = atomicWriteOrderMode;
-
- return this;
- }
-
- /**
* Gets number of nodes used to back up single partition for {@link CacheMode#PARTITIONED} cache.
* <p>
* If not set, default value is {@link #DFLT_BACKUPS}.
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 942ae21..c33b60d 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
@@ -34,7 +34,6 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.eviction.EvictableEntry;
import org.apache.ignite.internal.binary.BinaryObjectOffheapImpl;
@@ -2157,7 +2156,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
assert conflictCtx != null;
- boolean ignoreTime = cctx.config().getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.PRIMARY;
+ boolean ignoreTime = true;
// Use old value?
if (conflictCtx.isUseOld()) {
@@ -2213,7 +2212,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
conflictVer = null;
}
- boolean ignoreTime = cctx.config().getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.PRIMARY;
+ boolean ignoreTime = true;
// Perform version check only in case there was no explicit conflict resolution.
if (conflictCtx == null) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index f1aa7f2..0dc85a9 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -43,7 +43,6 @@ import javax.management.JMException;
import javax.management.MBeanServer;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheExistsException;
import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
@@ -285,16 +284,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
assert cfg.getWriteSynchronizationMode() != null;
- if (cfg.getAtomicityMode() == ATOMIC) {
- if (cfg.getAtomicWriteOrderMode() == null) {
- cfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY);
-
- U.warn(log, "Automatically set write order mode to PRIMARY for better performance " +
- "[writeSynchronizationMode=" + cfg.getWriteSynchronizationMode() + ", " +
- "cacheName=" + U.maskName(cfg.getName()) + ']');
- }
- }
-
if (cfg.getCacheStoreFactory() == null) {
Factory<CacheLoader> ldrFactory = cfg.getCacheLoaderFactory();
Factory<CacheWriter> writerFactory = cfg.isWriteThrough() ? cfg.getCacheWriterFactory() : null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 1cad22f..71ccd6a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -84,7 +84,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
@@ -919,7 +918,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter {
ccfg.setOffHeapMaxMemory(cfg.getOffHeapMaxMemory());
ccfg.setNodeFilter(cfg.getNodeFilter());
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setRebalanceMode(SYNC);
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index c0fde97..5b5f733 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -23,7 +23,6 @@ import org.apache.ignite.binary.BinaryIdentityResolver;
import org.apache.ignite.binary.BinaryRawReader;
import org.apache.ignite.binary.BinaryRawWriter;
import org.apache.ignite.binary.BinaryTypeConfiguration;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
@@ -136,7 +135,6 @@ public class PlatformConfigurationUtils {
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setAtomicityMode(CacheAtomicityMode.fromOrdinal(in.readInt()));
- ccfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.fromOrdinal((byte)in.readInt()));
ccfg.setBackups(in.readInt());
ccfg.setCacheMode(CacheMode.fromOrdinal(in.readInt()));
ccfg.setCopyOnRead(in.readBoolean());
@@ -761,7 +759,6 @@ public class PlatformConfigurationUtils {
assert ccfg != null;
writeEnumInt(writer, ccfg.getAtomicityMode(), CacheConfiguration.DFLT_CACHE_ATOMICITY_MODE);
- writeEnumInt(writer, ccfg.getAtomicWriteOrderMode());
writer.writeInt(ccfg.getBackups());
writeEnumInt(writer, ccfg.getCacheMode(), CacheConfiguration.DFLT_CACHE_MODE);
writer.writeBoolean(ccfg.isCopyOnRead());
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 869a12c..848ca8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.cache;
import java.io.Serializable;
import java.util.Collection;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
@@ -53,9 +52,6 @@ public class VisorCacheConfiguration implements Serializable, LessNamingBean {
/** Cache atomicity mode. */
private CacheAtomicityMode atomicityMode;
- /** Cache atomicity write ordering mode. */
- private CacheAtomicWriteOrderMode atomicWriteOrderMode;
-
/** Eager ttl flag. */
private boolean eagerTtl;
@@ -134,7 +130,6 @@ public class VisorCacheConfiguration implements Serializable, LessNamingBean {
name = ccfg.getName();
mode = ccfg.getCacheMode();
atomicityMode = ccfg.getAtomicityMode();
- atomicWriteOrderMode = ccfg.getAtomicWriteOrderMode();
eagerTtl = ccfg.isEagerTtl();
writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
swapEnabled = ccfg.isSwapEnabled();
@@ -198,13 +193,6 @@ public class VisorCacheConfiguration implements Serializable, LessNamingBean {
}
/**
- * @return Cache atomicity write ordering mode.
- */
- public CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return atomicWriteOrderMode;
- }
-
- /**
* @return Eager ttl flag
*/
public boolean eagerTtl() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
index 270a5c6..659ffbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
@@ -414,7 +414,6 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
F.eq(ccfg0.getCacheMode(), ccfg1.getCacheMode()) &&
F.eq(ccfg0.getBackups(), ccfg1.getBackups()) &&
F.eq(ccfg0.getAtomicityMode(), ccfg1.getAtomicityMode()) &&
- F.eq(ccfg0.getAtomicWriteOrderMode(), ccfg1.getAtomicWriteOrderMode()) &&
F.eq(ccfg0.getMemoryMode(), ccfg1.getMemoryMode());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 212e94a..6cce80a 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -28,7 +28,6 @@ org.apache.ignite.binary.BinaryInvalidTypeException
org.apache.ignite.binary.BinaryObject
org.apache.ignite.binary.BinaryObjectException
org.apache.ignite.cache.CacheAtomicUpdateTimeoutException
-org.apache.ignite.cache.CacheAtomicWriteOrderMode
org.apache.ignite.cache.CacheAtomicityMode
org.apache.ignite.cache.CacheEntryEventSerializableFilter
org.apache.ignite.cache.CacheEntryProcessor
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index d129f4d..67c52de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -38,7 +38,6 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cluster.ClusterGroup;
@@ -74,8 +73,6 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -172,7 +169,6 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setName("nearCache");
- ccfg.setAtomicWriteOrderMode(PRIMARY);
final IgniteCache<Object, Object> nearCache = client.getOrCreateCache(ccfg, new NearCacheConfiguration<>());
@@ -211,7 +207,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
catch (CacheException e) {
log.info("Expected exception: " + e);
- IgniteClientDisconnectedException e0 = (IgniteClientDisconnectedException) e.getCause();
+ IgniteClientDisconnectedException e0 = (IgniteClientDisconnectedException)e.getCause();
e0.reconnectFuture().get();
}
@@ -225,7 +221,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
}));
disconnectLatch.countDown();
- } else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) {
+ }
+ else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) {
info("Reconnected: " + evt);
assertEquals(0, disconnectLatch.getCount());
@@ -340,7 +337,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
tx.commit();
fail();
- } catch (IgniteClientDisconnectedException e) {
+ }
+ catch (IgniteClientDisconnectedException e) {
log.info("Expected error: " + e);
assertNotNull(e.reconnectFuture());
@@ -350,7 +348,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
txs.txStart();
fail();
- } catch (IgniteClientDisconnectedException e) {
+ }
+ catch (IgniteClientDisconnectedException e) {
log.info("Expected error: " + e);
assertNotNull(e.reconnectFuture());
@@ -408,8 +407,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
private void reconnectTransactionInProgress1(IgniteEx client,
final TransactionConcurrency txConcurrency,
final IgniteCache<Object, Object> cache)
- throws Exception
- {
+ throws Exception {
Ignite srv = clientRouter(client);
final TestTcpDiscoverySpi clientSpi = spi(client);
@@ -428,7 +426,8 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
info("Disconnected: " + evt);
disconnectLatch.countDown();
- } else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) {
+ }
+ else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) {
info("Reconnected: " + evt);
reconnectLatch.countDown();
@@ -789,42 +788,34 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
int cnt = 0;
for (CacheAtomicityMode atomicityMode : CacheAtomicityMode.values()) {
- CacheAtomicWriteOrderMode[] writeOrders =
- atomicityMode == ATOMIC ? values() : new CacheAtomicWriteOrderMode[]{PRIMARY};
-
- for (CacheAtomicWriteOrderMode writeOrder : writeOrders) {
- for (CacheWriteSynchronizationMode syncMode : CacheWriteSynchronizationMode.values()) {
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
-
- ccfg.setAtomicityMode(atomicityMode);
+ for (CacheWriteSynchronizationMode syncMode : CacheWriteSynchronizationMode.values()) {
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
- ccfg.setAtomicWriteOrderMode(writeOrder);
+ ccfg.setAtomicityMode(atomicityMode);
- ccfg.setName("cache-" + cnt++);
+ ccfg.setName("cache-" + cnt++);
- ccfg.setWriteSynchronizationMode(syncMode);
+ ccfg.setWriteSynchronizationMode(syncMode);
- if (syncMode != FULL_ASYNC) {
- Class<?> cls = (ccfg.getAtomicityMode() == ATOMIC) ?
- GridNearAtomicUpdateResponse.class : GridNearTxPrepareResponse.class;
+ if (syncMode != FULL_ASYNC) {
+ Class<?> cls = (ccfg.getAtomicityMode() == ATOMIC) ?
+ GridNearAtomicUpdateResponse.class : GridNearTxPrepareResponse.class;
- log.info("Test cache put [atomicity=" + atomicityMode +
- ", writeOrder=" + writeOrder +
- ", syncMode=" + syncMode + ']');
+ log.info("Test cache put [atomicity=" + atomicityMode +
+ ", syncMode=" + syncMode + ']');
- checkOperationInProgressFails(client, ccfg, cls, putOp);
+ checkOperationInProgressFails(client, ccfg, cls, putOp);
- client.destroyCache(ccfg.getName());
- }
+ client.destroyCache(ccfg.getName());
+ }
- log.info("Test cache get [atomicity=" + atomicityMode + ", syncMode=" + syncMode + ']');
+ log.info("Test cache get [atomicity=" + atomicityMode + ", syncMode=" + syncMode + ']');
- checkOperationInProgressFails(client, ccfg, GridNearSingleGetResponse.class, getOp);
+ checkOperationInProgressFails(client, ccfg, GridNearSingleGetResponse.class, getOp);
- checkOperationInProgressFails(client, ccfg, GridNearGetResponse.class, getAllOp);
+ checkOperationInProgressFails(client, ccfg, GridNearGetResponse.class, getAllOp);
- client.destroyCache(ccfg.getName());
- }
+ client.destroyCache(ccfg.getName());
}
}
}
@@ -1123,7 +1114,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
@Override public Void call() throws Exception {
int idx = nodeIdx.incrementAndGet();
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < 25; i++) {
startGrid(idx);
stopGrid(idx);
@@ -1262,27 +1253,32 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
/**
*
*/
- static class TestClass1 implements Serializable {}
+ static class TestClass1 implements Serializable {
+ }
/**
*
*/
- static class TestClass2 implements Serializable {}
+ static class TestClass2 implements Serializable {
+ }
/**
*
*/
- static class TestClass3 implements Serializable {}
+ static class TestClass3 implements Serializable {
+ }
/**
*
*/
- static class TestClass4 implements Serializable {}
+ static class TestClass4 implements Serializable {
+ }
/**
*
*/
- static class TestClass5 implements Serializable {}
+ static class TestClass5 implements Serializable {
+ }
/**
* @param client Client.
@@ -1295,8 +1291,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
final CacheConfiguration<Object, Object> ccfg,
Class<?> msgToBlock,
final IgniteInClosure<IgniteCache<Object, Object>> c)
- throws Exception
- {
+ throws Exception {
Ignite srv = clientRouter(client);
TestTcpDiscoverySpi srvSpi = spi(srv);
@@ -1383,8 +1378,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
String cacheName,
boolean cacheExists,
boolean clientCache,
- boolean clientNear)
- {
+ boolean clientNear) {
GridDiscoveryManager srvDisco = ((IgniteKernal)srv).context().discovery();
GridDiscoveryManager clientDisco = ((IgniteKernal)client).context().discovery();
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
index 8822115..018b695 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
@@ -42,7 +42,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -72,7 +71,6 @@ public class CacheAtomicSingleMessageCountSelfTest extends GridCommonAbstractTes
cCfg.setCacheMode(PARTITIONED);
cCfg.setBackups(1);
cCfg.setWriteSynchronizationMode(FULL_SYNC);
- cCfg.setAtomicWriteOrderMode(PRIMARY);
cfg.setCacheConfiguration(cCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
index 87a9b91..d37348d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
@@ -35,7 +35,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
@@ -283,7 +282,6 @@ public abstract class CacheEnumOperationsAbstractTest extends GridCommonAbstract
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (memoryMode == OFFHEAP_TIERED)
ccfg.setOffHeapMaxMemory(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
index 055374d..3a05c28 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
@@ -61,7 +61,6 @@ import org.jetbrains.annotations.NotNull;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -840,7 +839,6 @@ public class CacheInterceptorPartitionCounterRandomOperationsTest extends GridCo
ccfg.setCacheMode(cacheMode);
ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
if (cacheMode == PARTITIONED)
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
index eaae2f9..68e62a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
@@ -26,7 +26,6 @@ import javax.cache.configuration.Factory;
import javax.cache.integration.CacheLoaderException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.store.CacheStore;
@@ -105,7 +104,6 @@ public abstract class CacheStoreUsageMultinodeAbstractTest extends GridCommonAbs
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(atomicityMode());
- ccfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY);
ccfg.setBackups(1);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
index 4216b5e..a6eae47 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
@@ -40,7 +40,6 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -75,7 +74,6 @@ public class EntryVersionConsistencyReadThroughTest extends GridCommonAbstractTe
cc.setCacheMode(PARTITIONED);
cc.setAtomicityMode(atomicityMode);
- cc.setAtomicWriteOrderMode(PRIMARY);
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setReadThrough(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 26ab625..7dff70d 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
@@ -63,7 +63,6 @@ import org.apache.ignite.transactions.Transaction;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOCAL_STORE_KEEPS_PRIMARY_ONLY;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -104,9 +103,6 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
public static final String BACKUP_CACHE_2 = "backup_2";
/** */
- public static volatile boolean primaryWriteOrderMode = false;
-
- /** */
public static volatile boolean near = false;
/**
@@ -173,9 +169,6 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
cacheCfg.setNearConfiguration(nearConfiguration());
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- if (primaryWriteOrderMode)
- cacheCfg.setAtomicWriteOrderMode(PRIMARY);
-
cacheCfg.setRebalanceMode(SYNC);
if (gridName.endsWith("1"))
@@ -312,14 +305,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
* @throws Exception If failed.
*/
public void testBackupRestorePrimary() throws Exception {
- try {
- primaryWriteOrderMode = true;
-
- testBackupRestore();
- }
- finally {
- primaryWriteOrderMode = false;
- }
+ testBackupRestore();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index cc013bd..8e034d4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -33,7 +33,6 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteTransactions;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -150,13 +149,6 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr
protected abstract NearCacheConfiguration nearCache();
/**
- * @return Atomic cache write order mode.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return null;
- }
-
- /**
* @return {@code True} if test updates from client node.
*/
protected boolean testClientNode() {
@@ -229,7 +221,6 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr
ccfg.setBackups(1);
ccfg.setAtomicityMode(atomicityMode());
- ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
ccfg.setNearConfiguration(nearCache());
GridTestUtils.setMemoryMode(null, ccfg, memMode, 100, 1024);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 d70d93d..315cb20 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
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.IgniteException;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -40,7 +39,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -57,9 +55,6 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
/** Client mode flag. */
private boolean client;
- /** Write sync mode. */
- private CacheAtomicWriteOrderMode writeOrderMode;
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -76,7 +71,6 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
cCfg.setCacheMode(PARTITIONED);
cCfg.setBackups(1);
cCfg.setWriteSynchronizationMode(FULL_SYNC);
- cCfg.setAtomicWriteOrderMode(writeOrderMode);
if (idx == 0 && client)
cfg.setClientMode(true);
@@ -94,26 +88,23 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
public void testPartitionedPrimary() throws Exception {
- checkMessages(false, PRIMARY);
+ checkMessages(false);
}
/**
* @throws Exception If failed.
*/
public void testClientPrimary() throws Exception {
- checkMessages(true, PRIMARY);
+ checkMessages(true);
}
/**
* @param clientMode Client mode flag.
- * @param orderMode Write ordering mode.
* @throws Exception If failed.
*/
- protected void checkMessages(boolean clientMode,
- CacheAtomicWriteOrderMode orderMode) throws Exception {
+ protected void checkMessages(boolean clientMode) throws Exception {
client = clientMode;
- writeOrderMode = orderMode;
startGrids(4);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
index ad37e17..60faf76 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
@@ -29,7 +29,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -57,7 +56,6 @@ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest {
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setCacheMode(PARTITIONED);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setBackups(1);
ccfg.setAtomicityMode(atomicityMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
index a3d2dde..5625038 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
@@ -36,7 +36,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -66,7 +65,6 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest {
cache.setCacheMode(PARTITIONED);
cache.setAtomicityMode(ATOMIC);
- cache.setAtomicWriteOrderMode(PRIMARY);
cache.setWriteSynchronizationMode(FULL_SYNC);
cache.setBackups(1);
cache.setRebalanceMode(SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/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 68bfb6f..0904fab 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
@@ -29,7 +29,6 @@ import javax.cache.Cache;
import javax.cache.processor.EntryProcessor;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheEntry;
import org.apache.ignite.cache.CacheInterceptor;
import org.apache.ignite.cache.CacheMode;
@@ -47,7 +46,6 @@ import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -116,12 +114,6 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
ccfg.setInterceptor(interceptor);
- if (ccfg.getAtomicityMode() == ATOMIC) {
- assertNotNull(writeOrderMode());
-
- ccfg.setAtomicWriteOrderMode(writeOrderMode());
- }
-
if (!storeEnabled()) {
ccfg.setCacheStoreFactory(null);
ccfg.setReadThrough(false);
@@ -137,13 +129,6 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
}
/**
- * @return Atomic cache write order mode.
- */
- @Nullable protected CacheAtomicWriteOrderMode writeOrderMode() {
- return null;
- }
-
- /**
* @return {@code True} if cache store is enabled.
*/
protected boolean storeEnabled() {
@@ -465,7 +450,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
return dataNodes + (storeEnabled() ? 1 : 0); // One call before store is updated.
else {
// If update goes through primary node and it is cancelled then backups aren't updated.
- return (writeOrderMode() == PRIMARY || op == Operation.TRANSFORM) ? 1 : dataNodes;
+ return op == Operation.TRANSFORM ? 1 : dataNodes;
}
}
@@ -480,7 +465,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst
// Update + after update + one call before store is updated.
return dataNodes * 2 + (storeEnabled() ? 1 : 0);
else
- return (writeOrderMode() == PRIMARY || op == Operation.TRANSFORM) ? 2 : dataNodes * 2;
+ return op == Operation.TRANSFORM ? 2 : dataNodes * 2;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
index 04f18a78c..e4ba56b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest.java
@@ -17,13 +17,10 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheInterceptor;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -39,9 +36,4 @@ public class GridCacheInterceptorAtomicPrimaryWriteOrderSelfTest extends GridCac
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
index 28a080c..662dd91 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest.java
@@ -17,12 +17,9 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
-import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -40,9 +37,4 @@ public class GridCacheInterceptorAtomicReplicatedPrimaryWriteOrderSelfTest
@Override protected CacheMode cacheMode() {
return REPLICATED;
}
-
- /** {@inheritDoc} */
- @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java
index 59ee339..24bc342 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java
@@ -17,12 +17,9 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
-import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -39,9 +36,4 @@ public class GridCacheInterceptorAtomicReplicatedSelfTest extends GridCacheInter
@Override protected CacheMode cacheMode() {
return REPLICATED;
}
-
- /** {@inheritDoc} */
- @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java
index 80f30fb..de3847e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java
@@ -17,13 +17,10 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheInterceptor;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -39,9 +36,4 @@ public class GridCacheInterceptorAtomicSelfTest extends GridCacheInterceptorAbst
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java
index a9a0f0e..f12c92e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java
@@ -17,12 +17,9 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
-import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -36,11 +33,6 @@ public class GridCacheInterceptorLocalAtomicSelfTest extends GridCacheIntercepto
}
/** {@inheritDoc} */
- @Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected int gridCount() {
return 1;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
index 5802b12..e378504 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.testframework.GridTestUtils;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -56,7 +55,6 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
ccfg.setMemoryMode(OFFHEAP_TIERED);
ccfg.setOffHeapMaxMemory(1024 * 1024);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
index 23d248d..ff7a09c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
@@ -37,7 +37,6 @@ import org.apache.ignite.transactions.TransactionConcurrency;
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -74,8 +73,6 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
-
ccfg.setMemoryMode(OFFHEAP_TIERED);
ccfg.setOffHeapMaxMemory(1024 * 1024);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
index cd82739..fc41112 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
@@ -31,7 +31,6 @@ import org.apache.ignite.internal.util.typedef.P1;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.testframework.GridTestUtils;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -65,8 +64,6 @@ public abstract class GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
-
ccfg.setMemoryMode(OFFHEAP_TIERED);
ccfg.setNearConfiguration(null);
ccfg.setOffHeapMaxMemory(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index 4e1a47c..8a43879 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -27,14 +27,12 @@ import java.util.Set;
import javax.cache.processor.EntryProcessor;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -48,9 +46,6 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
/** Atomicity mode. */
private CacheAtomicityMode atomicityMode;
- /** Atomic write order mode. */
- private CacheAtomicWriteOrderMode writeOrderMode;
-
/** Number of backups. */
private int backups;
@@ -66,7 +61,6 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
ccfg.setBackups(backups);
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(atomicityMode);
- ccfg.setAtomicWriteOrderMode(writeOrderMode);
cfg.setCacheConfiguration(ccfg);
@@ -86,7 +80,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
// Test works too long and fails.
fail("https://issues.apache.org/jira/browse/IGNITE-581");
- checkTransform(TRANSACTIONAL, PRIMARY, 0);
+ checkTransform(TRANSACTIONAL, 0);
}
/**
@@ -97,24 +91,21 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest
// Test works too long and fails.
fail("https://issues.apache.org/jira/browse/IGNITE-581");
- checkTransform(TRANSACTIONAL, PRIMARY, 1);
+ checkTransform(TRANSACTIONAL, 1);
}
/**
* @param mode Atomicity mode.
- * @param order Atomic cache write order mode.
* @param b Number of backups.
* @throws Exception If failed.
*/
- private void checkTransform(CacheAtomicityMode mode, CacheAtomicWriteOrderMode order, int b)
+ private void checkTransform(CacheAtomicityMode mode, int b)
throws Exception {
try {
atomicityMode = mode;
backups = b;
- writeOrderMode = order;
-
cache = true;
startGrids(2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
index 39ce33d..0e1561e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
@@ -27,7 +27,6 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
@@ -45,7 +44,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jsr166.ConcurrentHashMap8;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -76,13 +74,6 @@ public class GridCacheStoreManagerDeserializationTest extends GridCommonAbstract
}
/**
- * @return Cache write order mode.
- */
- private CacheAtomicWriteOrderMode cacheAtomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /**
* @return Cache synchronization mode.
*/
private CacheWriteSynchronizationMode cacheWriteSynchronizationMode() {
@@ -127,7 +118,6 @@ public class GridCacheStoreManagerDeserializationTest extends GridCommonAbstract
cc.setStoreKeepBinary(true);
cc.setCacheMode(cacheMode());
- cc.setAtomicWriteOrderMode(cacheAtomicWriteOrderMode());
cc.setWriteSynchronizationMode(cacheWriteSynchronizationMode());
cc.setBackups(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index 6129505..d61ad39 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cluster.ClusterNode;
@@ -33,7 +32,6 @@ import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.util.typedef.F;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -64,7 +62,6 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
cCfg.setCacheMode(PARTITIONED);
cCfg.setAtomicityMode(atomicityMode());
- cCfg.setAtomicWriteOrderMode(writeOrderMode());
cCfg.setNearConfiguration(nearConfiguration());
cCfg.setRebalanceMode(SYNC);
cCfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -98,13 +95,6 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
}
/**
- * @return Atomic write order mode.
- */
- protected CacheAtomicWriteOrderMode writeOrderMode() {
- return PRIMARY;
- }
-
- /**
* @return Consistency test iteration count.
*/
protected abstract int iterationCount();
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java
index 6ff540f..d639b43 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -32,7 +31,6 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -48,9 +46,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest {
private CacheAtomicityMode atomicityMode;
/** */
- private CacheAtomicWriteOrderMode atomicWriteOrder;
-
- /** */
private boolean near;
/** {@inheritDoc} */
@@ -66,12 +61,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest {
ccfg.setAtomicityMode(atomicityMode);
- if (atomicityMode == null) {
- assert atomicWriteOrder != null;
-
- ccfg.setAtomicWriteOrderMode(atomicWriteOrder);
- }
-
ccfg.setNearConfiguration(near ? new NearCacheConfiguration() : null);
return ccfg;
@@ -123,8 +112,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest {
public void testVersionAtomicPrimary() throws Exception {
atomicityMode = ATOMIC;
- atomicWriteOrder = PRIMARY;
-
checkVersion();
}
@@ -134,8 +121,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest {
public void testVersionAtomicPrimaryNearEnabled() throws Exception {
atomicityMode = ATOMIC;
- atomicWriteOrder = PRIMARY;
-
near = true;
checkVersion();
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java
index 3e80525..20bcf6c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java
@@ -38,7 +38,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -238,7 +237,6 @@ public class GridCacheVersionTopologyChangeTest extends GridCommonAbstractTest {
ccfg.setName(name);
ccfg.setAtomicityMode(atomicityMode);
ccfg.setAffinity(aff);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
index 45b6e9d..73f6404 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
@@ -23,7 +23,6 @@ import javax.cache.configuration.Factory;
import javax.cache.integration.CacheLoader;
import javax.cache.integration.CacheWriter;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
@@ -126,12 +125,6 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
cfg.setCacheMode(cacheMode());
cfg.setAtomicityMode(atomicityMode());
- if (atomicityMode() == ATOMIC && cacheMode() != LOCAL) {
- assert atomicWriteOrderMode() != null;
-
- cfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
- }
-
cfg.setWriteSynchronizationMode(writeSynchronization());
cfg.setNearConfiguration(nearConfiguration());
@@ -192,13 +185,6 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
protected abstract CacheAtomicityMode atomicityMode();
/**
- * @return Atomic cache write order mode.
- */
- protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return null;
- }
-
- /**
* @return Partitioned mode.
*/
protected abstract NearCacheConfiguration nearConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java
index 379952b..cb05da4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java
@@ -17,12 +17,10 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -46,11 +44,6 @@ public class IgniteCacheAtomicInvokeTest extends IgniteCacheInvokeAbstractTest {
}
/** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
-
- /** {@inheritDoc} */
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/72c15e59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPeekModesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPeekModesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPeekModesTest.java
index 8b7859a..e8eda9a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPeekModesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPeekModesTest.java
@@ -17,11 +17,9 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -43,9 +41,4 @@ public class IgniteCacheAtomicPeekModesTest extends IgniteCachePeekModesAbstract
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
[20/39] ignite git commit: Delete write order mode in dotnet platform.
Posted by ag...@apache.org.
Delete write order mode in dotnet platform.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59af0367
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59af0367
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59af0367
Branch: refs/heads/ignite-4587
Commit: 59af0367fe7b74ebb826c1cb57adc8cacf13ee49
Parents: ed3370f
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 1 23:43:19 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 1 23:43:19 2017 +0300
----------------------------------------------------------------------
.../Cache/CacheConfigurationTest.cs | 2 -
.../Config/native-client-test-cache.xml | 3 --
.../IgniteConfigurationSerializerTest.cs | 1 -
.../Apache.Ignite.Core.csproj | 1 -
.../Configuration/CacheAtomicWriteOrderMode.cs | 43 --------------------
.../Cache/Configuration/CacheConfiguration.cs | 7 ----
.../IgniteConfigurationSection.xsd | 12 ------
7 files changed, 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
index aba289a..47d9b57 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
@@ -493,7 +493,6 @@ namespace Apache.Ignite.Core.Tests.Cache
WriteBehindFlushFrequency = TimeSpan.FromSeconds(6),
WriteBehindFlushSize = 7,
EvictSynchronized = true,
- AtomicWriteOrderMode = CacheAtomicWriteOrderMode.Primary,
AtomicityMode = CacheAtomicityMode.Atomic,
Backups = 8,
CacheMode = CacheMode.Partitioned,
@@ -588,7 +587,6 @@ namespace Apache.Ignite.Core.Tests.Cache
WriteBehindFlushFrequency = TimeSpan.FromSeconds(6),
WriteBehindFlushSize = 7,
EvictSynchronized = true,
- AtomicWriteOrderMode = CacheAtomicWriteOrderMode.Primary,
AtomicityMode = CacheAtomicityMode.Transactional,
Backups = 8,
CacheMode = CacheMode.Partitioned,
http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml
index f811823..b514e73 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/native-client-test-cache.xml
@@ -60,7 +60,6 @@
<property name="name" value="partitioned_atomic"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="ATOMIC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
<property name="startSize" value="10"/>
</bean>
@@ -78,7 +77,6 @@
<property name="name" value="partitioned_atomic_near"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="ATOMIC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
<property name="nearConfiguration">
<bean class="org.apache.ignite.configuration.NearCacheConfiguration" />
</property>
@@ -96,7 +94,6 @@
<property name="name" value="replicated_atomic"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="ATOMIC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
<property name="startSize" value="10"/>
</bean>
http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
index 26e04a9..20c0e7d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
@@ -590,7 +590,6 @@ namespace Apache.Ignite.Core.Tests
{
new CacheConfiguration("cacheName")
{
- AtomicWriteOrderMode = CacheAtomicWriteOrderMode.Primary,
AtomicityMode = CacheAtomicityMode.Transactional,
Backups = 15,
CacheMode = CacheMode.Replicated,
http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 673449e..edf630c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -219,7 +219,6 @@
<Compile Include="Compute\IComputeReducer.cs" />
<Compile Include="Compute\IComputeTask.cs" />
<Compile Include="Cache\Configuration\CacheAtomicityMode.cs" />
- <Compile Include="Cache\Configuration\CacheAtomicWriteOrderMode.cs" />
<Compile Include="Cache\Configuration\CacheConfiguration.cs" />
<Compile Include="Cache\Configuration\CacheMemoryMode.cs" />
<Compile Include="Cache\Configuration\CacheMode.cs" />
http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheAtomicWriteOrderMode.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheAtomicWriteOrderMode.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheAtomicWriteOrderMode.cs
deleted file mode 100644
index c9a41e8..0000000
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheAtomicWriteOrderMode.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Apache.Ignite.Core.Cache.Configuration
-{
- /// <summary>
- /// Cache write ordering mode. This enumeration is taken into account only in
- /// <see cref="CacheAtomicityMode.Atomic"/> atomicity mode.
- /// Write ordering mode determines which node assigns the write version, sender or the primary node.
- /// </summary>
- public enum CacheAtomicWriteOrderMode
- {
- /// <summary>
- /// In this mode, write versions are assigned on a sender node which generally leads to better
- /// performance in <see cref="CacheWriteSynchronizationMode.FullSync"/> synchronization mode,
- /// since in this case sender can send write requests to primary and backups at the same time.
- /// <para/>
- /// This mode will be automatically configured only with <see cref="CacheWriteSynchronizationMode.FullSync"/>
- /// write synchronization mode, as for other synchronization modes it does not render better performance.
- /// </summary>
- Clock,
-
- /// <summary>
- /// Cache version is assigned only on primary node. This means that sender will only send write request
- /// to primary node, which in turn will assign write version and forward it to backups.
- /// </summary>
- Primary
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
index 2795111..78de9c9 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
@@ -235,7 +235,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
internal CacheConfiguration(IBinaryRawReader reader)
{
AtomicityMode = (CacheAtomicityMode) reader.ReadInt();
- AtomicWriteOrderMode = (CacheAtomicWriteOrderMode) reader.ReadInt();
Backups = reader.ReadInt();
CacheMode = (CacheMode) reader.ReadInt();
CopyOnRead = reader.ReadBoolean();
@@ -292,7 +291,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
internal void Write(IBinaryRawWriter writer)
{
writer.WriteInt((int) AtomicityMode);
- writer.WriteInt((int) AtomicWriteOrderMode);
writer.WriteInt(Backups);
writer.WriteInt((int) CacheMode);
writer.WriteBoolean(CopyOnRead);
@@ -475,11 +473,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
public CacheAtomicityMode AtomicityMode { get; set; }
/// <summary>
- /// Gets or sets cache write ordering mode.
- /// </summary>
- public CacheAtomicWriteOrderMode AtomicWriteOrderMode { get; set; }
-
- /// <summary>
/// Gets or sets number of nodes used to back up single partition for
/// <see cref="Configuration.CacheMode.Partitioned"/> cache.
/// </summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/59af0367/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
index d54a200..70a8f95 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
@@ -39,13 +39,6 @@
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="cacheAtomicWriteOrderMode" final="restriction">
- <xs:restriction base="xs:string">
- <xs:enumeration value="Clock" />
- <xs:enumeration value="Primary" />
- </xs:restriction>
- </xs:simpleType>
-
<xs:simpleType name="cacheMemoryMode" final="restriction">
<xs:restriction base="xs:string">
<xs:enumeration value="OnheapTiered" />
@@ -594,11 +587,6 @@
<xs:documentation>Cache atomicity mode.</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="atomicWriteOrderMode" type="cacheAtomicWriteOrderMode">
- <xs:annotation>
- <xs:documentation>Cache write ordering mode.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute name="backups" type="xs:int">
<xs:annotation>
<xs:documentation>
[17/39] ignite git commit: Some loose change.
Posted by ag...@apache.org.
Some loose change.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5adaa116
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5adaa116
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5adaa116
Branch: refs/heads/ignite-4587
Commit: 5adaa1160190896b653ad4c5ea1035bc6c86048c
Parents: 3d5c134
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 1 23:41:21 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 1 23:41:21 2017 +0300
----------------------------------------------------------------------
.../hibernate/CacheHibernateBlobStoreNodeRestartTest.java | 8 --------
.../main/java/org/apache/ignite/yardstick/IgniteNode.java | 3 ---
2 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5adaa116/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
index 0c06190..d5496af 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
@@ -17,15 +17,12 @@
package org.apache.ignite.cache.store.hibernate;
-import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.integration.IgniteCacheStoreNodeRestartAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-
public class CacheHibernateBlobStoreNodeRestartTest extends IgniteCacheStoreNodeRestartAbstractTest {
/** {@inheritDoc} */
@Override protected CacheStore getStore() {
@@ -46,9 +43,4 @@ public class CacheHibernateBlobStoreNodeRestartTest extends IgniteCacheStoreNode
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return PRIMARY;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5adaa116/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index 404bd68..8cead04 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -109,9 +109,6 @@ public class IgniteNode implements BenchmarkServer {
cc.setWriteSynchronizationMode(args.syncMode());
- if (args.orderMode() != null)
- cc.setAtomicWriteOrderMode(args.orderMode());
-
cc.setBackups(args.backups());
if (args.restTcpPort() != 0) {
[03/39] ignite git commit: Fix tests CLOCK change to PRIMARY and
delete same test.
Posted by ag...@apache.org.
Fix tests CLOCK change to PRIMARY and delete same test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/25d4ea50
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/25d4ea50
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/25d4ea50
Branch: refs/heads/ignite-4587
Commit: 25d4ea5003773b739baba2c2d5c3e7be2194ba7a
Parents: a37ff76
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 13 12:43:59 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 13 12:43:59 2017 +0300
----------------------------------------------------------------------
.../IgniteClientReconnectCacheTest.java | 3 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 3 +-
.../GridCacheAtomicMessageCountSelfTest.java | 49 ++++----------------
...acheInterceptorAtomicReplicatedSelfTest.java | 4 +-
.../GridCacheInterceptorAtomicSelfTest.java | 4 +-
...GridCacheInterceptorLocalAtomicSelfTest.java | 4 +-
...idCacheValueConsistencyAbstractSelfTest.java | 4 +-
.../cache/GridCacheVersionMultinodeTest.java | 25 ----------
.../cache/IgniteCacheAtomicInvokeTest.java | 4 +-
.../cache/IgniteCacheAtomicStoreValueTest.java | 4 +-
.../IgniteCacheAtomicExecutionContextTest.java | 4 +-
...iteCachePartitionedExecutionContextTest.java | 4 +-
...niteCacheReplicatedExecutionContextTest.java | 4 +-
.../IgniteCacheTxExecutionContextTest.java | 4 +-
...chePartitionedReloadAllAbstractSelfTest.java | 4 +-
...niteCacheClientNodeChangingTopologyTest.java | 45 ------------------
.../dht/GridCacheAtomicFullApiSelfTest.java | 4 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 20 --------
.../GridCacheDhtAtomicRemoveFailureTest.java | 4 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +-
.../atomic/GridCacheAtomicFailoverSelfTest.java | 4 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 43 -----------------
.../GridCacheAtomicRemoveFailureTest.java | 4 +-
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 4 +-
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCacheAtomicNearRemoveFailureTest.java | 4 +-
.../GridCacheAtomicOffHeapFullApiSelfTest.java | 4 +-
...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 4 +-
.../near/NearCacheSyncUpdateTest.java | 10 +---
...eplicatedAtomicMultiNodeFullApiSelfTest.java | 4 +-
.../IgniteCacheAtomicExpiryPolicyTest.java | 4 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 14 +++---
...teCacheClientWriteBehindStoreAtomicTest.java | 4 +-
.../DataStreamerUpdateAfterLoadTest.java | 2 -
34 files changed, 66 insertions(+), 244 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 0f0165b..d129f4d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -74,7 +74,6 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -791,7 +790,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
for (CacheAtomicityMode atomicityMode : CacheAtomicityMode.values()) {
CacheAtomicWriteOrderMode[] writeOrders =
- atomicityMode == ATOMIC ? values() : new CacheAtomicWriteOrderMode[]{CLOCK};
+ atomicityMode == ATOMIC ? values() : new CacheAtomicWriteOrderMode[]{PRIMARY};
for (CacheAtomicWriteOrderMode writeOrder : writeOrders) {
for (CacheWriteSynchronizationMode syncMode : CacheWriteSynchronizationMode.values()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 be8de79..f49d3ea 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
@@ -105,7 +105,6 @@ import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -324,7 +323,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
// Concurrent invoke can not be used for ATOMIC cache in CLOCK mode.
if (atomicityMode() == ATOMIC &&
cacheMode() != LOCAL &&
- cache.getConfiguration(CacheConfiguration.class).getAtomicWriteOrderMode() == CLOCK)
+ false)
return;
final Set<String> keys = Collections.singleton("myKey");
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 e8c5db1..d70d93d 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
@@ -40,7 +40,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -94,13 +93,6 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If failed.
*/
- public void testPartitionedClock() throws Exception {
- checkMessages(false, CLOCK);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testPartitionedPrimary() throws Exception {
checkMessages(false, PRIMARY);
}
@@ -108,13 +100,6 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If failed.
*/
- public void testClientClock() throws Exception {
- checkMessages(true, CLOCK);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testClientPrimary() throws Exception {
checkMessages(true, PRIMARY);
}
@@ -155,18 +140,10 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
Affinity<Object> affinity = ignite(0).affinity(null);
- if (writeOrderMode == CLOCK) {
- if (affinity.isPrimary(locNode, i) || affinity.isBackup(locNode, i))
- expNearCnt++;
- else
- expNearCnt += 2;
- }
- else {
- if (affinity.isPrimary(locNode, i))
- expDhtCnt++;
- else
- expNearSingleCnt++;
- }
+ if (affinity.isPrimary(locNode, i))
+ expDhtCnt++;
+ else
+ expNearSingleCnt++;
jcache(0).put(i, i);
}
@@ -175,23 +152,13 @@ public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest
assertEquals(expNearSingleCnt, commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
assertEquals(expDhtCnt, commSpi.messageCount(GridDhtAtomicSingleUpdateRequest.class));
- if (writeOrderMode == CLOCK) {
- for (int i = 1; i < 4; i++) {
- commSpi = (TestCommunicationSpi)grid(i).configuration().getCommunicationSpi();
+ for (int i = 1; i < 4; i++) {
+ commSpi = (TestCommunicationSpi)grid(i).configuration().getCommunicationSpi();
- assertEquals(0, commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
- assertEquals(0, commSpi.messageCount(GridNearAtomicFullUpdateRequest.class));
- assertEquals(0, commSpi.messageCount(GridDhtAtomicSingleUpdateRequest.class));
- }
+ assertEquals(0, commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
+ assertEquals(0, commSpi.messageCount(GridNearAtomicFullUpdateRequest.class));
}
- else {
- for (int i = 1; i < 4; i++) {
- commSpi = (TestCommunicationSpi)grid(i).configuration().getCommunicationSpi();
- assertEquals(0, commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
- assertEquals(0, commSpi.messageCount(GridNearAtomicFullUpdateRequest.class));
- }
- }
}
finally {
stopAllGrids();
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java
index 69af38f..59ee339 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicReplicatedSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -42,6 +42,6 @@ public class GridCacheInterceptorAtomicReplicatedSelfTest extends GridCacheInter
/** {@inheritDoc} */
@Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java
index 270d2da..80f30fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.cache.CacheInterceptor;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -42,6 +42,6 @@ public class GridCacheInterceptorAtomicSelfTest extends GridCacheInterceptorAbst
/** {@inheritDoc} */
@Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java
index 4580251..a9a0f0e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorLocalAtomicSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -37,7 +37,7 @@ public class GridCacheInterceptorLocalAtomicSelfTest extends GridCacheIntercepto
/** {@inheritDoc} */
@Nullable @Override protected CacheAtomicWriteOrderMode writeOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index a4d74d9..6129505 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@ -33,7 +33,7 @@ import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.util.typedef.F;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -101,7 +101,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
* @return Atomic write order mode.
*/
protected CacheAtomicWriteOrderMode writeOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java
index 199167d..6ff540f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java
@@ -32,7 +32,6 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -121,30 +120,6 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest {
/**
* @throws Exception If failed.
*/
- public void testVersionAtomicClock() throws Exception {
- atomicityMode = ATOMIC;
-
- atomicWriteOrder = CLOCK;
-
- checkVersion();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testVersionAtomicClockNearEnabled() throws Exception {
- atomicityMode = ATOMIC;
-
- atomicWriteOrder = CLOCK;
-
- near = true;
-
- checkVersion();
- }
-
- /**
- * @throws Exception If failed.
- */
public void testVersionAtomicPrimary() throws Exception {
atomicityMode = ATOMIC;
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java
index 186d1e7..379952b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicInvokeTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -47,7 +47,7 @@ public class IgniteCacheAtomicInvokeTest extends IgniteCacheInvokeAbstractTest {
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
index 34acb9b..66bdf95 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicStoreValueTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -47,7 +47,7 @@ public class IgniteCacheAtomicStoreValueTest extends IgniteCacheStoreValueAbstra
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java
index ef91468..86f5cff 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAtomicExecutionContextTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -41,7 +41,7 @@ public class IgniteCacheAtomicExecutionContextTest extends IgniteCacheAbstractEx
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java
index e4d5989..4d8457e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCachePartitionedExecutionContextTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -41,7 +41,7 @@ public class IgniteCachePartitionedExecutionContextTest extends IgniteCacheAbstr
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java
index 9a644b7..3c5f016 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheReplicatedExecutionContextTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -41,7 +41,7 @@ public class IgniteCacheReplicatedExecutionContextTest extends IgniteCacheAbstra
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java
index 1cde3f8..b75fda3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheTxExecutionContextTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
/**
@@ -41,7 +41,7 @@ public class IgniteCacheTxExecutionContextTest extends IgniteCacheAbstractExecut
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
index 1c5c35d..13b5b3b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
@@ -42,7 +42,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jsr166.ConcurrentHashMap8;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -125,7 +125,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid
* @return Write order mode for atomic cache.
*/
protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index b4ef11a..4ae63b4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -91,7 +91,6 @@ import org.apache.ignite.transactions.TransactionIsolation;
import org.eclipse.jetty.util.ConcurrentHashSet;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -150,13 +149,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
/**
* @throws Exception If failed.
*/
- public void testAtomicPutAllClockMode() throws Exception {
- atomicPut(CLOCK, true, null);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testAtomicPutAllPrimaryMode() throws Exception {
atomicPut(PRIMARY, true, null);
}
@@ -164,13 +156,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
/**
* @throws Exception If failed.
*/
- public void testAtomicPutAllNearEnabledClockMode() throws Exception {
- atomicPut(CLOCK, true, new NearCacheConfiguration());
- }
-
- /**
- * @throws Exception If failed.
- */
public void testAtomicPutAllNearEnabledPrimaryMode() throws Exception {
atomicPut(PRIMARY, true, new NearCacheConfiguration());
}
@@ -178,13 +163,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
/**
* @throws Exception If failed.
*/
- public void testAtomicPutClockMode() throws Exception {
- atomicPut(CLOCK, false, null);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testAtomicPutPrimaryMode() throws Exception {
atomicPut(PRIMARY, false, null);
}
@@ -315,13 +293,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
/**
* @throws Exception If failed.
*/
- public void testAtomicNoRemapClockMode() throws Exception {
- atomicNoRemap(CLOCK);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testAtomicNoRemapPrimaryMode() throws Exception {
atomicNoRemap(PRIMARY);
}
@@ -416,13 +387,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
/**
* @throws Exception If failed.
*/
- public void testAtomicGetAndPutClockMode() throws Exception {
- atomicGetAndPut(CLOCK);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testAtomicGetAndPutPrimaryMode() throws Exception {
atomicGetAndPut(PRIMARY);
}
@@ -1701,15 +1665,6 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
/**
* @throws Exception If failed.
*/
- public void testAtomicClockPutAllMultinode() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-1685");
-
- multinode(CLOCK, TestType.PUT_ALL);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testOptimisticTxPutAllMultinode() throws Exception {
multinode(null, TestType.OPTIMISTIC_TX);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 84e5860..67f697f 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
@@ -30,7 +30,7 @@ import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedFullApiSelfTest;
import org.apache.ignite.testframework.GridTestUtils;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -41,7 +41,7 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS
* @return Write order mode for atomic cache.
*/
protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 c4fd7b3..6ffb443 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
@@ -45,7 +45,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -116,31 +115,12 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testNoBackupsClockWriteOrder() throws Exception {
- startGrids(0, CLOCK);
-
- checkNearCache();
- }
-
- /**
- * @throws Exception If failed.
- */
public void testWithBackupsPrimaryWriteOrder() throws Exception {
startGrids(2, CacheAtomicWriteOrderMode.PRIMARY);
checkNearCache();
}
-
- /**
- * @throws Exception If failed.
- */
- public void testWithBackupsClockWriteOrder() throws Exception {
- startGrids(2, CLOCK);
-
- checkNearCache();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
index bee94a2..8a857a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -43,7 +43,7 @@ public class GridCacheDhtAtomicRemoveFailureTest extends GridCacheAbstractRemove
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 c3d194b..57122bd 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
@@ -57,7 +57,7 @@ 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.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
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;
@@ -164,7 +164,7 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
* @return Write order mode.
*/
protected CacheAtomicWriteOrderMode writeOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
index f7286b3..69f74b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractFailoverSelfTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -35,7 +35,7 @@ public class GridCacheAtomicFailoverSelfTest extends GridCacheAbstractFailoverSe
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setAtomicWriteOrderMode(CLOCK);
+ ccfg.setAtomicWriteOrderMode(PRIMARY);
assertEquals(CacheWriteSynchronizationMode.FULL_SYNC, ccfg.getWriteSynchronizationMode());
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 644e310..1b7b75a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -59,7 +59,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jsr166.ThreadLocalRandom8;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -149,48 +148,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
/**
* @throws Exception If failed.
*/
- public void testClockFullSync() throws Exception {
- checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.HEAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testClockFullSyncSwap() throws Exception {
- checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.SWAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testClockFullSyncOffheapTiered() throws Exception {
- checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testClockFullSyncOffheapSwap() throws Exception {
- checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testClockPrimarySync() throws Exception {
- checkRestarts(CLOCK, PRIMARY_SYNC, TestMemoryMode.HEAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testClockFullAsync() throws Exception {
- checkRestarts(CLOCK, FULL_ASYNC, TestMemoryMode.HEAP);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testPrimaryFullSync() throws Exception {
checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.HEAP);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java
index a21cd35..9d6bc33 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -43,7 +43,7 @@ public class GridCacheAtomicRemoveFailureTest extends GridCacheAbstractRemoveFai
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
index 9948fcb..247d78e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -34,7 +34,7 @@ public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitione
* @return Write order mode for atomic cache.
*/
protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 d4efff3..a8cd7e3 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
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -34,7 +34,7 @@ public class GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest
* @return Write order mode for atomic cache.
*/
protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
index d9c6e01..3548edb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
@@ -42,7 +42,7 @@ public class GridCacheAtomicNearRemoveFailureTest extends GridCacheAbstractRemov
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
index 4551981..55374d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -33,7 +33,7 @@ public class GridCacheAtomicOffHeapFullApiSelfTest extends GridCachePartitionedO
* @return Write order mode for atomic cache.
*/
protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
index f353483..d854fce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -34,7 +34,7 @@ public class GridCacheAtomicOffHeapMultiNodeFullApiSelfTest extends
* @return Write order mode for atomic cache.
*/
protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
index bbdf50e..5f68e92 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
@@ -33,7 +33,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -66,14 +65,7 @@ public class NearCacheSyncUpdateTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testNearCacheSyncUpdateAtomic1() throws Exception {
- nearCacheSyncUpdateTx(ATOMIC, CLOCK);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testNearCacheSyncUpdateAtomic2() throws Exception {
+ public void testNearCacheSyncUpdateAtomic() throws Exception {
nearCacheSyncUpdateTx(ATOMIC, PRIMARY);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 51a087a..92670d7 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
@@ -21,7 +21,7 @@ import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -32,7 +32,7 @@ public class GridCacheReplicatedAtomicMultiNodeFullApiSelfTest extends GridCache
* @return Write order mode for atomic cache.
*/
protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
index c2ee607..ba2a1db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicExpiryPolicyTest.java
@@ -22,7 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -47,7 +47,7 @@ public class IgniteCacheAtomicExpiryPolicyTest extends IgniteCacheExpiryPolicyAb
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index f22ca6d..62e4e73 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -59,7 +59,7 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -878,7 +878,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
IgniteCache<Integer, Integer> cache1 = jcache(1);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK)
+ if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
Thread.sleep(100);
// Update from another node.
@@ -886,7 +886,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
checkTtl(key, 61_000L);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK)
+ if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
Thread.sleep(100);
// Update from another node with provided TTL.
@@ -901,7 +901,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
checkTtl(key, 60_000L);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK)
+ if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
Thread.sleep(100);
// Update from near node with provided TTL.
@@ -930,7 +930,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
for (Integer key : vals.keySet())
checkTtl(key, 60_000L);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK)
+ if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
Thread.sleep(100);
IgniteCache<Integer, Integer> cache1 = jcache(1);
@@ -941,7 +941,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
for (Integer key : vals.keySet())
checkTtl(key, 61_000L);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK)
+ if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
Thread.sleep(100);
// Update from another node with provided TTL.
@@ -955,7 +955,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
// Try create again.
cache0.putAll(vals);
- if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == CLOCK)
+ if (atomicityMode() == ATOMIC && atomicWriteOrderMode() == PRIMARY)
Thread.sleep(100);
// Update from near node with provided TTL.
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java
index 4eb2f2b..55047e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAtomicTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.store;
import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
@@ -34,6 +34,6 @@ public class IgnteCacheClientWriteBehindStoreAtomicTest extends IgnteCacheClient
/** {@inheritDoc} */
@Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
- return CLOCK;
+ return PRIMARY;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/25d4ea50/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 32e204b..45eba6c 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
@@ -31,7 +31,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -153,7 +152,6 @@ public class DataStreamerUpdateAfterLoadTest extends GridCommonAbstractTest {
ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, PRIMARY, 1, "cache-" + ccfgs.size()));
ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, PRIMARY, 0, "cache-" + ccfgs.size()));
- ccfgs.add(cacheConfiguration(CacheAtomicityMode.ATOMIC, CLOCK, 1, "cache-" + ccfgs.size()));
ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, null, 1, "cache-" + ccfgs.size()));
ccfgs.add(cacheConfiguration(CacheAtomicityMode.TRANSACTIONAL, null, 0, "cache-" + ccfgs.size()));
[32/39] ignite git commit: Use of code generator.
Posted by ag...@apache.org.
Use of code generator.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2cbfb86f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2cbfb86f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2cbfb86f
Branch: refs/heads/ignite-4587
Commit: 2cbfb86f98c84088411724d182e375005a791a79
Parents: 187bfea
Author: Max Kozlov <dr...@gmail.com>
Authored: Tue Mar 14 16:36:39 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Tue Mar 14 16:36:39 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/codegen/MessageCodeGenerator.java | 4 ++++
.../internal/processors/cache/version/GridCacheVersion.java | 2 +-
.../processors/cache/version/GridCacheVersionEx.java | 8 ++++----
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2cbfb86f/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 5a26187..69cf1c3 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -44,6 +44,8 @@ import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectMap;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.IgniteCodeGeneratingFail;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
@@ -229,6 +231,8 @@ public class MessageCodeGenerator {
// gen.generateAndWrite(GridH2RowRangeBounds.class);
// gen.generateAndWrite(GridH2QueryRequest.class);
// gen.generateAndWrite(GridH2RowMessage.class);
+// gen.generateAndWrite(GridCacheVersion.class);
+// gen.generateAndWrite(GridCacheVersionEx.class);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/2cbfb86f/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 8b2b7e1..8381121 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
@@ -314,7 +314,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 4;
+ return 3;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/2cbfb86f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index e376366..27b4edc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -88,7 +88,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 5;
+ return 4;
}
/** {@inheritDoc} */
@@ -106,7 +106,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
}
switch (writer.state()) {
- case 4:
+ case 3:
if (!writer.writeMessage("drVer", drVer))
return false;
@@ -128,7 +128,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
return false;
switch (reader.state()) {
- case 4:
+ case 3:
drVer = reader.readMessage("drVer");
if (!reader.isLastRead())
@@ -164,4 +164,4 @@ public class GridCacheVersionEx extends GridCacheVersion {
", nodeOrder=" + nodeOrder() +
", drVer=" + drVer + ']';
}
-}
\ No newline at end of file
+}
[39/39] ignite git commit: ignite-4587 Merged with master branch
Posted by ag...@apache.org.
ignite-4587 Merged with master branch
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0bfb5851
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0bfb5851
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0bfb5851
Branch: refs/heads/ignite-4587
Commit: 0bfb5851c2de06b27d3d784a744a21bf24d5d1c1
Parents: c9d08d3 530075b
Author: agura <ag...@apache.org>
Authored: Tue Apr 11 20:01:51 2017 +0300
Committer: agura <ag...@apache.org>
Committed: Tue Apr 11 20:01:51 2017 +0300
----------------------------------------------------------------------
.../ignite/codegen/MessageCodeGenerator.java | 4 +
.../ignite/cache/CacheAtomicWriteOrderMode.java | 64 ---
.../org/apache/ignite/cache/CacheEntry.java | 11 -
.../configuration/CacheConfiguration.java | 28 --
.../configuration/IgniteConfiguration.java | 60 ---
.../ignite/internal/GridKernalContext.java | 16 -
.../ignite/internal/GridKernalContextImpl.java | 31 --
.../apache/ignite/internal/IgniteKernal.java | 2 -
.../communication/GridIoMessageFactory.java | 12 -
.../processors/cache/CacheEntryImplEx.java | 8 +-
.../cache/GridCacheAtomicVersionComparator.java | 24 +-
.../processors/cache/GridCacheMapEntry.java | 10 +-
.../processors/cache/GridCacheMvcc.java | 23 +-
.../processors/cache/GridCacheProcessor.java | 17 -
.../cache/GridCacheSwapEntryImpl.java | 4 +-
.../processors/cache/GridCacheUtils.java | 7 +-
.../dht/atomic/GridDhtAtomicCache.java | 21 +-
...idNearAtomicAbstractSingleUpdateRequest.java | 1 -
.../atomic/GridNearAtomicFullUpdateRequest.java | 3 +-
...GridNearAtomicSingleUpdateFilterRequest.java | 3 +-
...GridNearAtomicSingleUpdateInvokeRequest.java | 3 +-
.../cache/transactions/IgniteTxEntry.java | 8 +-
.../cache/transactions/IgniteTxManager.java | 2 +-
.../version/GridCachePlainVersionedEntry.java | 5 -
.../version/GridCacheRawVersionedEntry.java | 5 -
.../cache/version/GridCacheVersion.java | 47 +-
.../cache/version/GridCacheVersionEx.java | 19 +-
.../cache/version/GridCacheVersionManager.java | 9 +-
.../cache/version/GridCacheVersionedEntry.java | 7 -
.../clock/GridClockDeltaSnapshot.java | 235 ---------
.../clock/GridClockDeltaSnapshotMessage.java | 154 ------
.../processors/clock/GridClockDeltaVersion.java | 194 --------
.../processors/clock/GridClockMessage.java | 171 -------
.../processors/clock/GridClockServer.java | 222 ---------
.../processors/clock/GridClockSource.java | 30 --
.../clock/GridClockSyncProcessor.java | 481 -------------------
.../processors/clock/GridJvmClockSource.java | 28 --
.../datastructures/DataStructuresProcessor.java | 2 -
.../internal/processors/igfs/IgfsUtils.java | 2 -
.../utils/PlatformConfigurationUtils.java | 3 -
.../ignite/internal/util/IgniteUtils.java | 26 +-
.../visor/cache/VisorCacheConfiguration.java | 12 -
.../ignite/startup/BasicWarmupClosure.java | 1 -
.../resources/META-INF/classnames.properties | 4 +-
.../config/websession/example-cache-base.xml | 1 -
.../test/config/websession/spring-cache-1.xml | 6 -
.../test/config/websession/spring-cache-2.xml | 6 -
.../test/config/websession/spring-cache-3.xml | 6 -
.../IgniteClientReconnectCacheTest.java | 87 ++--
.../CacheAtomicSingleMessageCountSelfTest.java | 2 -
.../cache/CacheEnumOperationsAbstractTest.java | 2 -
...torPartitionCounterRandomOperationsTest.java | 2 -
.../CacheStoreUsageMultinodeAbstractTest.java | 2 -
.../EntryVersionConsistencyReadThroughTest.java | 2 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 15 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 16 +-
.../GridCacheAbstractRemoveFailureTest.java | 9 -
.../GridCacheAtomicMessageCountSelfTest.java | 54 +--
.../cache/GridCacheEntryVersionSelfTest.java | 2 -
.../cache/GridCacheIncrementTransformTest.java | 2 -
.../GridCacheInterceptorAbstractSelfTest.java | 24 +-
...erceptorAtomicPrimaryWriteOrderSelfTest.java | 47 --
...omicReplicatedPrimaryWriteOrderSelfTest.java | 48 --
...acheInterceptorAtomicReplicatedSelfTest.java | 8 -
.../GridCacheInterceptorAtomicSelfTest.java | 8 -
...GridCacheInterceptorLocalAtomicSelfTest.java | 8 -
.../cache/GridCacheMvccFlagsTest.java | 4 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 24 +-
.../processors/cache/GridCacheMvccSelfTest.java | 8 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 2 -
.../GridCacheOffHeapTieredAbstractSelfTest.java | 3 -
...heOffHeapTieredEvictionAbstractSelfTest.java | 3 -
.../GridCacheReturnValueTransferSelfTest.java | 15 +-
...ridCacheStoreManagerDeserializationTest.java | 10 -
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
...idCacheValueConsistencyAbstractSelfTest.java | 10 -
.../cache/GridCacheVersionMultinodeTest.java | 40 --
.../cache/GridCacheVersionSelfTest.java | 4 +-
.../GridCacheVersionTopologyChangeTest.java | 2 -
.../cache/IgniteCacheAbstractTest.java | 14 -
.../cache/IgniteCacheAtomicInvokeTest.java | 7 -
.../cache/IgniteCacheAtomicPeekModesTest.java | 7 -
...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 57 ---
...maryWriteOrderNearEnabledStoreValueTest.java | 31 --
...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 --
...micPrimaryWriteOrderWithStoreInvokeTest.java | 32 --
.../cache/IgniteCacheAtomicStoreValueTest.java | 7 -
.../IgniteCacheAtomicWithStoreInvokeTest.java | 32 ++
.../IgniteCacheConfigVariationsFullApiTest.java | 6 -
.../IgniteCacheEntryListenerAtomicTest.java | 7 -
...niteCacheEntryListenerExpiredEventsTest.java | 2 -
.../IgniteCacheEntryProcessorCallTest.java | 3 -
.../IgniteCacheInterceptorSelfTestSuite.java | 2 -
...gniteCacheInvokeReadThroughAbstractTest.java | 2 -
.../IgniteCacheP2pUnmarshallingErrorTest.java | 6 -
.../IgniteCacheReadThroughStoreCallTest.java | 2 -
.../IgniteCacheStoreValueAbstractTest.java | 4 -
.../cache/IgniteCacheTxPeekModesTest.java | 7 -
.../cache/IgniteExchangeFutureHistoryTest.java | 6 -
...logyValidatorPartitionedAtomicCacheTest.java | 7 -
...ologyValidatorReplicatedAtomicCacheTest.java | 7 -
...sExchangeOnDiscoveryHistoryOverflowTest.java | 7 -
.../IgniteCacheAtomicExecutionContextTest.java | 7 -
...iteCachePartitionedExecutionContextTest.java | 7 -
...niteCacheReplicatedExecutionContextTest.java | 7 -
.../IgniteCacheTxExecutionContextTest.java | 7 -
...CacheAtomicNearUpdateTopologyChangeTest.java | 7 -
.../CacheLateAffinityAssignmentTest.java | 2 -
...NearDisabledAtomicInvokeRestartSelfTest.java | 6 -
...dCacheMultithreadedFailoverAbstractTest.java | 18 +-
...chePartitionedReloadAllAbstractSelfTest.java | 11 -
.../GridCacheTransformEventSelfTest.java | 2 -
.../IgniteCacheAtomicNodeJoinTest.java | 6 -
...niteCacheClientNodeChangingTopologyTest.java | 92 +---
.../IgniteCacheMessageRecoveryAbstractTest.java | 2 -
...tPartitionedOnlyByteArrayValuesSelfTest.java | 4 -
.../dht/GridCacheAtomicFullApiSelfTest.java | 19 -
.../dht/GridCacheAtomicNearCacheSelfTest.java | 53 +-
...EnabledPrimaryWriteOrderFullApiSelfTest.java | 31 --
...eAtomicPrimaryWriteOrderFullApiSelfTest.java | 32 --
...tomicPrimaryWriteOrderReloadAllSelfTest.java | 32 --
.../GridCacheDhtAtomicRemoveFailureTest.java | 7 -
.../dht/IgniteCacheConcurrentPutGetRemove.java | 2 -
...artitionedBackupNodeFailureRecoveryTest.java | 7 -
.../IgniteCachePutRetryAbstractSelfTest.java | 16 -
.../atomic/GridCacheAtomicFailoverSelfTest.java | 3 -
...eAtomicInvalidPartitionHandlingSelfTest.java | 66 +--
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 --
...tomicPrimaryWriteOrderRemoveFailureTest.java | 53 --
.../GridCacheAtomicRemoveFailureTest.java | 7 -
...micPrimaryWriteOrderNearEnabledSelfTest.java | 39 --
...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 --
...PutRetryAtomicPrimaryWriteOrderSelfTest.java | 32 --
...LateAffDisabledMultiNodeFullApiSelfTest.java | 35 ++
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 35 --
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 10 -
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 19 -
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 31 --
.../GridCacheAtomicNearRemoveFailureTest.java | 7 -
...icNoStripedPoolMultiNodeFullApiSelfTest.java | 35 ++
.../GridCacheAtomicOffHeapFullApiSelfTest.java | 11 -
...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 11 -
...idCacheAtomicPartitionedMetricsSelfTest.java | 2 -
...derFairAffinityMultiNodeFullApiSelfTest.java | 36 --
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 32 --
...rderMultiNodeP2PDisabledFullApiSelfTest.java | 33 --
...cPrimaryWriteOrderNearRemoveFailureTest.java | 52 --
...PrimaryWriteOrderOffHeapFullApiSelfTest.java | 32 --
...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 --
...ityOrderOffHeapMultiNodeFullApiSelfTest.java | 33 --
...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 --
.../near/GridCacheNearEvictionSelfTest.java | 2 -
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 -
...achePartitionedMultiNodeFullApiSelfTest.java | 4 -
.../near/NearCacheSyncUpdateTest.java | 27 +-
.../GridCacheRebalancingOrderingTest.java | 2 -
...cheRebalancingPartitionDistributionTest.java | 2 -
...ridCacheAtomicReplicatedMetricsSelfTest.java | 2 -
...eplicatedAtomicMultiNodeFullApiSelfTest.java | 19 -
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 33 --
.../IgniteCacheAtomicExpiryPolicyTest.java | 7 -
...iteCacheAtomicExpiryPolicyWithStoreTest.java | 7 -
...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 32 --
...rimaryWriteOrderOffheapExpiryPolicyTest.java | 31 --
...maryWriteOrderWithStoreExpiryPolicyTest.java | 32 --
...teOrderWithStoreOffheapExpiryPolicyTest.java | 31 --
.../IgniteCacheExpiryPolicyAbstractTest.java | 13 +-
.../IgniteCacheExpiryPolicyTestSuite.java | 4 -
.../IgniteCacheAtomicLoadAllTest.java | 7 -
.../IgniteCacheAtomicLoaderWriterTest.java | 7 -
...gniteCacheAtomicNoLoadPreviousValueTest.java | 7 -
.../IgniteCacheAtomicNoReadThroughTest.java | 7 -
.../IgniteCacheAtomicNoWriteThroughTest.java | 7 -
.../IgniteCacheAtomicStoreSessionTest.java | 7 -
...eCacheAtomicStoreSessionWriteBehindTest.java | 7 -
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 8 -
.../GridCacheAtomicLocalMetricsSelfTest.java | 2 -
...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 --
...rderFairAffinityMultiJvmFullApiSelfTest.java | 31 --
...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 --
...OrderMultiJvmP2PDisabledFullApiSelfTest.java | 31 --
...rityOrderOffHeapMultiJvmFullApiSelfTest.java | 31 --
...derOffHeapTieredMultiJvmFullApiSelfTest.java | 36 --
...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 --
.../GridCacheSwapScanQueryAbstractSelfTest.java | 3 -
...FailoverAtomicPrimaryWriteOrderSelfTest.java | 50 --
...tinuousQueryAsyncFailoverAtomicSelfTest.java | 43 ++
...eContinuousQueryAsyncFilterListenerTest.java | 2 -
...acheContinuousQueryExecuteInPrimaryTest.java | 2 -
...ContinuousQueryFailoverAbstractSelfTest.java | 10 -
...ryFailoverAtomicNearEnabledSelfSelfTest.java | 9 +-
...ousQueryFailoverAtomicOffheapTieredTest.java | 33 ++
...tomicPrimaryWriteOrderOffheapTieredTest.java | 33 --
...FailoverAtomicPrimaryWriteOrderSelfTest.java | 44 --
...usQueryFailoverAtomicReplicatedSelfTest.java | 9 +-
...heContinuousQueryFailoverAtomicSelfTest.java | 36 ++
...ontinuousQueryOperationFromCallbackTest.java | 2 -
.../CacheContinuousQueryOperationP2PTest.java | 2 -
.../CacheContinuousQueryOrderingEventTest.java | 2 -
...acheContinuousQueryRandomOperationsTest.java | 2 -
.../CacheKeepBinaryIterationTest.java | 2 -
...teCacheClientWriteBehindStoreAtomicTest.java | 7 -
.../transactions/DepthFirstSearchTest.java | 18 +-
.../CacheVersionedEntryAbstractTest.java | 2 -
.../clock/GridTimeSyncProcessorSelfTest.java | 224 ---------
.../DataStreamerUpdateAfterLoadTest.java | 18 +-
.../ServicePredicateAccessCacheTest.java | 4 +-
.../tcp/TcpCommunicationSpiDropNodesTest.java | 1 -
.../TcpCommunicationSpiFaultyClientTest.java | 1 -
.../configvariations/ConfigVariations.java | 3 -
.../testframework/junits/GridAbstractTest.java | 2 -
.../junits/common/GridCommonAbstractTest.java | 19 -
.../IgniteCacheFailoverTestSuite.java | 4 -
.../IgniteCacheFailoverTestSuite2.java | 2 -
.../IgniteCacheFailoverTestSuite3.java | 2 -
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 14 -
.../IgniteCacheFullApiSelfTestSuite.java | 32 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 6 +-
.../testsuites/IgniteCacheTestSuite3.java | 4 -
.../testsuites/IgniteCacheTestSuite4.java | 4 -
.../CacheHibernateBlobStoreNodeRestartTest.java | 8 -
.../CacheOperationsWithExpirationTest.java | 2 -
.../CacheRandomOperationsMultithreadedTest.java | 2 -
.../IgniteCacheCrossCacheJoinRandomTest.java | 2 -
...acheDistributedJoinCollocatedAndNotTest.java | 2 -
...acheDistributedJoinCustomAffinityMapper.java | 2 -
.../IgniteCacheDistributedJoinNoIndexTest.java | 2 -
...ributedJoinPartitionedAndReplicatedTest.java | 2 -
...CacheDistributedJoinQueryConditionsTest.java | 2 -
...PartitionedAndReplicatedCollocationTest.java | 2 -
...teCacheJoinPartitionedAndReplicatedTest.java | 2 -
.../IgniteCacheQuerySelfTestSuite4.java | 12 +-
.../cpp/core-test/config/cache-test.xml | 3 -
.../Cache/CacheConfigurationTest.cs | 2 -
.../Config/native-client-test-cache.xml | 3 -
.../IgniteConfigurationSerializerTest.cs | 1 -
.../Apache.Ignite.Core.csproj | 1 -
.../Configuration/CacheAtomicWriteOrderMode.cs | 43 --
.../Cache/Configuration/CacheConfiguration.cs | 7 -
.../IgniteConfigurationSection.xsd | 12 -
.../commands/cache/VisorCacheCommand.scala | 1 -
modules/web-console/backend/app/mongo.js | 3 -
.../generator/ConfigurationGenerator.js | 5 +-
.../generator/PlatformGenerator.js | 1 -
.../defaults/Cache.platform.service.js | 4 -
.../generator/defaults/Cache.service.js | 3 -
.../generator/defaults/Cluster.service.js | 2 -
.../states/configuration/caches/concurrency.pug | 11 -
.../states/configuration/clusters/time.pug | 10 +-
modules/yardstick/README.txt | 1 -
.../yardstick/IgniteBenchmarkArguments.java | 15 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 3 -
252 files changed, 443 insertions(+), 4825 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index ab0aff2,90955e5..23cbc2b
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@@ -40,11 -40,8 +40,10 @@@ import javax.cache.configuration.Comple
import javax.cache.configuration.Factory;
import javax.cache.configuration.MutableConfiguration;
import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.integration.CacheLoader;
+import javax.cache.integration.CacheWriter;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
- import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.CacheInterceptor;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 49ae9bb,ca0f201..b88ef6a
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -517,14 -496,10 +505,12 @@@ public class IgniteConfiguration
cacheKeyCfg = cfg.getCacheKeyConfiguration();
cacheSanityCheckEnabled = cfg.isCacheSanityCheckEnabled();
callbackPoolSize = cfg.getAsyncCallbackPoolSize();
- connectorCfg = cfg.getConnectorConfiguration();
classLdr = cfg.getClassLoader();
clientMode = cfg.isClientMode();
- clockSyncFreq = cfg.getClockSyncFrequency();
- clockSyncSamples = cfg.getClockSyncSamples();
+ connectorCfg = cfg.getConnectorConfiguration();
consistentId = cfg.getConsistentId();
+ daemon = cfg.isDaemon();
+ dataStreamerPoolSize = cfg.getDataStreamerThreadPoolSize();
deployMode = cfg.getDeploymentMode();
discoStartupDelay = cfg.getDiscoveryStartupDelay();
failureDetectionTimeout = cfg.getFailureDetectionTimeout();
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index c20ed48,2896784..be8f1fc
--- 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
@@@ -3306,14 -3289,12 +3305,14 @@@ public class GridDhtAtomicCache<K, V> e
}
}
catch (ClusterTopologyCheckedException ignored) {
- U.warn(msgLog, "Failed to send DHT atomic update response, node left [futId=" + req.futureVersion() +
- ", node=" + req.nodeId() + ']');
+ if (msgLog.isDebugEnabled()) {
+ msgLog.debug("Failed to send deferred DHT update response, node left [" +
+ "futIds=" + msg.futureIds() + ", node=" + primaryId + ']');
+ }
}
catch (IgniteCheckedException e) {
- U.error(log, "Failed to send deferred DHT update response to remote node [" +
- U.error(msgLog, "Failed to send DHT atomic update response [futId=" + req.futureVersion() +
- ", node=" + nodeId + ", res=" + res + ']', e);
++ U.error(log, "Failed to send deferredDHT update response to remote node [" +
+ "futIds=" + msg.futureIds() + ", node=" + primaryId + ']', e);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
index 6811236,107537c..c469688
--- 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
@@@ -47,10 -106,10 +47,9 @@@ public abstract class GridNearAtomicAbs
/**
* Constructor.
- *
- * @param cacheId Cache ID.
+ * @param cacheId Cache ID.
* @param nodeId Node ID.
- * @param futVer Future version.
- * @param fastMap Fast map scheme flag.
+ * @param futId Future ID.
* @param topVer Topology version.
* @param topLocked Topology locked flag.
* @param syncMode Synchronization mode.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index 9c27135,422a3f9..aebb043
--- 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
@@@ -118,10 -172,10 +118,9 @@@ public class GridNearAtomicFullUpdateRe
/**
* Constructor.
- *
- * @param cacheId Cache ID.
+ * @param cacheId Cache ID.
* @param nodeId Node ID.
- * @param futVer Future version.
- * @param fastMap Fast map scheme flag.
+ * @param futId Future ID.
* @param topVer Topology version.
* @param topLocked Topology locked flag.
* @param syncMode Synchronization mode.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
index 849a1a7,d768fa7..2fa810b
--- 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,10 -55,10 +55,9 @@@ public class GridNearAtomicSingleUpdate
/**
* Constructor.
- *
- * @param cacheId Cache ID.
+ * @param cacheId Cache ID.
* @param nodeId Node ID.
- * @param futVer Future version.
- * @param fastMap Fast map scheme flag.
+ * @param futId Future ID.
* @param topVer Topology version.
* @param topLocked Topology locked flag.
* @param syncMode Synchronization mode.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index 9733440,711a178..b9be484
--- 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,10 -73,10 +73,9 @@@ public class GridNearAtomicSingleUpdate
/**
* Constructor.
- *
- * @param cacheId Cache ID.
+ * @param cacheId Cache ID.
* @param nodeId Node ID.
- * @param futVer Future version.
- * @param fastMap Fast map scheme flag.
+ * @param futId Future ID.
* @param topVer Topology version.
* @param topLocked Topology locked flag.
* @param syncMode Synchronization mode.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
index 4306d7e,0000000..e69de29
mode 100644,000000..100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
index 19c75e6,0000000..e69de29
mode 100644,000000..100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
index 51d396a,0000000..e69de29
mode 100644,000000..100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
index c10b6d1,0000000..e69de29
mode 100644,000000..100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
index 3cf88d3,4453dba..bb11b7f
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
@@@ -25,8 -22,6 +25,7 @@@ import org.apache.ignite.IgniteExceptio
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.binary.BinaryRawReader;
import org.apache.ignite.binary.BinaryRawWriter;
- import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.cluster.ClusterTopologyException;
@@@ -522,38 -403,6 +521,37 @@@ public class IgfsUtils
}
}
+
+ /**
+ * @return Default IGFS cache configuration.
+ */
+ private static CacheConfiguration defaultCacheConfig() {
+ CacheConfiguration cfg = new CacheConfiguration();
- cfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY);
+ cfg.setAtomicityMode(TRANSACTIONAL);
+ cfg.setWriteSynchronizationMode(FULL_SYNC);
+ cfg.setCacheMode(CacheMode.PARTITIONED);
+
+ return cfg;
+ }
+
+ /**
+ * @return Default IGFS meta cache configuration.
+ */
+ private static CacheConfiguration defaultMetaCacheConfig() {
+ CacheConfiguration cfg = defaultCacheConfig();
+
+ cfg.setBackups(1);
+
+ return cfg;
+ }
+
+ /**
+ * @return Default IGFS data cache configuration.
+ */
+ private static CacheConfiguration defaultDataCacheConfig() {
+ return defaultCacheConfig();
+ }
+
/**
* Create empty directory with the given ID.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --cc modules/core/src/main/resources/META-INF/classnames.properties
index 8c5a72e,c3c2cac..27baf1a
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@@ -984,14 -976,18 +983,13 @@@ org.apache.ignite.internal.processors.c
org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectByteArrayImpl
org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectImpl
org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserKeyCacheObjectImpl
- org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage
- org.apache.ignite.internal.processors.clock.GridClockDeltaVersion
+ org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLAV2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1V2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2
+org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2MLAV2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2V2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4
+org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4MLAV2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4V2
+org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4
org.apache.ignite.internal.processors.closure.GridClosureProcessor$T1
org.apache.ignite.internal.processors.closure.GridClosureProcessor$T10
org.apache.ignite.internal.processors.closure.GridClosureProcessor$T11
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/config/websession/spring-cache-1.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/config/websession/spring-cache-2.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/config/websession/spring-cache-3.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 20bd9eb,26346a0..e80083c
--- 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
@@@ -3410,64 -2915,6 +3403,58 @@@ public abstract class GridCacheAbstract
}
/**
+ * @param async If {@code true} uses asynchronous operation.
+ * @throws Exception In case of error.
+ */
+ private void globalRemoveAll(boolean async) throws Exception {
+ IgniteCache<String, Integer> cache = jcache();
+
+ cache.put("key1", 1);
+ cache.put("key2", 2);
+ cache.put("key3", 3);
+
+ checkSize(F.asSet("key1", "key2", "key3"));
+
- atomicClockModeDelay(cache);
-
+ if (async)
+ cache.removeAllAsync(F.asSet("key1", "key2")).get();
+ else
+ cache.removeAll(F.asSet("key1", "key2"));
+
+ checkSize(F.asSet("key3"));
+
+ checkContainsKey(false, "key1");
+ checkContainsKey(false, "key2");
+ checkContainsKey(true, "key3");
+
+ // Put values again.
+ cache.put("key1", 1);
+ cache.put("key2", 2);
+ cache.put("key3", 3);
+
- atomicClockModeDelay(cache);
-
+ if (async)
+ jcache(gridCount() > 1 ? 1 : 0).removeAllAsync().get();
+ else
+ jcache(gridCount() > 1 ? 1 : 0).removeAll();
+
+ assertEquals(0, cache.localSize());
+ long entryCnt = hugeRemoveAllEntryCount();
+
+ for (int i = 0; i < entryCnt; i++)
+ cache.put(String.valueOf(i), i);
+
+ for (int i = 0; i < entryCnt; i++)
+ assertEquals(Integer.valueOf(i), cache.get(String.valueOf(i)));
+
- atomicClockModeDelay(cache);
-
+ if (async)
+ cache.removeAllAsync().get();
+ else
+ cache.removeAll();
+
+ for (int i = 0; i < entryCnt; i++)
+ assertNull(cache.get(String.valueOf(i)));
+ }
+
+ /**
* @return Count of entries to be removed in removeAll() test.
*/
protected long hugeRemoveAllEntryCount() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index 94e5917,7dff70d..f6fe8df
--- 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
@@@ -173,20 -169,17 +169,17 @@@ public abstract class GridCacheAbstract
cacheCfg.setNearConfiguration(nearConfiguration());
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- if (primaryWriteOrderMode)
- cacheCfg.setAtomicWriteOrderMode(PRIMARY);
-
cacheCfg.setRebalanceMode(SYNC);
- if (gridName.endsWith("1"))
+ if (igniteInstanceName.endsWith("1"))
cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_1));
- else if (gridName.endsWith("2"))
+ else if (igniteInstanceName.endsWith("2"))
cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_2));
- else if (gridName.endsWith("3"))
+ else if (igniteInstanceName.endsWith("3"))
cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_3));
- else if (gridName.endsWith("4"))
+ else if (igniteInstanceName.endsWith("4"))
cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_4));
- else if (gridName.endsWith("5"))
+ else if (igniteInstanceName.endsWith("5"))
cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_5));
else
cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_6));
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
index a12b6b9,138ca70..1365577
--- 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
@@@ -58,12 -55,9 +55,9 @@@ public class GridCacheAtomicMessageCoun
/** Client mode flag. */
private boolean client;
- /** Write sync mode. */
- private CacheAtomicWriteOrderMode writeOrderMode;
-
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
index 0f7ca61,ff7a09c..5073687
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
@@@ -71,11 -70,9 +70,9 @@@ public abstract class GridCacheOffHeapT
}
/** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
+ CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
-
ccfg.setMemoryMode(OFFHEAP_TIERED);
ccfg.setOffHeapMaxMemory(1024 * 1024);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
index be6e59a,fc41112..0640693
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
@@@ -62,11 -61,9 +61,9 @@@ public abstract class GridCacheOffHeapT
}
/** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
+ CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
- ccfg.setAtomicWriteOrderMode(PRIMARY);
-
ccfg.setMemoryMode(OFFHEAP_TIERED);
ccfg.setNearConfiguration(null);
ccfg.setOffHeapMaxMemory(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index 4bada88,1950c72..2b23b83
--- 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
@@@ -3431,18 -2715,12 +3429,16 @@@ public class IgniteCacheConfigVariation
cache.put("key2", 2);
cache.put("key3", 3);
- atomicClockModeDelay(cache);
-
if (async) {
- IgniteCache asyncCache0 = jcache(gridCount() > 1 ? 1 : 0).withAsync();
+ if (oldAsync) {
+ IgniteCache asyncCache0 = jcache(gridCount() > 1 ? 1 : 0).withAsync();
- asyncCache0.removeAll();
+ asyncCache0.removeAll();
- asyncCache0.future().get();
+ asyncCache0.future().get();
+ }
+ else
+ jcache(gridCount() > 1 ? 1 : 0).removeAllAsync().get();
}
else
jcache(gridCount() > 1 ? 1 : 0).removeAll();
@@@ -3456,16 -2734,10 +3452,14 @@@
for (int i = 0; i < entryCnt; i++)
assertEquals(Integer.valueOf(i), cache.get(String.valueOf(i)));
- atomicClockModeDelay(cache);
-
if (async) {
- asyncCache.removeAll();
+ if (oldAsync) {
+ asyncCache.removeAll();
- asyncCache.future().get();
+ asyncCache.future().get();
+ }
+ else
+ cache.removeAllAsync().get();
}
else
cache.removeAll();
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index a44e49e,3321a2c..f904d3c
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@@ -1690,14 -1643,9 +1640,7 @@@ public class IgniteCacheClientNodeChang
* @throws Exception If failed.
*/
public void testAtomicPrimaryPutAllMultinode() throws Exception {
- multinode(PRIMARY, TestType.PUT_ALL);
- }
- fail("https://issues.apache.org/jira/browse/IGNITE-1685");
--
- /**
- * @throws Exception If failed.
- */
- public void testAtomicClockPutAllMultinode() throws Exception {
- multinode(CLOCK, TestType.PUT_ALL);
+ multinode(ATOMIC, TestType.PUT_ALL);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
index 2600e7b,a1f7429..8fc9505
--- 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
@@@ -323,9 -291,7 +293,7 @@@ public class GridCacheAtomicNearCacheSe
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 + ']');
+ log.info("Transform [igniteInstanceName=" + grid(i).name() + ", val=" + val + ']');
cache.invoke(nearKey, new Processor(val));
@@@ -537,9 -501,7 +503,7 @@@
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 + ']');
+ log.info("Put [igniteInstanceName=" + grid(i).name() + ", val=" + val + ']');
cache.put(nearKey, val);
@@@ -638,10 -600,8 +602,8 @@@
}
IgniteCache<Integer, Integer> primaryCache = G.ignite(
- (String) aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME)).cache(null);
+ (String) aff.mapKeyToNode(nearKey).attribute(ATTR_IGNITE_INSTANCE_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++)
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
index e7b9fce,f2b87e9..741dba3
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java
@@@ -32,11 -31,9 +31,9 @@@ import static org.apache.ignite.cache.C
*/
public class GridCacheAtomicFailoverSelfTest extends GridCacheAbstractFailoverSelfTest {
/** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
+ CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
- ccfg.setAtomicWriteOrderMode(CLOCK);
-
assertEquals(CacheWriteSynchronizationMode.FULL_SYNC, ccfg.getWriteSynchronizationMode());
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
index 82b6247,0000000..e69de29
mode 100644,000000..100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java
index 0000000,100f87c..267de66
mode 000000,100644..100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java
@@@ -1,0 -1,35 +1,35 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ package org.apache.ignite.internal.processors.cache.distributed.near;
+
+ import org.apache.ignite.configuration.IgniteConfiguration;
+
+ /**
+ *
+ */
+ public class GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest extends
+ GridCacheAtomicMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
++ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
++ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ cfg.setLateAffinityAssignment(false);
+
+ return cfg;
+ }
+ }
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java
index 5458d01,d5e0481..6596d2f
--- 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
@@@ -17,12 -17,10 +17,9 @@@
package org.apache.ignite.internal.processors.cache.distributed.near;
- import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
--import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
- import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
index 0c6d2b9,c194eb0..5500da8
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java
@@@ -57,11 -48,9 +48,9 @@@ public class GridCacheAtomicOffHeapFull
}
/** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
+ CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
- ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
-
return ccfg;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
index e45b30c,d973144..90eb372
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java
@@@ -58,11 -49,9 +49,9 @@@ public class GridCacheAtomicOffHeapMult
}
/** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
+ CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
- ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
-
return ccfg;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java
index 28080b7,0000000..e69de29
mode 100644,000000..100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 5d2ec39,3789873..fcf373b
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@@ -106,11 -105,10 +105,10 @@@ public class GridCacheNearOnlyMultiNode
}
/** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
- CacheConfiguration cfg = super.cacheConfiguration(gridName);
+ @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
+ CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setAtomicWriteOrderMode(PRIMARY);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java
index 7f31979,e828a8b..52a8996
--- 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
@@@ -17,11 -17,9 +17,8 @@@
package org.apache.ignite.internal.processors.cache.distributed.replicated;
- import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
--import org.apache.ignite.configuration.CacheConfiguration;
- import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
index 2d00d21,0000000..e69de29
mode 100644,000000..100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
index 96a8a33,11dd423..62582df
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
@@@ -228,6 -206,10 +205,9 @@@ public class IgniteCacheFullApiSelfTest
suite.addTestSuite(GridCacheReplicatedFullApiMultithreadedSelfTest.class);
suite.addTestSuite(GridCachePartitionedFullApiMultithreadedSelfTest.class);
+ // Disabled striped pool.
+ suite.addTestSuite(GridCacheAtomicNoStripedPoolMultiNodeFullApiSelfTest.class);
- suite.addTestSuite(GridCachePartitionedNoStripedPoolMultiNodeFullApiSelfTest.class);
+
// Other.
suite.addTestSuite(GridCacheClearSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/cpp/core-test/config/cache-test.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
index 4f48ea5,78de9c9..944e858
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
@@@ -235,11 -234,7 +235,10 @@@ namespace Apache.Ignite.Core.Cache.Conf
/// <param name="reader">The reader.</param>
internal CacheConfiguration(IBinaryRawReader reader)
{
+ // Make sure system marshaller is used.
+ Debug.Assert(((BinaryReader) reader).Marshaller == BinaryUtils.Marshaller);
+
AtomicityMode = (CacheAtomicityMode) reader.ReadInt();
- AtomicWriteOrderMode = (CacheAtomicWriteOrderMode) reader.ReadInt();
Backups = reader.ReadInt();
CacheMode = (CacheMode) reader.ReadInt();
CopyOnRead = reader.ReadBoolean();
@@@ -300,11 -290,7 +299,10 @@@
/// <param name="writer">The writer.</param>
internal void Write(IBinaryRawWriter writer)
{
+ // Make sure system marshaller is used.
+ Debug.Assert(((BinaryWriter) writer).Marshaller == BinaryUtils.Marshaller);
+
writer.WriteInt((int) AtomicityMode);
- writer.WriteInt((int) AtomicWriteOrderMode);
writer.WriteInt(Backups);
writer.WriteInt((int) CacheMode);
writer.WriteBoolean(CopyOnRead);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
[27/39] ignite git commit: Remove updateTime.
Posted by ag...@apache.org.
Remove updateTime.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/20a87f83
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/20a87f83
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/20a87f83
Branch: refs/heads/ignite-4587
Commit: 20a87f832e4b3f46c8da511e85e08f1f6203b693
Parents: bdc8f20
Author: Max Kozlov <dr...@gmail.com>
Authored: Thu Mar 9 18:29:23 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Thu Mar 9 18:29:23 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/cache/CacheEntry.java | 11 ------
.../processors/cache/CacheEntryImplEx.java | 8 +----
.../cache/GridCacheAtomicVersionComparator.java | 7 ----
.../processors/cache/GridCacheMvcc.java | 23 +++++-------
.../processors/cache/GridCacheUtils.java | 1 -
.../version/GridCachePlainVersionedEntry.java | 5 ---
.../version/GridCacheRawVersionedEntry.java | 5 ---
.../cache/version/GridCacheVersion.java | 37 +++-----------------
.../cache/version/GridCacheVersionEx.java | 1 -
.../cache/version/GridCacheVersionedEntry.java | 7 ----
.../ignite/internal/util/IgniteUtils.java | 12 ++-----
.../CacheVersionedEntryAbstractTest.java | 2 --
12 files changed, 16 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
index 19585a3..90f30a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
@@ -82,15 +82,4 @@ public interface CacheEntry<K, V> extends Cache.Entry<K, V> {
* @return Version of this cache entry.
*/
public Comparable version();
-
- /**
- * Returns the time when the cache entry for the given key has been updated or initially created.
- * <p>
- * It is valid to compare cache entries' update time for the same key. In this case the latter update will
- * be represented by higher update time. The result of update time comparison of cache entries of different keys is
- * undefined.
- *
- * @return Time in milliseconds.
- */
- public long updateTime();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
index af926c6..664b216 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
@@ -70,11 +70,6 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach
}
/** {@inheritDoc} */
- @Override public long updateTime() {
- return ver.globalTime();
- }
-
- /** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal(out);
@@ -96,8 +91,7 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach
if (ver != null && ver != GET_ENTRY_INVALID_VER_AFTER_GET && ver != GET_ENTRY_INVALID_VER_UPDATED) {
res += ", topVer=" + ver.topologyVersion() +
", nodeOrder=" + ver.nodeOrder() +
- ", order=" + ver.order() +
- ", updateTime=" + ver.globalTime();
+ ", order=" + ver.order();
}
else
res += ", ver=n/a";
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/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 08a5b28..eba1edb 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
@@ -36,10 +36,6 @@ public class GridCacheAtomicVersionComparator {
int otherTopVer = other.topologyVersion();
if (topVer == otherTopVer) {
- long globalTime = one.globalTime();
- long otherGlobalTime = other.globalTime();
-
- if (globalTime == otherGlobalTime || ignoreTime) {
long locOrder = one.order();
long otherLocOrder = other.order();
@@ -51,9 +47,6 @@ public class GridCacheAtomicVersionComparator {
}
else
return locOrder > otherLocOrder ? 1 : -1;
- }
- else
- return globalTime > otherGlobalTime ? 1 : -1;
}
else
return topVer > otherTopVer ? 1 : -1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index 498584c..28cc8fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -57,26 +57,19 @@ public final class GridCacheMvcc {
/** */
private static final Comparator<GridCacheVersion> SER_VER_COMPARATOR = new Comparator<GridCacheVersion>() {
@Override public int compare(GridCacheVersion ver1, GridCacheVersion ver2) {
- long time1 = ver1.globalTime();
- long time2 = ver2.globalTime();
+ int nodeOrder1 = ver1.nodeOrder();
+ int nodeOrder2 = ver2.nodeOrder();
- if (time1 == time2) {
- int nodeOrder1 = ver1.nodeOrder();
- int nodeOrder2 = ver2.nodeOrder();
+ if (nodeOrder1 == nodeOrder2) {
+ long order1 = ver1.order();
+ long order2 = ver2.order();
- if (nodeOrder1 == nodeOrder2) {
- long order1 = ver1.order();
- long order2 = ver2.order();
+ assert order1 != order2;
- assert order1 != order2;
-
- return order1 > order2 ? 1 : -1;
- }
- else
- return nodeOrder1 > nodeOrder2 ? 1 : -1;
+ return order1 > order2 ? 1 : -1;
}
else
- return time1 > time2 ? 1 : -1;
+ return nodeOrder1 > nodeOrder2 ? 1 : -1;
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 1c59390..6b235dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -984,7 +984,6 @@ public class GridCacheUtils {
byte[] bytes = new byte[28];
U.intToBytes(ver.topologyVersion(), bytes, 0);
- U.longToBytes(ver.globalTime(), bytes, 4);
U.longToBytes(ver.order(), bytes, 12);
U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20);
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
index c175e5a..f4d7e08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
@@ -110,11 +110,6 @@ public class GridCachePlainVersionedEntry<K, V> implements GridCacheVersionedEnt
}
/** {@inheritDoc} */
- @Override public long globalTime() {
- return isStartVer ? 0L : ver.globalTime();
- }
-
- /** {@inheritDoc} */
@Override public GridCacheVersion version() {
return ver;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
index b7c96b4..7513935 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
@@ -170,11 +170,6 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen
}
/** {@inheritDoc} */
- @Override public long globalTime() {
- return ver.globalTime();
- }
-
- /** {@inheritDoc} */
@Override public GridCacheVersion version() {
return ver;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/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 a82f81a..6e47696 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
@@ -50,9 +50,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** Node order (used as global order) and DR ID. */
private int nodeOrderDrId;
- /** Globally adjusted time. */
- private long globalTime;
-
/** Order. */
private long order;
@@ -113,13 +110,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
}
/**
- * @return Adjusted time.
- */
- public long globalTime() {
- return globalTime;
- }
-
- /**
* @return Version order.
*/
public long order() {
@@ -183,7 +173,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
* @return Version represented as {@code GridUuid}
*/
public IgniteUuid asGridUuid() {
- return new IgniteUuid(new UUID(((long)topVer << 32) | nodeOrderDrId, globalTime), order);
+ return new IgniteUuid(new UUID(topVer << 32, nodeOrderDrId << 32), order);
}
/** {@inheritDoc} */
@@ -194,7 +184,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeInt(topVer);
- out.writeLong(globalTime);
out.writeLong(order);
out.writeInt(nodeOrderDrId);
}
@@ -202,7 +191,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException {
topVer = in.readInt();
- globalTime = in.readLong();
order = in.readLong();
nodeOrderDrId = in.readInt();
}
@@ -260,24 +248,18 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
switch (writer.state()) {
case 0:
- if (!writer.writeLong("globalTime", globalTime))
- return false;
-
- writer.incrementState();
-
- case 1:
if (!writer.writeInt("nodeOrderDrId", nodeOrderDrId))
return false;
writer.incrementState();
- case 2:
+ case 1:
if (!writer.writeLong("order", order))
return false;
writer.incrementState();
- case 3:
+ case 2:
if (!writer.writeInt("topVer", topVer))
return false;
@@ -297,14 +279,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
switch (reader.state()) {
case 0:
- globalTime = reader.readLong("globalTime");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
nodeOrderDrId = reader.readInt("nodeOrderDrId");
if (!reader.isLastRead())
@@ -312,7 +286,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
reader.incrementState();
- case 2:
+ case 1:
order = reader.readLong("order");
if (!reader.isLastRead())
@@ -320,7 +294,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
reader.incrementState();
- case 3:
+ case 2:
topVer = reader.readInt("topVer");
if (!reader.isLastRead())
@@ -346,7 +320,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public String toString() {
return "GridCacheVersion [topVer=" + topologyVersion() +
- ", time=" + globalTime() +
", order=" + order() +
", nodeOrder=" + nodeOrder() + ']';
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index 210b108..c3f16e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -160,7 +160,6 @@ public class GridCacheVersionEx extends GridCacheVersion {
/** {@inheritDoc} */
@Override public String toString() {
return "GridCacheVersionEx [topVer=" + topologyVersion() +
- ", time=" + globalTime() +
", order=" + order() +
", nodeOrder=" + nodeOrder() +
", drVer=" + drVer + ']';
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
index 06e7999..e685d79 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
@@ -71,11 +71,4 @@ public interface GridCacheVersionedEntry<K, V> {
* @return Entry's order in initiator data center
*/
public long order();
-
- /**
- * Gets entry's global time in initiator data center.
- *
- * @return Entry's global time in initiator data center
- */
- public long globalTime();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 1d2f5e8..928a31c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9217,11 +9217,7 @@ public abstract class IgniteUtils {
GridUnsafe.putInt(arr, off, drVer.nodeOrderAndDrIdRaw());
- off += 4;
-
- GridUnsafe.putLong(arr, off, drVer.globalTime());
-
- off += 8;
+ off += 12;
GridUnsafe.putLong(arr, off, drVer.order());
@@ -9234,11 +9230,7 @@ public abstract class IgniteUtils {
GridUnsafe.putInt(arr, off, ver.nodeOrderAndDrIdRaw());
- off += 4;
-
- GridUnsafe.putLong(arr, off, ver.globalTime());
-
- off += 8;
+ off += 12;
GridUnsafe.putLong(arr, off, ver.order());
http://git-wip-us.apache.org/repos/asf/ignite/blob/20a87f83/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
index 37cf26d..d1c0f31 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
@@ -155,7 +155,6 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
});
assert ver1.version().compareTo(ver2.version()) < 0;
- assert ver1.updateTime() <= ver2.updateTime();
}
/**
@@ -165,7 +164,6 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
assertNotNull(entry);
assertNotNull(entry.version());
- assert entry.updateTime() > 0;
assertNotNull(entry.getKey());
assertNotNull(entry.getValue());
[24/39] ignite git commit: Remove GridClockSyncProcessor and related
code removed.
Posted by ag...@apache.org.
Remove GridClockSyncProcessor and related code removed.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b02f81f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b02f81f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b02f81f
Branch: refs/heads/ignite-4587
Commit: 9b02f81f2e9d21ad2c2ad4e5fe4efd52545f59fb
Parents: 6265f33
Author: Max Kozlov <dr...@gmail.com>
Authored: Tue Mar 7 14:45:24 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Tue Mar 7 14:45:24 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/cache/CacheEntry.java | 11 -
.../ignite/internal/GridKernalContext.java | 8 -
.../ignite/internal/GridKernalContextImpl.java | 12 -
.../apache/ignite/internal/IgniteKernal.java | 2 -
.../processors/cache/CacheEntryImplEx.java | 8 +-
.../cache/GridCacheAtomicVersionComparator.java | 21 +-
.../processors/cache/GridCacheMapEntry.java | 1 -
.../processors/cache/GridCacheMvcc.java | 23 +-
.../processors/cache/GridCacheUtils.java | 1 -
.../cache/transactions/IgniteTxManager.java | 2 +-
.../version/GridCachePlainVersionedEntry.java | 5 -
.../version/GridCacheRawVersionedEntry.java | 5 -
.../cache/version/GridCacheVersion.java | 37 +-
.../cache/version/GridCacheVersionEx.java | 11 +-
.../cache/version/GridCacheVersionManager.java | 9 +-
.../cache/version/GridCacheVersionedEntry.java | 7 -
.../processors/clock/GridClockServer.java | 6 -
.../clock/GridClockSyncProcessor.java | 481 -------------------
.../ignite/internal/util/IgniteUtils.java | 30 +-
.../cache/GridCacheMvccFlagsTest.java | 4 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 2 +-
.../processors/cache/GridCacheMvccSelfTest.java | 8 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../cache/GridCacheVersionSelfTest.java | 4 +-
.../CacheVersionedEntryAbstractTest.java | 2 -
.../clock/GridTimeSyncProcessorSelfTest.java | 224 ---------
26 files changed, 43 insertions(+), 883 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
index 19585a3..90f30a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
@@ -82,15 +82,4 @@ public interface CacheEntry<K, V> extends Cache.Entry<K, V> {
* @return Version of this cache entry.
*/
public Comparable version();
-
- /**
- * Returns the time when the cache entry for the given key has been updated or initially created.
- * <p>
- * It is valid to compare cache entries' update time for the same key. In this case the latter update will
- * be represented by higher update time. The result of update time comparison of cache entries of different keys is
- * undefined.
- *
- * @return Time in milliseconds.
- */
- public long updateTime();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 00696c7..1c39f9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -37,7 +37,6 @@ import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
import org.apache.ignite.internal.processors.clock.GridClockSource;
-import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
@@ -178,13 +177,6 @@ public interface GridKernalContext extends Iterable<GridComponent> {
public GridTimeoutProcessor timeout();
/**
- * Gets time processor.
- *
- * @return Time processor.
- */
- public GridClockSyncProcessor clockSync();
-
- /**
* Gets resource processor.
*
* @return Resource processor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index e80ec6b..24bb97a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -52,7 +52,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
import org.apache.ignite.internal.processors.clock.GridClockSource;
-import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
import org.apache.ignite.internal.processors.clock.GridJvmClockSource;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
@@ -186,10 +185,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/** */
@GridToStringInclude
- private GridClockSyncProcessor clockSyncProc;
-
- /** */
- @GridToStringInclude
private GridResourceProcessor rsrcProc;
/** */
@@ -514,8 +509,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
jobProc = (GridJobProcessor)comp;
else if (comp instanceof GridTimeoutProcessor)
timeProc = (GridTimeoutProcessor)comp;
- else if (comp instanceof GridClockSyncProcessor)
- clockSyncProc = (GridClockSyncProcessor)comp;
else if (comp instanceof GridResourceProcessor)
rsrcProc = (GridResourceProcessor)comp;
else if (comp instanceof GridJobMetricsProcessor)
@@ -637,11 +630,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
}
/** {@inheritDoc} */
- @Override public GridClockSyncProcessor clockSync() {
- return clockSyncProc;
- }
-
- /** {@inheritDoc} */
@Override public GridResourceProcessor resource() {
return rsrcProc;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index cdbe2e3..77ba212 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -108,7 +108,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
-import org.apache.ignite.internal.processors.clock.GridClockSyncProcessor;
import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor;
@@ -891,7 +890,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Start processors before discovery manager, so they will
// be able to start receiving messages once discovery completes.
startProcessor(createComponent(DiscoveryNodeValidationProcessor.class, ctx));
- startProcessor(new GridClockSyncProcessor(ctx));
startProcessor(new GridAffinityProcessor(ctx));
startProcessor(createComponent(GridSegmentationProcessor.class, ctx));
startProcessor(createComponent(IgniteCacheObjectProcessor.class, ctx));
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
index af926c6..664b216 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImplEx.java
@@ -70,11 +70,6 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach
}
/** {@inheritDoc} */
- @Override public long updateTime() {
- return ver.globalTime();
- }
-
- /** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal(out);
@@ -96,8 +91,7 @@ public class CacheEntryImplEx<K, V> extends CacheEntryImpl<K, V> implements Cach
if (ver != null && ver != GET_ENTRY_INVALID_VER_AFTER_GET && ver != GET_ENTRY_INVALID_VER_UPDATED) {
res += ", topVer=" + ver.topologyVersion() +
", nodeOrder=" + ver.nodeOrder() +
- ", order=" + ver.order() +
- ", updateTime=" + ver.globalTime();
+ ", order=" + ver.order();
}
else
res += ", ver=n/a";
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/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 08a5b28..ac0abec 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
@@ -36,24 +36,17 @@ public class GridCacheAtomicVersionComparator {
int otherTopVer = other.topologyVersion();
if (topVer == otherTopVer) {
- long globalTime = one.globalTime();
- long otherGlobalTime = other.globalTime();
+ long locOrder = one.order();
+ long otherLocOrder = other.order();
- if (globalTime == otherGlobalTime || ignoreTime) {
- long locOrder = one.order();
- long otherLocOrder = other.order();
+ if (locOrder == otherLocOrder) {
+ int nodeOrder = one.nodeOrder();
+ int otherNodeOrder = other.nodeOrder();
- if (locOrder == otherLocOrder) {
- int nodeOrder = one.nodeOrder();
- int otherNodeOrder = other.nodeOrder();
-
- return nodeOrder == otherNodeOrder ? 0 : nodeOrder < otherNodeOrder ? -1 : 1;
- }
- else
- return locOrder > otherLocOrder ? 1 : -1;
+ return nodeOrder == otherNodeOrder ? 0 : nodeOrder < otherNodeOrder ? -1 : 1;
}
else
- return globalTime > otherGlobalTime ? 1 : -1;
+ return locOrder > otherLocOrder ? 1 : -1;
}
else
return topVer > otherTopVer ? 1 : -1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/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 c33b60d..68d171c 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
@@ -2384,7 +2384,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
// Incorporate conflict version into new version if needed.
if (conflictVer != null && conflictVer != newVer)
newVer = new GridCacheVersionEx(newVer.topologyVersion(),
- newVer.globalTime(),
newVer.order(),
newVer.nodeOrder(),
newVer.dataCenterId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index 498584c..28cc8fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -57,26 +57,19 @@ public final class GridCacheMvcc {
/** */
private static final Comparator<GridCacheVersion> SER_VER_COMPARATOR = new Comparator<GridCacheVersion>() {
@Override public int compare(GridCacheVersion ver1, GridCacheVersion ver2) {
- long time1 = ver1.globalTime();
- long time2 = ver2.globalTime();
+ int nodeOrder1 = ver1.nodeOrder();
+ int nodeOrder2 = ver2.nodeOrder();
- if (time1 == time2) {
- int nodeOrder1 = ver1.nodeOrder();
- int nodeOrder2 = ver2.nodeOrder();
+ if (nodeOrder1 == nodeOrder2) {
+ long order1 = ver1.order();
+ long order2 = ver2.order();
- if (nodeOrder1 == nodeOrder2) {
- long order1 = ver1.order();
- long order2 = ver2.order();
+ assert order1 != order2;
- assert order1 != order2;
-
- return order1 > order2 ? 1 : -1;
- }
- else
- return nodeOrder1 > nodeOrder2 ? 1 : -1;
+ return order1 > order2 ? 1 : -1;
}
else
- return time1 > time2 ? 1 : -1;
+ return nodeOrder1 > nodeOrder2 ? 1 : -1;
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 1c59390..6b235dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -984,7 +984,6 @@ public class GridCacheUtils {
byte[] bytes = new byte[28];
U.intToBytes(ver.topologyVersion(), bytes, 0);
- U.longToBytes(ver.globalTime(), bytes, 4);
U.longToBytes(ver.order(), bytes, 12);
U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index a1a18fe..2f12a1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -2426,7 +2426,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
* @param nearVer Near transaction version.
*/
private CommittedVersion(GridCacheVersion ver, GridCacheVersion nearVer) {
- super(ver.topologyVersion(), ver.globalTime(), ver.order(), ver.nodeOrder(), ver.dataCenterId());
+ super(ver.topologyVersion(), ver.order(), ver.nodeOrder(), ver.dataCenterId());
assert nearVer != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
index c175e5a..f4d7e08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCachePlainVersionedEntry.java
@@ -110,11 +110,6 @@ public class GridCachePlainVersionedEntry<K, V> implements GridCacheVersionedEnt
}
/** {@inheritDoc} */
- @Override public long globalTime() {
- return isStartVer ? 0L : ver.globalTime();
- }
-
- /** {@inheritDoc} */
@Override public GridCacheVersion version() {
return ver;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
index b7c96b4..7513935 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
@@ -170,11 +170,6 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen
}
/** {@inheritDoc} */
- @Override public long globalTime() {
- return ver.globalTime();
- }
-
- /** {@inheritDoc} */
@Override public GridCacheVersion version() {
return ver;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/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 ccc17e5..f191c64 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
@@ -50,9 +50,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** Node order (used as global order) and DR ID. */
private int nodeOrderDrId;
- /** Globally adjusted time. */
- private long globalTime;
-
/** Order. */
private long order;
@@ -65,12 +62,11 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/**
* @param topVer Topology version plus number of seconds from the start time of the first grid node.
- * @param globalTime Globally adjusted time.
* @param order Version order.
* @param nodeOrder Node order.
* @param dataCenterId Replication data center ID.
*/
- public GridCacheVersion(int topVer, long globalTime, long order, int nodeOrder, int dataCenterId) {
+ public GridCacheVersion(int topVer, long order, int nodeOrder, int dataCenterId) {
assert topVer >= 0 : topVer;
assert order >= 0 : order;
assert nodeOrder >= 0 : nodeOrder;
@@ -80,7 +76,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
throw new IllegalArgumentException("Node order overflow: " + nodeOrder);
this.topVer = topVer;
- this.globalTime = globalTime;
this.order = order;
nodeOrderDrId = nodeOrder | (dataCenterId << DR_ID_SHIFT);
@@ -90,13 +85,11 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/**
* @param topVer Topology version plus number of seconds from the start time of the first grid node.
* @param nodeOrderDrId Node order and DR ID.
- * @param globalTime Globally adjusted time.
* @param order Version order.
*/
- public GridCacheVersion(int topVer, int nodeOrderDrId, long globalTime, long order) {
+ public GridCacheVersion(int topVer, int nodeOrderDrId, long order) {
this.topVer = topVer;
this.nodeOrderDrId = nodeOrderDrId;
- this.globalTime = globalTime;
this.order = order;
}
@@ -117,13 +110,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
}
/**
- * @return Adjusted time.
- */
- public long globalTime() {
- return globalTime;
- }
-
- /**
* @return Version order.
*/
public long order() {
@@ -187,7 +173,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
* @return Version represented as {@code GridUuid}
*/
public IgniteUuid asGridUuid() {
- return new IgniteUuid(new UUID(((long)topVer << 32) | nodeOrderDrId, globalTime), order);
+ return new IgniteUuid(new UUID(nodeOrderDrId << 32, topVer << 32), order);
}
/** {@inheritDoc} */
@@ -198,7 +184,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeInt(topVer);
- out.writeLong(globalTime);
out.writeLong(order);
out.writeInt(nodeOrderDrId);
}
@@ -206,7 +191,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException {
topVer = in.readInt();
- globalTime = in.readLong();
order = in.readLong();
nodeOrderDrId = in.readInt();
}
@@ -263,12 +247,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
}
switch (writer.state()) {
- case 0:
- if (!writer.writeLong("globalTime", globalTime))
- return false;
-
- writer.incrementState();
-
case 1:
if (!writer.writeInt("nodeOrderDrId", nodeOrderDrId))
return false;
@@ -300,14 +278,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
return false;
switch (reader.state()) {
- case 0:
- globalTime = reader.readLong("globalTime");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 1:
nodeOrderDrId = reader.readInt("nodeOrderDrId");
@@ -350,7 +320,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/** {@inheritDoc} */
@Override public String toString() {
return "GridCacheVersion [topVer=" + topologyVersion() +
- ", time=" + globalTime() +
", order=" + order() +
", nodeOrder=" + nodeOrder() + ']';
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index c89b941..e376366 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -46,15 +46,14 @@ public class GridCacheVersionEx extends GridCacheVersion {
* Constructor.
*
* @param topVer Topology version.
- * @param globalTime Global time.
* @param order Order.
* @param nodeOrder Node order.
* @param dataCenterId Data center ID.
* @param drVer DR version.
*/
- public GridCacheVersionEx(int topVer, long globalTime, long order, int nodeOrder, byte dataCenterId,
+ public GridCacheVersionEx(int topVer, long order, int nodeOrder, byte dataCenterId,
GridCacheVersion drVer) {
- super(topVer, globalTime, order, nodeOrder, dataCenterId);
+ super(topVer, order, nodeOrder, dataCenterId);
assert drVer != null && !(drVer instanceof GridCacheVersionEx); // DR version can only be plain here.
@@ -66,12 +65,11 @@ public class GridCacheVersionEx extends GridCacheVersion {
*
* @param topVer Topology version.
* @param nodeOrderDrId Node order and DR ID.
- * @param globalTime Globally adjusted time.
* @param order Version order.
* @param drVer DR version.
*/
- public GridCacheVersionEx(int topVer, int nodeOrderDrId, long globalTime, long order, GridCacheVersion drVer) {
- super(topVer, nodeOrderDrId, globalTime, order);
+ public GridCacheVersionEx(int topVer, int nodeOrderDrId, long order, GridCacheVersion drVer) {
+ super(topVer, nodeOrderDrId, order);
assert drVer != null && !(drVer instanceof GridCacheVersionEx); // DR version can only be plain here.
@@ -162,7 +160,6 @@ public class GridCacheVersionEx extends GridCacheVersion {
/** {@inheritDoc} */
@Override public String toString() {
return "GridCacheVersionEx [topVer=" + topologyVersion() +
- ", time=" + globalTime() +
", order=" + order() +
", nodeOrder=" + nodeOrder() +
", drVer=" + drVer + ']';
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
index 5a8904f..15a7d2a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
@@ -79,7 +79,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
/** {@inheritDoc} */
@Override public void start0() throws IgniteCheckedException {
- last = new GridCacheVersion(0, 0, order.get(), 0, dataCenterId);
+ last = new GridCacheVersion(0, order.get(), 0, dataCenterId);
cctx.gridEvents().addLocalEventListener(discoLsnr, EVT_NODE_METRICS_UPDATED);
}
@@ -103,7 +103,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
public void dataCenterId(byte dataCenterId) {
this.dataCenterId = dataCenterId;
- last = new GridCacheVersion(0, 0, order.get(), 0, dataCenterId);
+ last = new GridCacheVersion(0, order.get(), 0, dataCenterId);
}
/**
@@ -185,7 +185,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
topVer += (gridStartTime - TOP_VER_BASE_TIME) / 1000;
- ISOLATED_STREAMER_VER = new GridCacheVersion((int)topVer, 0, 0, 1, dataCenterId);
+ ISOLATED_STREAMER_VER = new GridCacheVersion((int)topVer, 0, 1, dataCenterId);
}
return ISOLATED_STREAMER_VER;
@@ -271,8 +271,6 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
if (topVer == -1)
topVer = cctx.kernalContext().discovery().topologyVersion();
- long globalTime = cctx.kernalContext().clockSync().adjustedTime(topVer);
-
if (addTime) {
if (gridStartTime == 0)
gridStartTime = cctx.kernalContext().discovery().gridStartTime();
@@ -286,7 +284,6 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
GridCacheVersion next = new GridCacheVersion(
(int)topVer,
- globalTime,
ord,
locNodeOrder,
dataCenterId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
index 06e7999..e685d79 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionedEntry.java
@@ -71,11 +71,4 @@ public interface GridCacheVersionedEntry<K, V> {
* @return Entry's order in initiator data center
*/
public long order();
-
- /**
- * Gets entry's global time in initiator data center.
- *
- * @return Entry's global time in initiator data center
- */
- public long globalTime();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
index 8daef31..a736a37 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java
@@ -47,9 +47,6 @@ public class GridClockServer {
/** Read worker. */
private GridWorker readWorker;
- /** Instance of time processor. */
- private GridClockSyncProcessor clockSync;
-
/**
* Starts server.
*
@@ -59,7 +56,6 @@ public class GridClockServer {
public void start(GridKernalContext ctx) throws IgniteCheckedException {
this.ctx = ctx;
- clockSync = ctx.clockSync();
log = ctx.log(GridClockServer.class);
try {
@@ -205,8 +201,6 @@ public class GridClockServer {
GridClockMessage msg = GridClockMessage.fromBytes(packet.getData(), packet.getOffset(),
packet.getLength());
-
- clockSync.onMessageReceived(msg, packet.getAddress(), packet.getPort());
}
catch (IgniteCheckedException e) {
U.warn(log, "Failed to assemble clock server message (will ignore the packet) [host=" +
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
deleted file mode 100644
index 257d0d9..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.net.InetAddress;
-import java.util.Collection;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.UUID;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.events.DiscoveryEvent;
-import org.apache.ignite.events.Event;
-import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.managers.communication.GridMessageListener;
-import org.apache.ignite.internal.managers.discovery.GridDiscoveryTopologySnapshot;
-import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
-import org.apache.ignite.internal.processors.GridProcessorAdapter;
-import org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap;
-import org.apache.ignite.internal.util.GridSpinReadWriteLock;
-import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.internal.LT;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.util.worker.GridWorker;
-import org.apache.ignite.thread.IgniteThread;
-
-import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
-import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
-import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
-import static org.apache.ignite.internal.GridTopic.TOPIC_TIME_SYNC;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TIME_SERVER_HOST;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TIME_SERVER_PORT;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
-
-/**
- * Time synchronization processor.
- */
-public class GridClockSyncProcessor extends GridProcessorAdapter {
- /** Maximum size for time sync history. */
- private static final int MAX_TIME_SYNC_HISTORY = 100;
-
- /** Time server instance. */
- private GridClockServer srv;
-
- /** Shutdown lock. */
- private GridSpinReadWriteLock rw = new GridSpinReadWriteLock();
-
- /** Stopping flag. */
- private volatile boolean stopping;
-
- /** Time coordinator thread. */
- private volatile TimeCoordinator timeCoord;
-
- /** Time delta history. Constructed on coordinator. */
- private NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> timeSyncHist =
- new GridBoundedConcurrentOrderedMap<>(MAX_TIME_SYNC_HISTORY);
-
- /** Last recorded. */
- private volatile T2<GridClockDeltaVersion, GridClockDeltaSnapshot> lastSnapshot;
-
- /** Time source. */
- private GridClockSource clockSrc;
-
- /**
- * @param ctx Kernal context.
- */
- public GridClockSyncProcessor(GridKernalContext ctx) {
- super(ctx);
- }
-
- /** {@inheritDoc} */
- @Override public void start() throws IgniteCheckedException {
- super.start();
-
- clockSrc = ctx.timeSource();
-
- srv = new GridClockServer();
-
- srv.start(ctx);
-
- ctx.io().addMessageListener(TOPIC_TIME_SYNC, new GridMessageListener() {
- @Override public void onMessage(UUID nodeId, Object msg) {
- assert msg instanceof GridClockDeltaSnapshotMessage;
-
- GridClockDeltaSnapshotMessage msg0 = (GridClockDeltaSnapshotMessage)msg;
-
- GridClockDeltaVersion ver = msg0.snapshotVersion();
-
- GridClockDeltaSnapshot snap = new GridClockDeltaSnapshot(ver, msg0.deltas());
-
- lastSnapshot = new T2<>(ver, snap);
-
- timeSyncHist.put(ver, snap);
- }
- });
-
- // We care only about node leave and fail events.
- ctx.event().addLocalEventListener(new GridLocalEventListener() {
- @Override public void onEvent(Event evt) {
- assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_JOINED;
-
- DiscoveryEvent discoEvt = (DiscoveryEvent)evt;
-
- if (evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED)
- checkLaunchCoordinator(discoEvt);
-
- TimeCoordinator timeCoord0 = timeCoord;
-
- if (timeCoord0 != null)
- timeCoord0.onDiscoveryEvent(discoEvt);
- }
- }, EVT_NODE_LEFT, EVT_NODE_FAILED, EVT_NODE_JOINED);
-
- ctx.addNodeAttribute(ATTR_TIME_SERVER_HOST, srv.host());
- ctx.addNodeAttribute(ATTR_TIME_SERVER_PORT, srv.port());
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStart() throws IgniteCheckedException {
- super.onKernalStart();
-
- srv.afterStart();
-
- // Check at startup if this node is a fragmentizer coordinator.
- DiscoveryEvent locJoinEvt = ctx.discovery().localJoinEvent();
-
- checkLaunchCoordinator(locJoinEvt);
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStop(boolean cancel) {
- super.onKernalStop(cancel);
-
- rw.writeLock();
-
- try {
- stopping = false;
-
- if (timeCoord != null) {
- timeCoord.cancel();
-
- U.join(timeCoord, log);
-
- timeCoord = null;
- }
-
- if (srv != null)
- srv.beforeStop();
- }
- finally {
- rw.writeUnlock();
- }
- }
-
- /** {@inheritDoc} */
- @Override public void stop(boolean cancel) throws IgniteCheckedException {
- super.stop(cancel);
-
- if (srv != null)
- srv.stop();
- }
-
- /**
- * Gets current time on local node.
- *
- * @return Current time in milliseconds.
- */
- private long currentTime() {
- return clockSrc.currentTimeMillis();
- }
-
- /**
- * @return Time sync history.
- */
- public NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> timeSyncHistory() {
- return timeSyncHist;
- }
-
- /**
- * Callback from server for message receiving.
- *
- * @param msg Received message.
- * @param addr Remote node address.
- * @param port Remote node port.
- */
- public void onMessageReceived(GridClockMessage msg, InetAddress addr, int port) {
- long rcvTs = currentTime();
-
- if (!msg.originatingNodeId().equals(ctx.localNodeId())) {
- // We received time request from remote node, set current time and reply back.
- msg.replyTimestamp(rcvTs);
-
- try {
- srv.sendPacket(msg, addr, port);
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to send time server reply to remote node: " + msg, e);
- }
- }
- else
- timeCoord.onMessage(msg, rcvTs);
- }
-
- /**
- * Checks if local node is the oldest node in topology and starts time coordinator if so.
- *
- * @param discoEvt Discovery event.
- */
- private void checkLaunchCoordinator(DiscoveryEvent discoEvt) {
- rw.readLock();
-
- try {
- if (stopping)
- return;
-
- if (timeCoord == null) {
- long minNodeOrder = Long.MAX_VALUE;
-
- Collection<ClusterNode> nodes = discoEvt.topologyNodes();
-
- for (ClusterNode node : nodes) {
- if (node.order() < minNodeOrder)
- minNodeOrder = node.order();
- }
-
- ClusterNode locNode = ctx.discovery().localNode();
-
- if (locNode.order() == minNodeOrder) {
- if (log.isDebugEnabled())
- log.debug("Detected local node to be the eldest node in topology, starting time " +
- "coordinator thread [discoEvt=" + discoEvt + ", locNode=" + locNode + ']');
-
- synchronized (this) {
- if (timeCoord == null && !stopping) {
- timeCoord = new TimeCoordinator(discoEvt);
-
- IgniteThread th = new IgniteThread(timeCoord);
-
- th.setPriority(Thread.MAX_PRIORITY);
-
- th.start();
- }
- }
- }
- }
- }
- finally {
- rw.readUnlock();
- }
- }
-
- /**
- * Gets time adjusted with time coordinator on given topology version.
- *
- * @param topVer Topology version.
- * @return Adjusted time.
- */
- public long adjustedTime(long topVer) {
- T2<GridClockDeltaVersion, GridClockDeltaSnapshot> fastSnap = lastSnapshot;
-
- GridClockDeltaSnapshot snap;
-
- if (fastSnap != null && fastSnap.get1().topologyVersion() == topVer)
- snap = fastSnap.get2();
- else {
- // Get last synchronized time on given topology version.
- Map.Entry<GridClockDeltaVersion, GridClockDeltaSnapshot> entry = timeSyncHistory().lowerEntry(
- new GridClockDeltaVersion(0, topVer + 1));
-
- snap = entry == null ? null : entry.getValue();
- }
-
- long now = clockSrc.currentTimeMillis();
-
- if (snap == null)
- return now;
-
- Long delta = snap.deltas().get(ctx.localNodeId());
-
- if (delta == null)
- delta = 0L;
-
- return now + delta;
- }
-
- /**
- * Publishes snapshot to topology.
- *
- * @param snapshot Snapshot to publish.
- * @param top Topology to send given snapshot to.
- */
- private void publish(GridClockDeltaSnapshot snapshot, GridDiscoveryTopologySnapshot top) {
- if (!rw.tryReadLock())
- return;
-
- try {
- lastSnapshot = new T2<>(snapshot.version(), snapshot);
-
- timeSyncHist.put(snapshot.version(), snapshot);
-
- for (ClusterNode n : top.topologyNodes()) {
- GridClockDeltaSnapshotMessage msg = new GridClockDeltaSnapshotMessage(
- snapshot.version(), snapshot.deltas());
-
- try {
- ctx.io().send(n, TOPIC_TIME_SYNC, msg, SYSTEM_POOL);
- }
- catch (IgniteCheckedException e) {
- if (ctx.discovery().pingNodeNoError(n.id()))
- U.error(log, "Failed to send time sync snapshot to remote node (did not leave grid?) " +
- "[nodeId=" + n.id() + ", msg=" + msg + ", err=" + e.getMessage() + ']');
- else if (log.isDebugEnabled())
- log.debug("Failed to send time sync snapshot to remote node (did not leave grid?) " +
- "[nodeId=" + n.id() + ", msg=" + msg + ", err=" + e.getMessage() + ']');
- }
- }
- }
- finally {
- rw.readUnlock();
- }
- }
-
- /**
- * Time coordinator thread.
- */
- private class TimeCoordinator extends GridWorker {
- /** Last discovery topology snapshot. */
- private volatile GridDiscoveryTopologySnapshot lastSnapshot;
-
- /** Snapshot being constructed. May be not null only on coordinator node. */
- private volatile GridClockDeltaSnapshot pendingSnapshot;
-
- /** Version counter. */
- private long verCnt = 1;
-
- /**
- * Time coordinator thread constructor.
- *
- * @param evt Discovery event on which this node became a coordinator.
- */
- protected TimeCoordinator(DiscoveryEvent evt) {
- super(ctx.gridName(), "grid-time-coordinator", GridClockSyncProcessor.this.log);
-
- lastSnapshot = new GridDiscoveryTopologySnapshot(evt.topologyVersion(), evt.topologyNodes());
- }
-
- /** {@inheritDoc} */
- @Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException {
- while (!isCancelled()) {
- GridDiscoveryTopologySnapshot top = lastSnapshot;
-
- if (log.isDebugEnabled())
- log.debug("Creating time sync snapshot for topology: " + top);
-
- GridClockDeltaSnapshot snapshot = new GridClockDeltaSnapshot(
- new GridClockDeltaVersion(verCnt++, top.topologyVersion()),
- ctx.localNodeId(),
- top,
- ctx.config().getClockSyncSamples());
-
- pendingSnapshot = snapshot;
-
- while (!snapshot.ready()) {
- if (log.isDebugEnabled())
- log.debug("Requesting time from remote nodes: " + snapshot.pendingNodeIds());
-
- for (UUID nodeId : snapshot.pendingNodeIds())
- requestTime(nodeId);
-
- if (log.isDebugEnabled())
- log.debug("Waiting for snapshot to be ready: " + snapshot);
-
- // Wait for all replies
- snapshot.awaitReady(1000);
- }
-
- // No more messages should be processed.
- pendingSnapshot = null;
-
- if (log.isDebugEnabled())
- log.debug("Collected time sync results: " + snapshot.deltas());
-
- publish(snapshot, top);
-
- synchronized (this) {
- if (top.topologyVersion() == lastSnapshot.topologyVersion())
- wait(ctx.config().getClockSyncFrequency());
- }
- }
- }
-
- /**
- * @param evt Discovery event.
- */
- public void onDiscoveryEvent(DiscoveryEvent evt) {
- if (log.isDebugEnabled())
- log.debug("Processing discovery event: " + evt);
-
- if (evt.type() == EventType.EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT)
- onNodeLeft(evt.eventNode().id());
-
- synchronized (this) {
- lastSnapshot = new GridDiscoveryTopologySnapshot(evt.topologyVersion(), evt.topologyNodes());
-
- notifyAll();
- }
- }
-
- /**
- * @param msg Message received from remote node.
- * @param rcvTs Receive timestamp.
- */
- private void onMessage(GridClockMessage msg, long rcvTs) {
- GridClockDeltaSnapshot curr = pendingSnapshot;
-
- if (curr != null) {
- long delta = (msg.originatingTimestamp() + rcvTs) / 2 - msg.replyTimestamp();
-
- boolean needMore = curr.onDeltaReceived(msg.targetNodeId(), delta);
-
- if (needMore)
- requestTime(msg.targetNodeId());
- }
- }
-
- /**
- * Requests time from remote node.
- *
- * @param rmtNodeId Remote node ID.
- */
- private void requestTime(UUID rmtNodeId) {
- ClusterNode node = ctx.discovery().node(rmtNodeId);
-
- if (node != null) {
- InetAddress addr = node.attribute(ATTR_TIME_SERVER_HOST);
- int port = node.attribute(ATTR_TIME_SERVER_PORT);
-
- try {
- GridClockMessage req = new GridClockMessage(ctx.localNodeId(), rmtNodeId, currentTime(), 0);
-
- srv.sendPacket(req, addr, port);
- }
- catch (IgniteCheckedException e) {
- LT.error(log, e, "Failed to send time request to remote node [rmtNodeId=" + rmtNodeId +
- ", addr=" + addr + ", port=" + port + ']');
- }
- }
- else
- onNodeLeft(rmtNodeId);
- }
-
- /**
- * Node left callback.
- *
- * @param nodeId Left node ID.
- */
- private void onNodeLeft(UUID nodeId) {
- GridClockDeltaSnapshot curr = pendingSnapshot;
-
- if (curr != null)
- curr.onNodeLeft(nodeId);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index f6c8163..928a31c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9217,11 +9217,7 @@ public abstract class IgniteUtils {
GridUnsafe.putInt(arr, off, drVer.nodeOrderAndDrIdRaw());
- off += 4;
-
- GridUnsafe.putLong(arr, off, drVer.globalTime());
-
- off += 8;
+ off += 12;
GridUnsafe.putLong(arr, off, drVer.order());
@@ -9234,11 +9230,7 @@ public abstract class IgniteUtils {
GridUnsafe.putInt(arr, off, ver.nodeOrderAndDrIdRaw());
- off += 4;
-
- GridUnsafe.putLong(arr, off, ver.globalTime());
-
- off += 8;
+ off += 12;
GridUnsafe.putLong(arr, off, ver.order());
@@ -9255,7 +9247,6 @@ public abstract class IgniteUtils {
public static GridCacheVersion readVersion(long ptr, boolean verEx) {
GridCacheVersion ver = new GridCacheVersion(GridUnsafe.getInt(ptr),
GridUnsafe.getInt(ptr + 4),
- GridUnsafe.getLong(ptr + 8),
GridUnsafe.getLong(ptr + 16));
if (verEx) {
@@ -9263,7 +9254,6 @@ public abstract class IgniteUtils {
ver = new GridCacheVersionEx(GridUnsafe.getInt(ptr),
GridUnsafe.getInt(ptr + 4),
- GridUnsafe.getLong(ptr + 8),
GridUnsafe.getLong(ptr + 16),
ver);
}
@@ -9284,17 +9274,13 @@ public abstract class IgniteUtils {
int nodeOrderDrId = GridUnsafe.getInt(arr, off);
- off += 4;
-
- long globalTime = GridUnsafe.getLong(arr, off);
-
- off += 8;
+ off += 12;
long order = GridUnsafe.getLong(arr, off);
off += 8;
- GridCacheVersion ver = new GridCacheVersion(topVer, nodeOrderDrId, globalTime, order);
+ GridCacheVersion ver = new GridCacheVersion(topVer, nodeOrderDrId, order);
if (verEx) {
topVer = GridUnsafe.getInt(arr, off);
@@ -9303,15 +9289,11 @@ public abstract class IgniteUtils {
nodeOrderDrId = GridUnsafe.getInt(arr, off);
- off += 4;
-
- globalTime = GridUnsafe.getLong(arr, off);
-
- off += 8;
+ off += 12;
order = GridUnsafe.getLong(arr, off);
- ver = new GridCacheVersionEx(topVer, nodeOrderDrId, globalTime, order, ver);
+ ver = new GridCacheVersionEx(topVer, nodeOrderDrId, order, ver);
}
return ver;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
index ff2d62d..827b0a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
@@ -73,7 +73,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
UUID id = UUID.randomUUID();
- GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0, 0);
+ GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0);
GridCacheMvccCandidate c = new GridCacheMvccCandidate(
entry,
@@ -114,7 +114,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
UUID id = UUID.randomUUID();
- GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0, 0);
+ GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0);
GridCacheMvccCandidate c = new GridCacheMvccCandidate(
entry,
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
index 9da6ea6..ea0b986 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
@@ -991,7 +991,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @return Version.
*/
private GridCacheVersion version(int order) {
- return new GridCacheVersion(1, 0, order, order, 0);
+ return new GridCacheVersion(1, order, order, 0);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
index d352e26..ad50a40 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
@@ -174,8 +174,8 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
checkOrder(cands, ver1, ver5, ver3, ver2);
entry.orderCompleted(
- new GridCacheVersion(1, 0, 2, 0, 0),
- Arrays.asList(new GridCacheVersion(1, 0, 3, 4, 0), ver2, new GridCacheVersion(1, 0, 5, 6, 0)),
+ new GridCacheVersion(1, 2, 0, 0),
+ Arrays.asList(new GridCacheVersion(1, 3, 4, 0), ver2, new GridCacheVersion(1, 5, 6, 0)),
Collections.<GridCacheVersion>emptyList()
);
@@ -1053,7 +1053,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
entry.orderCompleted(
ver2 /*local version.*/,
- Arrays.asList(new GridCacheVersion(1, 0, 1, 2, 0), ver3, new GridCacheVersion(1, 0, 5, 6, 0)),
+ Arrays.asList(new GridCacheVersion(1, 1, 2, 0), ver3, new GridCacheVersion(1, 5, 6, 0)),
Collections.<GridCacheVersion>emptyList()
);
@@ -1619,7 +1619,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* @return Version.
*/
private GridCacheVersion version(int order) {
- return new GridCacheVersion(1, 0, order, order, 0);
+ return new GridCacheVersion(1, order, order, 0);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
index e76ab40..821807f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
@@ -52,7 +52,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
private long ttl;
/** Version. */
- private GridCacheVersion ver = new GridCacheVersion(0, 0, 0, 1, 0);
+ private GridCacheVersion ver = new GridCacheVersion(0, 0, 1, 0);
/** Obsolete version. */
private GridCacheVersion obsoleteVer = ver;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
index 8179dc5..475ccb5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
@@ -79,7 +79,7 @@ public class GridCacheVersionSelfTest extends GridCommonAbstractTest {
*/
public void testMarshalling() throws Exception {
GridCacheVersion ver = version(1, 1);
- GridCacheVersionEx verEx = new GridCacheVersionEx(2, 2, 0, 0, ver);
+ GridCacheVersionEx verEx = new GridCacheVersionEx(2, 2, 0, ver);
OptimizedMarshaller marsh = new OptimizedMarshaller(false);
@@ -101,6 +101,6 @@ public class GridCacheVersionSelfTest extends GridCommonAbstractTest {
* @return Cache version.
*/
private GridCacheVersion version(int nodeOrder, int drId) {
- return new GridCacheVersion(0, 0, 0, nodeOrder, drId);
+ return new GridCacheVersion(0, 0, nodeOrder, drId);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
index 37cf26d..d1c0f31 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java
@@ -155,7 +155,6 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
});
assert ver1.version().compareTo(ver2.version()) < 0;
- assert ver1.updateTime() <= ver2.updateTime();
}
/**
@@ -165,7 +164,6 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS
assertNotNull(entry);
assertNotNull(entry.version());
- assert entry.updateTime() > 0;
assertNotNull(entry.getKey());
assertNotNull(entry.getValue());
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b02f81f/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
deleted file mode 100644
index f5ba07d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.clock;
-
-import java.util.NavigableMap;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.GridKernalContextImpl;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.util.typedef.PA;
-import org.apache.ignite.lifecycle.LifecycleBean;
-import org.apache.ignite.lifecycle.LifecycleEventType;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-/**
- * Time sync processor self test.
- */
-public class GridTimeSyncProcessorSelfTest extends GridCommonAbstractTest {
- /** IP finder. */
- private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
- /** Number of grids in test. */
- public static final int GRID_CNT = 4;
-
- /** Starting grid index. */
- private int idx;
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
-
- discoSpi.setIpFinder(IP_FINDER);
-
- cfg.setDiscoverySpi(discoSpi);
-
- cfg.setLifecycleBeans(new TimeShiftLifecycleBean(idx * 2000));
-
- idx++;
-
- return cfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTimeSync() throws Exception {
- startGrids(GRID_CNT);
-
- try {
- // Check coordinator time deltas.
- final IgniteKernal kernal = (IgniteKernal)grid(0);
-
- // Wait for latest time sync history.
- GridTestUtils.waitForCondition(new PA() {
- @Override public boolean apply() {
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> hist = kernal.context().clockSync()
- .timeSyncHistory();
-
- info("Checking time sync history: " + hist);
-
- for (GridClockDeltaVersion ver : hist.keySet()) {
- if (ver.topologyVersion() == 4)
- return true;
- }
-
- return false;
- }
- }, 10000);
-
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> history = kernal.context().clockSync()
- .timeSyncHistory();
-
- GridClockDeltaSnapshot snap = history.lastEntry().getValue();
-
- assertEquals(3, snap.deltas().size());
-
- for (int i = 1; i < GRID_CNT; i++) {
- Long delta = snap.deltas().get(grid(i).localNode().id());
-
- // Give 300ms range for test?
- int idealDelta = - i * 2000;
-
- int threshold = 100;
-
- assertTrue("Invalid time delta for node [expected=" + idealDelta + ", " +
- "actual=" + delta + ", threshold=" + threshold,
- delta <= idealDelta + threshold && delta >= idealDelta - threshold);
- }
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTimeSyncChangeCoordinator() throws Exception {
- startGrids(GRID_CNT);
-
- try {
- for (int i = 0; i < GRID_CNT; i++) {
- // Not coordinator now.
- stopGrid(i);
-
- startGrid(i);
- }
-
- // Check coordinator time deltas.
- final IgniteKernal kernal = (IgniteKernal)grid(0);
-
- assertEquals(6, kernal.localNode().order());
-
- // Wait for latest time sync history.
- GridTestUtils.waitForCondition(new PA() {
- @Override public boolean apply() {
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> hist = kernal.context().clockSync()
- .timeSyncHistory();
-
- info("Checking time sync history: " + hist);
-
- for (GridClockDeltaVersion ver : hist.keySet()) {
- if (ver.topologyVersion() == 12)
- return true;
- }
-
- return false;
- }
- }, 10000);
-
- NavigableMap<GridClockDeltaVersion, GridClockDeltaSnapshot> history = kernal.context().clockSync()
- .timeSyncHistory();
-
- GridClockDeltaSnapshot snap = history.lastEntry().getValue();
-
- assertEquals(3, snap.deltas().size());
-
- for (int i = 1; i < GRID_CNT; i++) {
- Long delta = snap.deltas().get(grid(i).localNode().id());
-
- // Give 300ms range for test?
- int idealDelta = - i * 2000;
-
- int threshold = 100;
-
- assertTrue("Invalid time delta for node [expected=" + idealDelta + ", " +
- "actual=" + delta + ", threshold=" + threshold,
- delta <= idealDelta + threshold && delta >= idealDelta - threshold);
- }
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
- * Time bean that sets shifted time source to context.
- */
- private static class TimeShiftLifecycleBean implements LifecycleBean {
- /** Injected grid. */
- @IgniteInstanceResource
- private Ignite g;
-
- /** Time delta. */
- private int delta;
-
- /**
- * Constructs lifecycle bean.
- *
- * @param delta Time delta.
- */
- private TimeShiftLifecycleBean(int delta) {
- this.delta = delta;
- }
-
- /** {@inheritDoc} */
- @Override public void onLifecycleEvent(LifecycleEventType evt) {
- if (evt == LifecycleEventType.BEFORE_NODE_START)
- ((GridKernalContextImpl)((IgniteKernal)g).context()).timeSource(new TimeShiftClockSource(delta));
- }
- }
-
- /**
- * Time shift time source.
- */
- private static class TimeShiftClockSource implements GridClockSource {
- /** Time shift delta. */
- private int delta;
-
- /**
- * @param delta Time shift delta.
- */
- private TimeShiftClockSource(int delta) {
- this.delta = delta;
- }
-
- /** {@inheritDoc} */
- @Override public long currentTimeMillis() {
- return System.currentTimeMillis() + delta;
- }
- }
-}
\ No newline at end of file
[06/39] ignite git commit: Fix method fastMap.
Posted by ag...@apache.org.
Fix method fastMap.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/92e11e85
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/92e11e85
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/92e11e85
Branch: refs/heads/ignite-4587
Commit: 92e11e85cc3490b8544746e2b98336a29316c725
Parents: 062d631
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 13 20:00:29 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 13 20:00:29 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/92e11e85/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 f09f073..140737e 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
@@ -1297,8 +1297,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
* @return {@code True} if fast-map.
*/
public boolean isFastMap(CacheEntryPredicate[] filters, GridCacheOperation op) {
- return F.isEmpty(filters) && op != TRANSFORM && ctx.config().getWriteSynchronizationMode() == FULL_SYNC &&
- !(ctx.writeThrough() && ctx.config().getInterceptor() != null);
+ return false;
}
/**
[26/39] ignite git commit: Remove globalTime.
Posted by ag...@apache.org.
Remove globalTime.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bdc8f207
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bdc8f207
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bdc8f207
Branch: refs/heads/ignite-4587
Commit: bdc8f2078fe914f4bd85ce0c7dc6ca8689e223e4
Parents: decc802
Author: Max Kozlov <dr...@gmail.com>
Authored: Thu Mar 9 17:20:44 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Thu Mar 9 17:20:44 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 1 -
.../cache/transactions/IgniteTxManager.java | 2 +-
.../cache/version/GridCacheVersion.java | 8 ++------
.../cache/version/GridCacheVersionEx.java | 10 ++++------
.../cache/version/GridCacheVersionManager.java | 10 +++-------
.../apache/ignite/internal/util/IgniteUtils.java | 18 ++++--------------
.../processors/cache/GridCacheMvccFlagsTest.java | 4 ++--
.../cache/GridCacheMvccPartitionedSelfTest.java | 2 +-
.../processors/cache/GridCacheMvccSelfTest.java | 8 ++++----
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../cache/GridCacheVersionSelfTest.java | 4 ++--
11 files changed, 24 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/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 c33b60d..68d171c 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
@@ -2384,7 +2384,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
// Incorporate conflict version into new version if needed.
if (conflictVer != null && conflictVer != newVer)
newVer = new GridCacheVersionEx(newVer.topologyVersion(),
- newVer.globalTime(),
newVer.order(),
newVer.nodeOrder(),
newVer.dataCenterId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index a1a18fe..2f12a1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -2426,7 +2426,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
* @param nearVer Near transaction version.
*/
private CommittedVersion(GridCacheVersion ver, GridCacheVersion nearVer) {
- super(ver.topologyVersion(), ver.globalTime(), ver.order(), ver.nodeOrder(), ver.dataCenterId());
+ super(ver.topologyVersion(), ver.order(), ver.nodeOrder(), ver.dataCenterId());
assert nearVer != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/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 ccc17e5..a82f81a 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
@@ -65,12 +65,11 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/**
* @param topVer Topology version plus number of seconds from the start time of the first grid node.
- * @param globalTime Globally adjusted time.
* @param order Version order.
* @param nodeOrder Node order.
* @param dataCenterId Replication data center ID.
*/
- public GridCacheVersion(int topVer, long globalTime, long order, int nodeOrder, int dataCenterId) {
+ public GridCacheVersion(int topVer, long order, int nodeOrder, int dataCenterId) {
assert topVer >= 0 : topVer;
assert order >= 0 : order;
assert nodeOrder >= 0 : nodeOrder;
@@ -80,7 +79,6 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
throw new IllegalArgumentException("Node order overflow: " + nodeOrder);
this.topVer = topVer;
- this.globalTime = globalTime;
this.order = order;
nodeOrderDrId = nodeOrder | (dataCenterId << DR_ID_SHIFT);
@@ -90,13 +88,11 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
/**
* @param topVer Topology version plus number of seconds from the start time of the first grid node.
* @param nodeOrderDrId Node order and DR ID.
- * @param globalTime Globally adjusted time.
* @param order Version order.
*/
- public GridCacheVersion(int topVer, int nodeOrderDrId, long globalTime, long order) {
+ public GridCacheVersion(int topVer, int nodeOrderDrId, long order) {
this.topVer = topVer;
this.nodeOrderDrId = nodeOrderDrId;
- this.globalTime = globalTime;
this.order = order;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index c89b941..210b108 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -46,15 +46,14 @@ public class GridCacheVersionEx extends GridCacheVersion {
* Constructor.
*
* @param topVer Topology version.
- * @param globalTime Global time.
* @param order Order.
* @param nodeOrder Node order.
* @param dataCenterId Data center ID.
* @param drVer DR version.
*/
- public GridCacheVersionEx(int topVer, long globalTime, long order, int nodeOrder, byte dataCenterId,
+ public GridCacheVersionEx(int topVer, long order, int nodeOrder, byte dataCenterId,
GridCacheVersion drVer) {
- super(topVer, globalTime, order, nodeOrder, dataCenterId);
+ super(topVer, order, nodeOrder, dataCenterId);
assert drVer != null && !(drVer instanceof GridCacheVersionEx); // DR version can only be plain here.
@@ -66,12 +65,11 @@ public class GridCacheVersionEx extends GridCacheVersion {
*
* @param topVer Topology version.
* @param nodeOrderDrId Node order and DR ID.
- * @param globalTime Globally adjusted time.
* @param order Version order.
* @param drVer DR version.
*/
- public GridCacheVersionEx(int topVer, int nodeOrderDrId, long globalTime, long order, GridCacheVersion drVer) {
- super(topVer, nodeOrderDrId, globalTime, order);
+ public GridCacheVersionEx(int topVer, int nodeOrderDrId,long order, GridCacheVersion drVer) {
+ super(topVer, nodeOrderDrId, order);
assert drVer != null && !(drVer instanceof GridCacheVersionEx); // DR version can only be plain here.
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
index 9e5e37e..15a7d2a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
@@ -79,7 +79,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
/** {@inheritDoc} */
@Override public void start0() throws IgniteCheckedException {
- last = new GridCacheVersion(0, 0, order.get(), 0, dataCenterId);
+ last = new GridCacheVersion(0, order.get(), 0, dataCenterId);
cctx.gridEvents().addLocalEventListener(discoLsnr, EVT_NODE_METRICS_UPDATED);
}
@@ -103,7 +103,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
public void dataCenterId(byte dataCenterId) {
this.dataCenterId = dataCenterId;
- last = new GridCacheVersion(0, 0, order.get(), 0, dataCenterId);
+ last = new GridCacheVersion(0, order.get(), 0, dataCenterId);
}
/**
@@ -185,7 +185,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
topVer += (gridStartTime - TOP_VER_BASE_TIME) / 1000;
- ISOLATED_STREAMER_VER = new GridCacheVersion((int)topVer, 0, 0, 1, dataCenterId);
+ ISOLATED_STREAMER_VER = new GridCacheVersion((int)topVer, 0, 1, dataCenterId);
}
return ISOLATED_STREAMER_VER;
@@ -271,9 +271,6 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
if (topVer == -1)
topVer = cctx.kernalContext().discovery().topologyVersion();
-// long globalTime = cctx.kernalContext().clockSync().adjustedTime(topVer);
- long globalTime = 0;
-
if (addTime) {
if (gridStartTime == 0)
gridStartTime = cctx.kernalContext().discovery().gridStartTime();
@@ -287,7 +284,6 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
GridCacheVersion next = new GridCacheVersion(
(int)topVer,
- globalTime,
ord,
locNodeOrder,
dataCenterId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index f6c8163..1d2f5e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9255,7 +9255,6 @@ public abstract class IgniteUtils {
public static GridCacheVersion readVersion(long ptr, boolean verEx) {
GridCacheVersion ver = new GridCacheVersion(GridUnsafe.getInt(ptr),
GridUnsafe.getInt(ptr + 4),
- GridUnsafe.getLong(ptr + 8),
GridUnsafe.getLong(ptr + 16));
if (verEx) {
@@ -9263,7 +9262,6 @@ public abstract class IgniteUtils {
ver = new GridCacheVersionEx(GridUnsafe.getInt(ptr),
GridUnsafe.getInt(ptr + 4),
- GridUnsafe.getLong(ptr + 8),
GridUnsafe.getLong(ptr + 16),
ver);
}
@@ -9284,17 +9282,13 @@ public abstract class IgniteUtils {
int nodeOrderDrId = GridUnsafe.getInt(arr, off);
- off += 4;
-
- long globalTime = GridUnsafe.getLong(arr, off);
-
- off += 8;
+ off += 12;
long order = GridUnsafe.getLong(arr, off);
off += 8;
- GridCacheVersion ver = new GridCacheVersion(topVer, nodeOrderDrId, globalTime, order);
+ GridCacheVersion ver = new GridCacheVersion(topVer, nodeOrderDrId, order);
if (verEx) {
topVer = GridUnsafe.getInt(arr, off);
@@ -9303,15 +9297,11 @@ public abstract class IgniteUtils {
nodeOrderDrId = GridUnsafe.getInt(arr, off);
- off += 4;
-
- globalTime = GridUnsafe.getLong(arr, off);
-
- off += 8;
+ off += 12;
order = GridUnsafe.getLong(arr, off);
- ver = new GridCacheVersionEx(topVer, nodeOrderDrId, globalTime, order, ver);
+ ver = new GridCacheVersionEx(topVer, nodeOrderDrId, order, ver);
}
return ver;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
index ff2d62d..827b0a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
@@ -73,7 +73,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
UUID id = UUID.randomUUID();
- GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0, 0);
+ GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0);
GridCacheMvccCandidate c = new GridCacheMvccCandidate(
entry,
@@ -114,7 +114,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
UUID id = UUID.randomUUID();
- GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0, 0);
+ GridCacheVersion ver = new GridCacheVersion(1, 0, 0, 0);
GridCacheMvccCandidate c = new GridCacheMvccCandidate(
entry,
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
index 9da6ea6..ea0b986 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
@@ -991,7 +991,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
* @return Version.
*/
private GridCacheVersion version(int order) {
- return new GridCacheVersion(1, 0, order, order, 0);
+ return new GridCacheVersion(1, order, order, 0);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
index d352e26..e15a20f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
@@ -174,8 +174,8 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
checkOrder(cands, ver1, ver5, ver3, ver2);
entry.orderCompleted(
- new GridCacheVersion(1, 0, 2, 0, 0),
- Arrays.asList(new GridCacheVersion(1, 0, 3, 4, 0), ver2, new GridCacheVersion(1, 0, 5, 6, 0)),
+ new GridCacheVersion(1, 2, 0, 0),
+ Arrays.asList(new GridCacheVersion(1, 3, 4, 0), ver2, new GridCacheVersion(1, 5, 6, 0)),
Collections.<GridCacheVersion>emptyList()
);
@@ -1053,7 +1053,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
entry.orderCompleted(
ver2 /*local version.*/,
- Arrays.asList(new GridCacheVersion(1, 0, 1, 2, 0), ver3, new GridCacheVersion(1, 0, 5, 6, 0)),
+ Arrays.asList(new GridCacheVersion(1, 1, 2, 0), ver3, new GridCacheVersion(1, 5, 6, 0)),
Collections.<GridCacheVersion>emptyList()
);
@@ -1619,7 +1619,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
* @return Version.
*/
private GridCacheVersion version(int order) {
- return new GridCacheVersion(1, 0, order, order, 0);
+ return new GridCacheVersion(1, order, order, 0);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
index e76ab40..821807f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
@@ -52,7 +52,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
private long ttl;
/** Version. */
- private GridCacheVersion ver = new GridCacheVersion(0, 0, 0, 1, 0);
+ private GridCacheVersion ver = new GridCacheVersion(0, 0, 1, 0);
/** Obsolete version. */
private GridCacheVersion obsoleteVer = ver;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdc8f207/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
index 8179dc5..475ccb5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
@@ -79,7 +79,7 @@ public class GridCacheVersionSelfTest extends GridCommonAbstractTest {
*/
public void testMarshalling() throws Exception {
GridCacheVersion ver = version(1, 1);
- GridCacheVersionEx verEx = new GridCacheVersionEx(2, 2, 0, 0, ver);
+ GridCacheVersionEx verEx = new GridCacheVersionEx(2, 2, 0, ver);
OptimizedMarshaller marsh = new OptimizedMarshaller(false);
@@ -101,6 +101,6 @@ public class GridCacheVersionSelfTest extends GridCommonAbstractTest {
* @return Cache version.
*/
private GridCacheVersion version(int nodeOrder, int drId) {
- return new GridCacheVersion(0, 0, 0, nodeOrder, drId);
+ return new GridCacheVersion(0, 0, nodeOrder, drId);
}
}
\ No newline at end of file
[18/39] ignite git commit: Delete PRIMARY in test config.
Posted by ag...@apache.org.
Delete PRIMARY in test config.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a6084122
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a6084122
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a6084122
Branch: refs/heads/ignite-4587
Commit: a60841220c1fe20c22e3122090bcfb98fa1f4b18
Parents: 5adaa11
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 1 23:41:46 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 1 23:41:46 2017 +0300
----------------------------------------------------------------------
modules/core/src/test/config/websession/example-cache-base.xml | 1 -
modules/core/src/test/config/websession/spring-cache-1.xml | 6 ------
modules/core/src/test/config/websession/spring-cache-2.xml | 6 ------
modules/core/src/test/config/websession/spring-cache-3.xml | 6 ------
4 files changed, 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a6084122/modules/core/src/test/config/websession/example-cache-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/example-cache-base.xml b/modules/core/src/test/config/websession/example-cache-base.xml
index d3d5b46..616ad28 100644
--- a/modules/core/src/test/config/websession/example-cache-base.xml
+++ b/modules/core/src/test/config/websession/example-cache-base.xml
@@ -65,7 +65,6 @@
<property name="name" value="partitioned_primary"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="ATOMIC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
<property name="backups" value="1"/>
</bean>
http://git-wip-us.apache.org/repos/asf/ignite/blob/a6084122/modules/core/src/test/config/websession/spring-cache-1.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/spring-cache-1.xml b/modules/core/src/test/config/websession/spring-cache-1.xml
index 0cebc76..7fbb0e2 100644
--- a/modules/core/src/test/config/websession/spring-cache-1.xml
+++ b/modules/core/src/test/config/websession/spring-cache-1.xml
@@ -40,8 +40,6 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
-
<property name="backups" value="1"/>
<property name="rebalanceMode" value="SYNC"/>
@@ -56,8 +54,6 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
-
<property name="backups" value="1"/>
<property name="rebalanceMode" value="SYNC"/>
@@ -72,8 +68,6 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
-
<property name="rebalanceMode" value="SYNC"/>
</bean>
</list>
http://git-wip-us.apache.org/repos/asf/ignite/blob/a6084122/modules/core/src/test/config/websession/spring-cache-2.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/spring-cache-2.xml b/modules/core/src/test/config/websession/spring-cache-2.xml
index 0dc4855..be6900c 100644
--- a/modules/core/src/test/config/websession/spring-cache-2.xml
+++ b/modules/core/src/test/config/websession/spring-cache-2.xml
@@ -40,8 +40,6 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
-
<property name="backups" value="1"/>
<property name="rebalanceMode" value="SYNC"/>
@@ -56,8 +54,6 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
-
<property name="backups" value="1"/>
<property name="rebalanceMode" value="SYNC"/>
@@ -72,8 +68,6 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
-
<property name="rebalanceMode" value="SYNC"/>
</bean>
</list>
http://git-wip-us.apache.org/repos/asf/ignite/blob/a6084122/modules/core/src/test/config/websession/spring-cache-3.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/spring-cache-3.xml b/modules/core/src/test/config/websession/spring-cache-3.xml
index 40674e8..0700930 100644
--- a/modules/core/src/test/config/websession/spring-cache-3.xml
+++ b/modules/core/src/test/config/websession/spring-cache-3.xml
@@ -40,8 +40,6 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
-
<property name="backups" value="1"/>
<property name="rebalanceMode" value="SYNC"/>
@@ -56,8 +54,6 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
-
<property name="backups" value="1"/>
<property name="rebalanceMode" value="SYNC"/>
@@ -72,8 +68,6 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="atomicWriteOrderMode" value="PRIMARY"/>
-
<property name="rebalanceMode" value="SYNC"/>
</bean>
</list>
[16/39] ignite git commit: Refactoring visor-console module.
Posted by ag...@apache.org.
Refactoring visor-console module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d5c1345
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d5c1345
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d5c1345
Branch: refs/heads/ignite-4587
Commit: 3d5c1345dc550b622569b0e63e019a4ae92539a8
Parents: 82790a8
Author: Max Kozlov <dr...@gmail.com>
Authored: Wed Mar 1 16:27:44 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Wed Mar 1 16:27:44 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d5c1345/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 04a68ae..0178903 100755
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -876,7 +876,6 @@ object VisorCacheCommand {
cacheT += ("Mode", cfg.mode)
cacheT += ("Atomicity Mode", safe(cfg.atomicityMode))
- cacheT += ("Atomic Write Ordering Mode", safe(cfg.atomicWriteOrderMode))
cacheT += ("Statistic Enabled", bool2Str(cfg.statisticsEnabled()))
cacheT += ("Management Enabled", bool2Str(cfg.managementEnabled()))
[37/39] ignite git commit: Fix size.
Posted by ag...@apache.org.
Fix size.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/77011044
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77011044
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77011044
Branch: refs/heads/ignite-4587
Commit: 7701104456be1fbaf3e3ba4bbf608b6b6af8737b
Parents: 2f85812
Author: Max Kozlov <dr...@gmail.com>
Authored: Thu Mar 16 16:07:09 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Thu Mar 16 16:07:09 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheSwapEntryImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/77011044/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
index 02f74e4..410a6ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapEntryImpl.java
@@ -38,10 +38,10 @@ public class GridCacheSwapEntryImpl implements GridCacheSwapEntry {
static final int VERSION_OFFSET = 16;
/** */
- static final int VERSION_SIZE = 24;
+ static final int VERSION_SIZE = 16;
/** */
- static final int VERSION_EX_SIZE = 48;
+ static final int VERSION_EX_SIZE = 32;
/** */
static final int GUID_SIZE = 24;