IGNITE-21367 IgniteH2Indexing cleanup

apache · Mar 7, 2024 · a5fc7ff · a5fc7ff
1 parent 571de81
commit a5fc7ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/...dexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/...dexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -474,7 +474,6 @@ private GridQueryFieldsResult executeSelectLocal(
 
                     throw e;
                 }
-
             }
         };
     }
@@ -891,18 +890,10 @@ private FieldsQueryCursor<List<?>> executeCommand(
     }
 
     /**
-     * Check whether command could be executed with the given cluster state.
-     *
-     * @param parseRes Parsing result.
+     * Check cluster state.
      */
-    private void checkClusterState(QueryParserResult parseRes) {
+    private void checkClusterState() {
         if (!ctx.state().publicApiActiveState(true)) {
-            if (parseRes.isCommand()) {
-                QueryParserResultCommand cmd = parseRes.command();
-
-                assert cmd != null;
-            }
-
             throw new IgniteException("Can not perform the operation because the cluster is inactive. Note, " +
                 "that the cluster is considered inactive by default if Ignite Persistent Store is used to " +
                 "let all the nodes join the cluster. To activate the cluster call" +
@@ -951,7 +942,7 @@ private void checkClusterState(QueryParserResult parseRes) {
                 }
 
                 // Check if cluster state is valid.
-                checkClusterState(parseRes);
+                checkClusterState();
 
                 // Execute.
                 if (parseRes.isCommand()) {

diff --git a/...es/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java b/...es/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryParser.java
@@ -477,6 +477,8 @@ else if (!prepared.isQuery()) {
                 // node stripes in parallel and then merged through reduce process.
                 boolean splitNeeded = !loc || locSplit;
 
+                assert !GridSqlQueryParser.isForUpdateQuery(prepared);
+
                 GridCacheTwoStepQuery twoStepQry = null;
 
                 if (splitNeeded) {