Introduce DdlBatchAware annotation

Author: AMashenkov

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/fsm/DdlBatchAware.java

@@ -0,0 +1,37 @@
+/*
+ * 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 static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation that defines how multi-statement handler executes DDL statement.
+ *
+ * <p>DDL statements of the same {@link DdlBatchGroup} can be executed in together within the same batch except {@link DdlBatchGroup#OTHER}.
+ * Statements marked as {@link DdlBatchGroup#OTHER} can be executed only separately, this is the default behavior.
+ */
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface DdlBatchAware {
+    /** Returns DDL batch group. */
+    DdlBatchGroup group() default DdlBatchGroup.OTHER;
+}

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/fsm/DdlBatchGroup.java

@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+/**
+ * Groups fpr batching compatible DDL operations.
+ *
+ * @see DdlBatchAware
+ */
+public enum DdlBatchGroup {
+    /** Group for CREATE operations. */
+    CREATE,
+    /** Group for DROP operations. */
+    DROP,
+    /** Group for other operations. */
+    OTHER;
+}

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/fsm/DdlBatchingHelper.java

@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.sql.engine.exec.fsm;
 
-import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.sql.SqlNode;
 
 /**
@@ -26,42 +25,18 @@
 class DdlBatchingHelper {
     /** Returns {@code true} if commands (represented by AST trees) can be executed together, {@code false} otherwise. */
     static boolean isCompatible(SqlNode node1, SqlNode node2) {
-        DdlCommandType kind1 = getCommandType(node1);
-        DdlCommandType kind2 = getCommandType(node2);
+        DdlBatchGroup kind1 = getCommandType(node1);
+        DdlBatchGroup kind2 = getCommandType(node2);
 
-        return kind1 == kind2 && kind1 != DdlCommandType.OTHER;
+        return kind1 == kind2 && kind1 != DdlBatchGroup.OTHER;
     }
 
     /** Returns command kind. */
-    private static DdlCommandType getCommandType(SqlNode node) {
-        SqlKind kind = node.getKind();
+    private static DdlBatchGroup getCommandType(SqlNode node) {
+        DdlBatchAware batchAwareAnnotation = node.getClass().getDeclaredAnnotation(DdlBatchAware.class);
 
-        switch (kind) {
-            case CREATE_SCHEMA:
-            case CREATE_TABLE:
-            case CREATE_SEQUENCE:
-            case CREATE_INDEX:
-                return DdlCommandType.CREATE;
+        assert batchAwareAnnotation != null : "Batching behaviour wasn't specified for " + node.getClass();
 
-            case DROP_SCHEMA:
-            case DROP_TABLE:
-            case DROP_INDEX:
-            case DROP_SEQUENCE:
-                return DdlCommandType.DROP;
-
-            case OTHER_DDL:
-            default:
-                return DdlCommandType.OTHER;
-        }
-    }
-
-    /** DDL command kind. */
-    private enum DdlCommandType {
-        /** Create command. */
-        CREATE,
-        /** Drop command. */
-        DROP,
-        /** Any other DDL command (ALTER command, zone commands, and others). */
-        OTHER
+        return batchAwareAnnotation.group();
     }
 }

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/fsm/QueryExecutor.java

@@ -623,10 +623,6 @@ static class ParsedResultWithNextCursorFuture {
             this.parsedQuery = parsedQuery;
             this.nextCursorFuture = nextCursorFuture;
         }
-
-        public ParsedResult parsedQuery() {
-            return parsedQuery;
-        }
     }
 
     @Override

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlAlterColumn.java

@@ -27,11 +27,13 @@
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.util.ImmutableNullableList;
+import org.apache.ignite.internal.sql.engine.exec.fsm.DdlBatchAware;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Parse tree for {@code ALTER TABLE ... ALTER COLUMN} statement.
  */
+@DdlBatchAware
 public class IgniteSqlAlterColumn extends IgniteAbstractSqlAlterTable {
 
     /** ALTER TABLE .. ALTER COLUMN operator. */

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlAlterTableAddColumn.java

@@ -28,11 +28,13 @@
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.util.ImmutableNullableList;
+import org.apache.ignite.internal.sql.engine.exec.fsm.DdlBatchAware;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Parse tree for {@code ALTER TABLE ... ADD COLUMN} statement.
  */
+@DdlBatchAware
 public class IgniteSqlAlterTableAddColumn extends IgniteAbstractSqlAlterTable {
 
     /** ALTER TABLE ... ADD COLUMN operator. */

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlAlterTableDropColumn.java

@@ -28,11 +28,13 @@
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.util.ImmutableNullableList;
+import org.apache.ignite.internal.sql.engine.exec.fsm.DdlBatchAware;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Parse tree for {@code ALTER TABLE ... DROP COLUMN} statement.
  */
+@DdlBatchAware
 public class IgniteSqlAlterTableDropColumn extends IgniteAbstractSqlAlterTable {
 
     /** ALTER TABLE operator. */

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlAlterTableSetProperties.java

@@ -28,11 +28,13 @@
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.util.ImmutableNullableList;
+import org.apache.ignite.internal.sql.engine.exec.fsm.DdlBatchAware;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Parse tree for {@code ALTER TABLE ... SET} statement.
  */
+@DdlBatchAware
 public class IgniteSqlAlterTableSetProperties extends IgniteAbstractSqlAlterTable {
 
     /** ALTER TABLE ... SET operator. */

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlAlterZoneRenameTo.java

@@ -27,11 +27,13 @@
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.util.ImmutableNullableList;
+import org.apache.ignite.internal.sql.engine.exec.fsm.DdlBatchAware;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Parse tree for {@code ALTER ZONE RENAME TO} statement.
  */
+@DdlBatchAware
 public class IgniteSqlAlterZoneRenameTo extends IgniteAbstractSqlAlterZone {
 
     /** ALTER ZONE RENAME TO operator. */

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlAlterZoneSet.java

@@ -28,11 +28,13 @@
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.util.ImmutableNullableList;
+import org.apache.ignite.internal.sql.engine.exec.fsm.DdlBatchAware;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Parse tree for {@code ALTER ZONE SET} statement.
  */
+@DdlBatchAware
 public class IgniteSqlAlterZoneSet extends IgniteAbstractSqlAlterZone {
 
     /** ALTER ZONE SET operator. */