ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [20/23] ignite git commit: Completion protocol works fine!
Date Wed, 22 Mar 2017 11:13:06 GMT
Completion protocol works fine!


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

Branch: refs/heads/ignite-4565-ddl
Commit: f1419d71a93c1f67eb1aefea40a3386509fa3708
Parents: edaf29a
Author: devozerov <vozerov@gridgain.com>
Authored: Wed Mar 22 12:48:14 2017 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Wed Mar 22 12:48:14 2017 +0300

----------------------------------------------------------------------
 .../processors/query/GridQueryProcessor.java    | 32 +++++++++++---------
 .../query/QueryTypeDescriptorImpl.java          |  2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f1419d71/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 2e5ee50..c27b2f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -468,6 +468,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
                         if (!type0.fields().containsKey(idxField)) {
                             completed = true;
                             errMsg = "Field doesn't exist: " + idxField;
+
+                            break;
                         }
                     }
                 }
@@ -1385,6 +1387,21 @@ public class GridQueryProcessor extends GridProcessorAdapter {
     }
 
     /**
+     * Process status response.
+     *
+     * @param resp Status response.
+     */
+    private void processStatusResponse(IndexOperationStatusResponse resp) {
+        IndexOperationState idxOpState = idxOpStates.get(resp.operationId());
+
+        if (idxOpState != null)
+            idxOpState.onNodeFinished(resp.senderNodeId(), resp.errorMessage());
+        else {
+            // TODO: Log!
+        }
+    }
+
+    /**
      * Send status response.
      *
      * @param destNodeId Destination node ID.
@@ -1405,21 +1422,6 @@ public class GridQueryProcessor extends GridProcessorAdapter {
     }
 
     /**
-     * Process status response.
-     *
-     * @param resp Status response.
-     */
-    private void processStatusResponse(IndexOperationStatusResponse resp) {
-        IndexOperationState idxOpState = idxOpStates.get(resp.operationId());
-
-        if (idxOpState != null)
-            idxOpState.onNodeFinished(resp.senderNodeId(), resp.errorMessage());
-        else {
-            // TODO: Log!
-        }
-    }
-
-    /**
      * @param ver Version.
      */
     public static void setRequestAffinityTopologyVersion(AffinityTopologyVersion ver) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f1419d71/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryTypeDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryTypeDescriptorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryTypeDescriptorImpl.java
index 8cc9c6c..287873d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryTypeDescriptorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryTypeDescriptorImpl.java
@@ -138,7 +138,7 @@ public class QueryTypeDescriptorImpl implements GridQueryTypeDescriptor
{
      * @return Table name.
      */
     public String tableName() {
-        return tblName;
+        return tblName != null ? tblName : name;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/f1419d71/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index dc66e5c..07c0650 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -2744,7 +2744,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
             this.type = type;
             this.schema = schema;
 
-            String tblName = escapeName(type.tableName() != null ? type.tableName() : type.name(),
schema.escapeAll());
+            String tblName = escapeName(type.tableName(), schema.escapeAll());
 
             fullTblName = schema.schemaName + "." + tblName;
         }


Mime
View raw message