You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/11/20 14:33:46 UTC

[24/24] ignite git commit: force key future

force key future


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/adb8ee4a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/adb8ee4a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/adb8ee4a

Branch: refs/heads/ignite-single-op-get
Commit: adb8ee4a1d8c80c17b0a4e30627999a8492efb95
Parents: f9b79c8
Author: sboikov <sb...@gridgain.com>
Authored: Fri Nov 20 15:44:00 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Nov 20 16:22:31 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCachePreloader.java    |  8 +++++
 .../cache/GridCachePreloaderAdapter.java        |  6 ++++
 .../distributed/dht/GridDhtTxPrepareFuture.java | 35 ++++++++++---------
 .../dht/atomic/GridDhtAtomicCache.java          |  8 ++---
 .../dht/preloader/GridDhtForceKeysFuture.java   | 35 +++++++++++++++++++
 .../dht/preloader/GridDhtPreloader.java         | 36 ++++++++++++++++++++
 6 files changed, 108 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/adb8ee4a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
index 1658a89..8b84b0b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
@@ -143,6 +143,14 @@ public interface GridCachePreloader {
     public IgniteInternalFuture<Object> request(Collection<KeyCacheObject> keys, AffinityTopologyVersion topVer);
 
     /**
+     * @param keys Keys.
+     * @param topVer Topology.
+     * @return Future.
+     */
+    @Nullable public IgniteInternalFuture<?> requestEx(Collection<KeyCacheObject> keys,
+        AffinityTopologyVersion topVer, boolean waitTop);
+
+    /**
      * Force preload process.
      */
     public void forcePreload();

http://git-wip-us.apache.org/repos/asf/ignite/blob/adb8ee4a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
index 9c0e9f7..508c76c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
@@ -144,6 +144,12 @@ public class GridCachePreloaderAdapter implements GridCachePreloader {
     }
 
     /** {@inheritDoc} */
+    @Nullable @Override public IgniteInternalFuture<?> requestEx(Collection<KeyCacheObject> keys,
+        AffinityTopologyVersion topVer, boolean waitTop) {
+        return null;
+    }
+
+    /** {@inheritDoc} */
     @Override public void onInitialExchangeComplete(@Nullable Throwable err) {
         // No-op.
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/adb8ee4a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 4cb5d05..138e5cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -905,28 +905,34 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
      * @param keysMap Keys to request.
      * @return Keys request future.
      */
-    private IgniteInternalFuture<Object> forceRebalanceKeys(Map<Integer, Collection<KeyCacheObject>> keysMap) {
+    @Nullable private IgniteInternalFuture<?> forceRebalanceKeys(Map<Integer, Collection<KeyCacheObject>> keysMap) {
         if (F.isEmpty(keysMap))
             return null;
 
-        GridCompoundFuture<Object, Object> compFut = null;
-        IgniteInternalFuture<Object> lastForceFut = null;
+        GridCompoundFuture compFut = null;
+        IgniteInternalFuture lastForceFut = null;
 
         for (Map.Entry<Integer, Collection<KeyCacheObject>> entry : keysMap.entrySet()) {
-            if (lastForceFut != null && compFut == null) {
-                compFut = new GridCompoundFuture();
-
-                compFut.add(lastForceFut);
-            }
-
             int cacheId = entry.getKey();
 
             Collection<KeyCacheObject> keys = entry.getValue();
 
-            lastForceFut = cctx.cacheContext(cacheId).preloader().request(keys, tx.topologyVersion());
+            IgniteInternalFuture fut0 = cctx.cacheContext(cacheId).preloader().requestEx(keys,
+                tx.topologyVersion(),
+                false);
 
-            if (compFut != null)
-                compFut.add(lastForceFut);
+            if (fut0 != null) {
+                if (compFut != null)
+                    compFut.add(fut0);
+                else if (lastForceFut == null)
+                    lastForceFut = fut0;
+                else {
+                    compFut = new GridCompoundFuture();
+
+                    compFut.add(lastForceFut);
+                    compFut.add(fut0);
+                }
+            }
         }
 
         if (compFut != null) {
@@ -934,11 +940,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
 
             return compFut;
         }
-        else {
-            assert lastForceFut != null;
-
+        else
             return lastForceFut;
-        }
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/adb8ee4a/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 3ee1048..539e87c 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
@@ -1157,13 +1157,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
         final GridNearAtomicUpdateRequest req,
         final CI2<GridNearAtomicUpdateRequest, GridNearAtomicUpdateResponse> completionCb
     ) {
-        IgniteInternalFuture<Object> forceFut = preldr.request(req.keys(), req.topologyVersion());
+        IgniteInternalFuture<?> forceFut = preldr.requestEx(req.keys(), req.topologyVersion(), false);
 
-        if (forceFut.isDone())
+        if (forceFut == null || forceFut.isDone())
             updateAllAsyncInternal0(nodeId, req, completionCb);
         else {
-            forceFut.listen(new CI1<IgniteInternalFuture<Object>>() {
-                @Override public void apply(IgniteInternalFuture<Object> t) {
+            forceFut.listen(new CI1<IgniteInternalFuture<?>>() {
+                @Override public void apply(IgniteInternalFuture<?> t) {
                     updateAllAsyncInternal0(nodeId, req, completionCb);
                 }
             });

http://git-wip-us.apache.org/repos/asf/ignite/blob/adb8ee4a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index db0e780..7516b7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@ -215,6 +215,41 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
     }
 
     /**
+     * @param cctx Context.
+     * @param keys Keys.
+     * @param topVer Topology version.
+     * @return {@code True} if need request keys.
+     */
+    public static boolean needForceKeys(GridCacheContext cctx,
+        Iterable<KeyCacheObject> keys,
+        AffinityTopologyVersion topVer) {
+        GridDhtPartitionTopology top = cctx.dht().topology();
+
+        for (KeyCacheObject key : keys) {
+            GridCacheEntryEx e = cctx.dht().peekEx(key);
+
+            try {
+                if (e != null && !e.isNewLocked())
+                    continue;
+            }
+            catch (GridCacheEntryRemovedException ignore) {
+                // No-op.
+            }
+
+            int part = cctx.affinity().partition(key);
+
+            List<ClusterNode> owners = top.owners(part, topVer);
+
+            if (owners.isEmpty() || (owners.contains(cctx.localNode()) && cctx.rebalanceEnabled()))
+                continue;
+            else
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
      * Initializes this future.
      */
     public void init() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/adb8ee4a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 8e56c2d..829eb55 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -692,6 +692,42 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
         }
     }
 
+    /** {@inheritDoc} */
+    @Nullable @Override public IgniteInternalFuture<?> requestEx(Collection<KeyCacheObject> keys,
+        AffinityTopologyVersion topVer, boolean waitTop) {
+        IgniteInternalFuture<?> topReadyFut = waitTop ? cctx.affinity().affinityReadyFuturex(topVer) : null;
+
+        if (startFut.isDone() && (topReadyFut == null || topReadyFut.isDone())) {
+            if (!GridDhtForceKeysFuture.needForceKeys(cctx, keys, topVer))
+                return null;
+
+            GridDhtForceKeysFuture<?, ?> fut = new GridDhtForceKeysFuture<>(cctx, topVer, keys, this);
+
+            fut.init();
+
+            return fut;
+        }
+        else {
+            final GridDhtForceKeysFuture<?, ?> fut = new GridDhtForceKeysFuture<>(cctx, topVer, keys, this);
+
+            GridCompoundFuture<Object, Object> compound = new GridCompoundFuture<>();
+
+            compound.add(startFut);
+
+            if (topReadyFut != null)
+                compound.add((IgniteInternalFuture<Object>)topReadyFut);
+            compound.markInitialized();
+
+            compound.listen(new CI1<IgniteInternalFuture<?>>() {
+                @Override public void apply(IgniteInternalFuture<?> syncFut) {
+                    fut.init();
+                }
+            });
+
+            return fut;
+        }
+    }
+
     /**
      * @param keys Keys to request.
      * @return Future for request.