>From Ali Alsuliman <[email protected]>:

Ali Alsuliman has submitted this change. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21212?usp=email )

Change subject: [ASTERIXDB-3769][API] Fail async requests for unsupported 
statements
......................................................................

[ASTERIXDB-3769][API] Fail async requests for unsupported statements

- user model changes: yes
- storage format changes: no
- interface changes: no

Ext-ref: MB-71779
Change-Id: Iad2a4ec54b01ca53142852261787e070a781b031
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21212
Reviewed-by: Murtadha Hubail <[email protected]>
Integration-Tests: Jenkins <[email protected]>
Reviewed-by: Ali Alsuliman <[email protected]>
Tested-by: Ali Alsuliman <[email protected]>
---
M 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
M 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.5.update.sqlpp
M 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.6.async.sqlpp
M 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-not-supported/async-not-supported.1.async.sqlpp
M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
M 
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
M 
asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
M 
asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/DatasetDecl.java
M 
asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/NodegroupDecl.java
M 
asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/TypeDecl.java
M 
asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
15 files changed, 128 insertions(+), 75 deletions(-)

Approvals:
  Ali Alsuliman: Looks good to me, but someone else must approve; Verified
  Jenkins: Verified
  Murtadha Hubail: Looks good to me, approved




diff --git 
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
 
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
index 7fc758b..909689e 100644
--- 
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
+++ 
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
@@ -246,7 +246,7 @@
                 }
                 break;

-            case DATASET_DECL:
+            case CREATE_DATASET:
                 DatasetDecl dsCreateStmt = (DatasetDecl) stmt;
                 namespace = getStatementNamespace(((DatasetDecl) 
stmt).getNamespace(), activeNamespace);
                 invalidOperation = isSystemNamespace(namespace);
@@ -300,7 +300,7 @@
                 }
                 break;

-            case TYPE_DECL:
+            case CREATE_TYPE:
                 namespace = getStatementNamespace(((TypeDecl) 
stmt).getNamespace(), activeNamespace);
                 invalidOperation = isSystemNamespace(namespace);
                 if (invalidOperation) {
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java
index d6fb8d3..79e70b9 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java
@@ -172,7 +172,7 @@
                 continue;
             }

