You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2017/01/26 14:54:59 UTC
ignite git commit: all cheats rolled back, including version manager
Repository: ignite
Updated Branches:
refs/heads/ignite-comm-balance-master 9c1c02851 -> b5646869b
all cheats rolled back, including version manager
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5646869
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5646869
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5646869
Branch: refs/heads/ignite-comm-balance-master
Commit: b5646869bc4f95ecdceb8e016b4e78090f83a13e
Parents: 9c1c028
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jan 26 17:54:50 2017 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jan 26 17:54:50 2017 +0300
----------------------------------------------------------------------
.../dht/atomic/GridDhtAtomicCache.java | 2 +-
.../cache/version/GridCacheVersionManager.java | 52 ++++----------------
2 files changed, 11 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5646869/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 4fedc2b..9a9ab57 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
@@ -1831,7 +1831,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (ver == null) {
// Assign next version for update inside entries lock.
- ver = ctx.versions().next(top.topologyVersion(), req.partition());
+ ver = ctx.versions().next(top.topologyVersion());
if (hasNear)
res.nearVersion(ver);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5646869/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 fea5ee9..5a8904f 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
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.version;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicLongArray;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.events.DiscoveryEvent;
@@ -65,9 +64,6 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
private GridCacheVersion ISOLATED_STREAMER_VER;
/** */
- private final AtomicLongArray orders = new AtomicLongArray(Runtime.getRuntime().availableProcessors());
-
- /** */
private final GridLocalEventListener discoLsnr = new GridLocalEventListener() {
@Override public void onEvent(Event evt) {
assert evt.type() == EVT_NODE_METRICS_UPDATED;
@@ -199,8 +195,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
* @return Next version based on current topology.
*/
public GridCacheVersion next() {
- return next(cctx.kernalContext().discovery().topologyVersion(), true, false, dataCenterId,
- -1);
+ return next(cctx.kernalContext().discovery().topologyVersion(), true, false, dataCenterId);
}
/**
@@ -208,8 +203,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
* @return Next version based on current topology with given data center id.
*/
public GridCacheVersion next(byte dataCenterId) {
- return next(cctx.kernalContext().discovery().topologyVersion(), true, false, dataCenterId,
- -1);
+ return next(cctx.kernalContext().discovery().topologyVersion(), true, false, dataCenterId);
}
/**
@@ -221,21 +215,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
* @return Next version based on given topology version.
*/
public GridCacheVersion next(AffinityTopologyVersion topVer) {
- return next(topVer.topologyVersion(), true, false, dataCenterId,
- -1);
- }
-
- /**
- * Gets next version based on given topology version. Given value should be
- * real topology version calculated as number of grid topology changes and
- * obtained from discovery manager.
- *
- * @param topVer Topology version for which new version should be obtained.
- * @param part Partition.
- * @return Next version based on given topology version.
- */
- public GridCacheVersion next(AffinityTopologyVersion topVer, int part) {
- return next(topVer.topologyVersion(), true, false, dataCenterId, part);
+ return next(topVer.topologyVersion(), true, false, dataCenterId);
}
/**
@@ -244,8 +224,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
* @return Next version for cache store operations.
*/
public GridCacheVersion nextForLoad() {
- return next(cctx.kernalContext().discovery().topologyVersion(), true, true, dataCenterId,
- -1);
+ return next(cctx.kernalContext().discovery().topologyVersion(), true, true, dataCenterId);
}
/**
@@ -254,8 +233,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
* @return Next version for cache store operations.
*/
public GridCacheVersion nextForLoad(AffinityTopologyVersion topVer) {
- return next(topVer.topologyVersion(), true, true, dataCenterId,
- -1);
+ return next(topVer.topologyVersion(), true, true, dataCenterId);
}
/**
@@ -264,8 +242,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
* @return Next version for cache store operations.
*/
public GridCacheVersion nextForLoad(GridCacheVersion ver) {
- return next(ver.topologyVersion(), false, true, dataCenterId,
- -1);
+ return next(ver.topologyVersion(), false, true, dataCenterId);
}
/**
@@ -275,8 +252,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
* @return Next version based on given cache version.
*/
public GridCacheVersion next(GridCacheVersion ver) {
- return next(ver.topologyVersion(), false, false, dataCenterId,
- -1);
+ return next(ver.topologyVersion(), false, false, dataCenterId);
}
/**
@@ -289,16 +265,9 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
* @param addTime If {@code true} then adds to the given topology version number of seconds
* from the start time of the first grid node.
* @param dataCenterId Data center id.
- * @param part
* @return New lock order.
*/
- private GridCacheVersion next(
- long topVer,
- boolean addTime,
- boolean forLoad,
- byte dataCenterId,
- int part
- ) {
+ private GridCacheVersion next(long topVer, boolean addTime, boolean forLoad, byte dataCenterId) {
if (topVer == -1)
topVer = cctx.kernalContext().discovery().topologyVersion();
@@ -313,8 +282,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
int locNodeOrder = (int)cctx.localNode().order();
- long ord = forLoad ? loadOrder.incrementAndGet() :
- part == -1 ? order.incrementAndGet() : (orders.incrementAndGet(part % orders.length()) | (((long)part) << 48 ));
+ long ord = forLoad ? loadOrder.incrementAndGet() : order.incrementAndGet();
GridCacheVersion next = new GridCacheVersion(
(int)topVer,
@@ -323,7 +291,7 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
locNodeOrder,
dataCenterId);
- // last = next; // TODO
+ last = next;
return next;
}