[asterixdb] branch master updated: [NO ISSUE][*DB][COMP] Return Dataset (if created) from doCreateDatasetStatement

[dlych]

This is an automated email from the ASF dual-hosted git repository.

dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new e508436  [NO ISSUE][*DB][COMP] Return Dataset (if created) from 
doCreateDatasetStatement
e508436 is described below

commit e508436bb93ca9f64bc470de5389fd157aa544e5
Author: Michael Blow <mb...@apache.org>
AuthorDate: Wed Sep 22 20:29:50 2021 -0400

    [NO ISSUE][*DB][COMP] Return Dataset (if created) from 
doCreateDatasetStatement
    
    Change-Id: I606529edb28c78c285928227edef4ac0b853b067
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/13346
    Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
    Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Murtadha Hubail <mhub...@apache.org>
---
 .../java/org/apache/asterix/app/translator/QueryTranslator.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 cd58a69..ca749df 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
@@ -39,6 +39,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
@@ -689,7 +690,7 @@ public class QueryTranslator extends AbstractLangTranslator 
implements IStatemen
         }
     }
 
-    protected void doCreateDatasetStatement(MetadataProvider metadataProvider, 
DatasetDecl dd,
+    protected Optional<? extends Dataset> 
doCreateDatasetStatement(MetadataProvider metadataProvider, DatasetDecl dd,
             DataverseName dataverseName, String datasetName, DataverseName 
itemTypeDataverseName,
             TypeExpression itemTypeExpr, String itemTypeName, TypeExpression 
metaItemTypeExpr,
             DataverseName metaItemTypeDataverseName, String metaItemTypeName, 
IHyracksClientConnection hcc,
@@ -724,7 +725,7 @@ public class QueryTranslator extends AbstractLangTranslator 
implements IStatemen
                 }
                 if (dd.getIfNotExists()) {
                     MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
-                    return;
+                    return Optional.empty();
                 } else {
                     throw new CompilationException(ErrorCode.DATASET_EXISTS, 
sourceLoc, datasetName, dataverseName);
                 }
@@ -902,6 +903,7 @@ public class QueryTranslator extends AbstractLangTranslator 
implements IStatemen
             }
             throw e;
         }
+        return Optional.of(dataset);
     }
 
     protected Triple<DataverseName, String, Boolean> 
extractDatasetItemTypeName(DataverseName datasetDataverseName,