-            if (s.getKind() == Statement.Kind.DATASET_DECL) {
+            if (s.getKind() == Statement.Kind.CREATE_DATASET) {
                 DatasetDecl dsDecl = (DatasetDecl) s;
                 String dsName = dsDecl.getName().getValue();
                 String dv = currentDv;
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index ea42a3d..b930ce1 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -386,7 +386,6 @@
         final ResultMetadata outMetadata = requestParameters.getOutMetadata();
         final Map<String, IAObject> stmtParams = 
requestParameters.getStatementParameters();
         warningCollector.setMaxWarnings(sessionConfig.getMaxWarnings());
-        boolean stmtWithAsyncSupportUsed = false;
         try {
             for (Statement stmt : statements) {
                 if (sessionConfig.is(SessionConfig.FORMAT_HTML)) {
@@ -415,7 +414,7 @@
                         handleCreateDataverseStatement(metadataProvider, stmt, 
requestParameters,
                                 Creator.DEFAULT_CREATOR);
                         break;
-                    case DATASET_DECL:
+                    case CREATE_DATASET:
                         handleCreateDatasetStatement(metadataProvider, stmt, 
hcc, requestParameters,
                                 Creator.DEFAULT_CREATOR);
                         break;
@@ -429,10 +428,10 @@
                     case CREATE_FULL_TEXT_CONFIG:
                         handleCreateFullTextConfigStatement(metadataProvider, 
stmt);
                         break;
-                    case TYPE_DECL:
+                    case CREATE_TYPE:
                         handleCreateTypeStatement(metadataProvider, stmt);
                         break;
-                    case NODEGROUP_DECL:
+                    case CREATE_NODEGROUP:
                         handleCreateNodeGroupStatement(metadataProvider, stmt);
                         break;
                     case DATABASE_DROP:
@@ -516,7 +515,6 @@
                         }
                         handleCopyToStatement(metadataProvider, stmt, hcc, 
resultSet, resultDelivery, outMetadata,
                                 requestParameters, stmtParams, stats);
-                        stmtWithAsyncSupportUsed = true;
                         break;
                     case INSERT:
                     case UPDATE:
@@ -526,7 +524,6 @@
                             metadataProvider.setResultAsyncMode(resultDelivery 
== ResultDelivery.ASYNC
                                     || resultDelivery == 
ResultDelivery.DEFERRED);
                             metadataProvider.setMaxResultReads(maxResultReads);
-                            stmtWithAsyncSupportUsed = true;
                         }
                         if (stats.getProfileType() == Stats.ProfileType.FULL) {
                             this.jobFlags.add(JobFlag.PROFILE_RUNTIME);
@@ -572,7 +569,6 @@
                         }
                         handleQuery(metadataProvider, (Query) stmt, hcc, 
resultSet, resultDelivery, outMetadata, stats,
                                 requestParameters, stmtParams, stmtRewriter);
-                        stmtWithAsyncSupportUsed = true;
                         break;
                     case ANALYZE:
                         handleAnalyzeStatement(metadataProvider, stmt, hcc, 
requestParameters);
@@ -608,7 +604,7 @@
             throw ex;
         } finally {
             // async queries are completed after their job completes
-            if (statements.isEmpty() || ResultDelivery.ASYNC != resultDelivery 
|| !stmtWithAsyncSupportUsed) {
+            if (statements.isEmpty() || ResultDelivery.ASYNC != 
resultDelivery) {
                 
appCtx.getRequestTracker().complete(requestParameters.getRequestReference().getUuid());
             }
             Thread.currentThread().setName(threadName);
@@ -6013,6 +6009,18 @@
         if (requestDataverseDecl != null) {
             statements.add(0, requestDataverseDecl);
         }
+        validateAsyncSupported(requestParameters);
+    }
+
+    private void validateAsyncSupported(IRequestParameters requestParameters) 
throws CompilationException {
+        if (requestParameters.getResultProperties().getDelivery() == 
ResultDelivery.ASYNC) {
+            Optional<Statement> stmsOpt = 
statements.stream().findAny().filter(s -> !s.getKind().isSupportAsync());
+            if (stmsOpt.isPresent()) {
+                Statement stmt = stmsOpt.get();
+                throw new 
CompilationException(ErrorCode.ASYNC_NOT_SUPPORTED_FOR_STATEMENT, 
stmt.getSourceLocation(),
+                        stmt.getKind().getDisplayName());
+            }
+        }
     }

     public static void validateStatements(List<Statement> statements, boolean 
allowMultiStatement,
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.5.update.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.5.update.sqlpp
index 31abd48..6adaa2d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.5.update.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.5.update.sqlpp
@@ -26,3 +26,6 @@
 UPSERT INTO Test { "id": 3, "val": 4.5 };

 UPSERT INTO Test { "id": 4, "val": 5.5 };
+
+// create samples to actually use parallel sort
+ANALYZE DATASET Test;
\ No newline at end of file
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.6.async.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.6.async.sqlpp
index 07a41f7..0e123c3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.6.async.sqlpp
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred-improved/async-json/async-json.6.async.sqlpp
@@ -20,7 +20,4 @@
 -- param include-host=false
 use test;
 SET `compiler.sort.parallel` "true";
-
-// create samples to actually use parallel sort
-analyze dataset Test;
 Select * from Test order by val;
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
index f8155ef..df49d16 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/AsyncDeferredQueries.xml
@@ -69,6 +69,13 @@
             <output-dir compare="Clean-JSON">async-json</output-dir>
         </compilation-unit>
     </test-case>
+    <test-case FilePath="async-deferred">
+        <compilation-unit name="async-not-supported">
+            <output-dir compare="Clean-JSON">async-not-supported</output-dir>
+            <expected-error>ASX1247: Async mode not supported for the 
statement CREATE COLLECTION</expected-error>
+            <source-location>false</source-location>
+        </compilation-unit>
+    </test-case>
     <test-case FilePath="async-deferred-improved">
         <compilation-unit name="async-failed">
             <output-dir compare="Clean-JSON">async-failed</output-dir>
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-not-supported/async-not-supported.1.async.sqlpp
 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-not-supported/async-not-supported.1.async.sqlpp
new file mode 100644
index 0000000..31cafaa
--- /dev/null
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/async-deferred/async-not-supported/async-not-supported.1.async.sqlpp
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+CREATE COLLECTION col PRIMARY KEY (id: int);
\ No newline at end of file
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml 
b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
index 9fe4843..ae77117 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
@@ -38,7 +38,7 @@
         <output-dir compare="Text">readonly-request</output-dir>
         <expected-error>ASX0044: CREATE_DATAVERSE statement is not supported 
in read-only mode</expected-error>
         <expected-error>ASX0044: DATAVERSE_DROP statement is not supported in 
read-only mode</expected-error>
-        <expected-error>ASX0044: DATASET_DECL statement is not supported in 
read-only mode</expected-error>
+        <expected-error>ASX0044: CREATE_DATASET statement is not supported in 
read-only mode</expected-error>
         <expected-error>ASX0044: DATASET_DROP statement is not supported in 
read-only mode</expected-error>
         <expected-error>ASX0044: CREATE_INDEX statement is not supported in 
read-only mode</expected-error>
         <expected-error>ASX0044: INDEX_DROP statement is not supported in 
read-only mode</expected-error>
@@ -129,7 +129,7 @@
       <compilation-unit name="get-non-query">
         <output-dir compare="Text">get-non-query</output-dir>
         <expected-error>CREATE_DATAVERSE statement is not supported in 
read-only mode</expected-error>
-        <expected-error>TYPE_DECL statement is not supported in read-only 
mode</expected-error>
+        <expected-error>CREATE_TYPE statement is not supported in read-only 
mode</expected-error>
         <expected-error>CREATE_FUNCTION statement is not supported in 
read-only mode</expected-error>
       </compilation-unit>
     </test-case>
@@ -141,7 +141,7 @@
     <test-case FilePath="api">
       <compilation-unit name="post-non-query">
         <output-dir compare="Text">post-non-query</output-dir>
-        <expected-error>TYPE_DECL statement is not supported in read-only 
mode</expected-error>
+        <expected-error>CREATE_TYPE statement is not supported in read-only 
mode</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="api">
diff --git 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
index f46e19f..dbdd41e 100644
--- 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
+++ 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
@@ -352,6 +352,7 @@
     UPDATE_PRIMARY_KEY(1244),
     PARQUET_WRITER_ERROR(1245),
     UPDATE_INSERT_POSITION_OUT_OF_BOUNDS(1246),
+    ASYNC_NOT_SUPPORTED_FOR_STATEMENT(1247),

     // Feed errors
     DATAFLOW_ILLEGAL_STATE(3001),
diff --git 
a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties 
b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
index 6b40eee..0850ad1 100644
--- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
+++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
@@ -354,6 +354,7 @@
 1244 = Cannot update primary key '%1$s'
 1245 = Parquet writer error: %1$s
 1246 = Insert position %1$s is out of bounds for array of length %2$s
+1247 = Async mode not supported for the statement %1$s

 # Feed Errors
 3001 = Illegal state.
diff --git 
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
 
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
index 6acaa07..6442b62 100644
--- 
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
+++ 
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Statement.java
@@ -72,59 +72,75 @@
     }

     enum Kind {
-        TRUNCATE,
-        DATASET_DECL,
-        DATAVERSE_DECL,
-        DATABASE_DROP,
-        DATAVERSE_DROP,
-        DATASET_DROP,
-        DELETE,
-        INSERT,
-        UPSERT,
-        UPDATE,
-        FUNCTION_DECL,
-        VIEW_DECL,
-        LOAD,
-        NODEGROUP_DECL,
-        NODEGROUP_DROP,
-        QUERY,
-        SET,
-        TYPE_DECL,
-        TYPE_DROP,
-        CREATE_INDEX,
-        CREATE_DATABASE,
-        CREATE_DATAVERSE,
-        CREATE_VIEW,
-        CREATE_FULL_TEXT_FILTER,
-        CREATE_FULL_TEXT_CONFIG,
-        INDEX_DROP,
-        FULL_TEXT_FILTER_DROP,
-        FULL_TEXT_CONFIG_DROP,
-        CREATE_FEED,
-        DROP_FEED,
-        START_FEED,
-        STOP_FEED,
-        CONNECT_FEED,
-        DISCONNECT_FEED,
-        CREATE_FEED_POLICY,
-        DROP_FEED_POLICY,
-        CREATE_FUNCTION,
-        CREATE_ADAPTER,
-        CREATE_LIBRARY,
-        FUNCTION_DROP,
-        ADAPTER_DROP,
-        LIBRARY_DROP,
-        CREATE_SYNONYM,
-        SYNONYM_DROP,
-        VIEW_DROP,
-        ANALYZE,
-        ANALYZE_DROP,
-        COMPACT,
-        SUBSCRIBE_FEED,
-        EXTENSION,
-        COPY_FROM,
-        COPY_TO,
-        CATALOG_CREATE,
-        CATALOG_DROP
+        SET("SET", true),
+        FUNCTION_DECL("DECLARE FUNCTION", false),
+        VIEW_DECL("DECLARE VIEW", false),
+        DATAVERSE_DECL("USE", true),
+        CREATE_DATABASE("CREATE DATABASE", false),
+        DATABASE_DROP("DROP DATABASE", false),
+        CREATE_DATAVERSE("CREATE SCOPE", false),
+        DATAVERSE_DROP("DROP SCOPE", false),
+        CREATE_DATASET("CREATE COLLECTION", false),
+        DATASET_DROP("DROP COLLECTION", false),
+        CREATE_INDEX("CREATE INDEX", false),
+        INDEX_DROP("DROP INDEX", false),
+        CREATE_VIEW("CREATE VIEW", false),
+        VIEW_DROP("DROP VIEW", false),
+        INSERT("INSERT", true),
+        UPSERT("UPSERT", true),
+        UPDATE("UPDATE", true),
+        DELETE("DELETE", false),
+        TRUNCATE("TRUNCATE COLLECTION", false),
+        LOAD("LOAD", false),
+        QUERY("QUERY", true),
+        CREATE_NODEGROUP("CREATE NODEGROUP", false),
+        NODEGROUP_DROP("DROP NODEGROUP", false),
+        CREATE_TYPE("CREATE TYPE", false),
+        TYPE_DROP("DROP TYPE", false),
+        CREATE_FULL_TEXT_FILTER("CREATE FULLTEXT FILTER", false),
+        CREATE_FULL_TEXT_CONFIG("CREATE FULLTEXT CONFIG", false),
+        FULL_TEXT_FILTER_DROP("DROP FULLTEXT FILTER", false),
+        FULL_TEXT_CONFIG_DROP("DROP FULLTEXT CONFIG", false),
+        CREATE_FEED("CREATE FEED", false),
+        DROP_FEED("DROP FEED", false),
+        START_FEED("START FEED", false),
+        STOP_FEED("STOP FEED", false),
+        CONNECT_FEED("CONNECT FEED", false),
+        DISCONNECT_FEED("DISCONNECT FEED", false),
+        CREATE_FEED_POLICY("CREATE INGESTION POLICY", false),
+        DROP_FEED_POLICY("DROP INGESTION POLICY", false),
+        CREATE_FUNCTION("CREATE FUNCTION", false),
+        FUNCTION_DROP("DROP FUNCTION", false),
+        CREATE_ADAPTER("CREATE ADAPTER", false),
+        ADAPTER_DROP("DROP ADAPTER", false),
+        CREATE_LIBRARY("CREATE LIBRARY", false),
+        LIBRARY_DROP("DROP LIBRARY", false),
+        CREATE_SYNONYM("CREATE SYNONYM", false),
+        SYNONYM_DROP("DROP SYNONYM", false),
+        ANALYZE("ANALYZE", false),
+        ANALYZE_DROP("ANALYZE DROP", false),
+        COMPACT("COMPACT", false),
+        SUBSCRIBE_FEED("SUBSCRIBE FEED", false),
+        EXTENSION("EXTENSION", false),
+        COPY_FROM("COPY FROM", false),
+        COPY_TO("COPY TO", true),
+        CATALOG_CREATE("CATALOG CREATE", false),
+        CATALOG_DROP("CATALOG DROP", false);
+
+        private final String displayName;
+        private final boolean isSupportAsync;
+
+        Kind(String displayName, boolean isSupportAsync) {
+            this.displayName = displayName;
+            this.isSupportAsync = isSupportAsync;
+        }
+
+        public String getDisplayName() {
+            return displayName;
+        }
+
+        public boolean isSupportAsync() {
+            return isSupportAsync;
+        }
     }
 }
diff --git 
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/DatasetDecl.java
 
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/DatasetDecl.java
index 210ffc5..ac5087d 100644
--- 
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/DatasetDecl.java
+++ 
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/DatasetDecl.java
@@ -202,7 +202,7 @@

     @Override
     public Kind getKind() {
-        return Statement.Kind.DATASET_DECL;
+        return Statement.Kind.CREATE_DATASET;
     }

     public IDatasetDetailsDecl getDatasetDetailsDecl() {
diff --git 
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/NodegroupDecl.java
 
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/NodegroupDecl.java
index a01c841..a835404 100644
--- 
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/NodegroupDecl.java
+++ 
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/NodegroupDecl.java
@@ -52,7 +52,7 @@

     @Override
     public Kind getKind() {
-        return Statement.Kind.NODEGROUP_DECL;
+        return Statement.Kind.CREATE_NODEGROUP;
     }

     @Override
diff --git 
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/TypeDecl.java
 
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/TypeDecl.java
index 264a797..63ee7ca 100644
--- 
a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/TypeDecl.java
+++ 
b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/TypeDecl.java
@@ -67,7 +67,7 @@

     @Override
     public Kind getKind() {
-        return Statement.Kind.TYPE_DECL;
+        return Statement.Kind.CREATE_TYPE;
     }

     @Override
diff --git 
a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
 
b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
index f155161..b0548aa 100644
--- 
a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
+++ 
b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
@@ -59,7 +59,7 @@
         typeDataGenMap = new HashMap<>();

         for (Statement stmt : statements) {
-            if (stmt.getKind() == Statement.Kind.TYPE_DECL) {
+            if (stmt.getKind() == Statement.Kind.CREATE_TYPE) {
                 TypeDecl td = (TypeDecl) stmt;
                 DataverseName typeDataverse =
                         td.getNamespace() == null ? defaultDv : 
td.getNamespace().getDataverseName();

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21212?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: lumina
Gerrit-Change-Id: Iad2a4ec54b01ca53142852261787e070a781b031
Gerrit-Change-Number: 21212
Gerrit-PatchSet: 7
Gerrit-Owner: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-Reviewer: Murtadha Hubail <[email protected]>

Reply via email to