ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [2/2] ignite git commit: Minors.
Date Tue, 14 Mar 2017 11:54:31 GMT
Minors.


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

Branch: refs/heads/ignite-4565-ddl
Commit: ccd098b099031f2a45b034d0c9eed629f2cf4833
Parents: ceea0e7
Author: devozerov <vozerov@gridgain.com>
Authored: Tue Mar 14 14:54:23 2017 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Tue Mar 14 14:54:23 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheProcessor.java    | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ccd098b0/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 e62616e..619d4a4 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
@@ -971,6 +971,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
     /** {@inheritDoc} */
     @Override public void onDisconnected(IgniteFuture<?> reconnectFut) throws IgniteCheckedException
{
+        // TODO Clean indexing data properly.
+
         cachesOnDisconnect = new HashMap<>(registeredCaches);
 
         IgniteClientDisconnectedCheckedException err = new IgniteClientDisconnectedCheckedException(
@@ -2125,6 +2127,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                                     ccfg.getNearConfiguration() != null,
                                     ccfg.getCacheMode());
                         }
+
+                        existing.indexInitOperation(req.indexInitOperation());
                     }
                     else {
                         assert req.cacheType() != null : req;
@@ -2740,7 +2744,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         }
 
         // For already started cache we must make sure that indexing manager will be able
to accommodate it.
-        if (isMissingQueryCache(desc))
+        if (!isMissingQueryCache(desc))
             cache(op.space()).context().queries().onIndexInitDiscoveryMessage(msg);
 
         // Finally, set init operation to cache descriptor.
@@ -2757,7 +2761,19 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         if (!indexMessageValid(msg))
             return;
 
-        // TODO: Implement ack routine.
+        if (msg.hasError()) {
+            // TODO: Delegate to indexing to handle error and complete client futures!
+
+            return;
+        }
+
+        // TODO: Remove init operation from descriptor!
+
+        // TODO: Handle concurrent cache stop!
+
+        // TODO: Enlist cache operation to descriptor!
+
+        // TODO: Initiate exchange-like routine!
     }
 
     /**


Mime
View raw message