xtern commented on code in PR #6835:
URL: https://github.com/apache/ignite-3/pull/6835#discussion_r2460552358
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/fsm/MultiStatementHandler.java:
##########
@@ -299,7 +306,7 @@ private void scheduleTermination() {
.whenComplete((ignored, ex) ->
query.moveTo(ExecutionPhase.TERMINATED));
}
- private static class ScriptStatement {
+ static class ScriptStatement {
Review Comment:
do we really need this change?
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/fsm/DdlBatchingHelper.java:
##########
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.sql.engine.exec.fsm;
+
+import java.util.List;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+
+/**
+ * Provide helper methods for batched DDL commands.
+ */
+class DdlBatchingHelper {
+ /**
+ * Return {@code true} if a DDL command is compatible with batched DDL
commands and can be added to the batch.
+ *
+ * @param batch DDL commands represented by AST trees.
+ * @param statement A DDL statement represented by AST tree
+ * @return {@code true} if statement can be added to the batch, {@code
false} otherwise.
+ */
+ static boolean canBeBatched(List<SqlNode> batch, SqlNode statement) {
+ return batch.stream().allMatch(s -> isCompatible(s, statement));
Review Comment:
As far as I understand, a batch can only contain identical "kinds". Should
we then only compare single item of the batch?
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/fsm/MultiStatementHandler.java:
##########
@@ -177,6 +179,11 @@ CompletableFuture<AsyncSqlCursor<InternalSqlRow>>
processNext() {
break;
}
+ List<SqlNode> batch = CollectionUtils.view(ddlBatch, s ->
s.parsedQuery().parsedTreeSafe());
+ if (!DdlBatchingHelper.canBeBatched(batch,
statement.parsedResult.parsedTreeSafe())) {
+ break;
+ }
Review Comment:
In addition to the previous comment,
It seems that with the current approach, it's enough to compare the
compatibility of the current statement with the previous one.
E.g. something like
```suggestion
if
(!DdlBatchingHelper.isCompatible(scriptStatement.parsedResult.parsedTreeSafe(),
statement.parsedResult.parsedTreeSafe())) {
break;
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
