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 <[email protected]> Authored: Thu Mar 9 17:20:44 2017 +0300 Committer: Max Kozlov <[email protected]> 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
