[asterixdb] 03/03: Merge branch 'gerrit/mad-hatter'

[mb...@apache.org]

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

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

commit 8bab19affcedf57492c9861069fd5eab593bbd52
Merge: c961938 ae88ece
Author: Michael Blow <mb...@apache.org>
AuthorDate: Thu Jul 30 18:39:45 2020 -0400

    Merge branch 'gerrit/mad-hatter'
    
    Change-Id: I78f3e2ee495feec5bf311261188c48dd770b66ad

 .../org/apache/asterix/app/translator/QueryTranslator.java |  7 ++++++-
 .../java/org/apache/asterix/test/common/TestExecutor.java  | 14 ++++++++++++--
 .../ddl/invalid-dataverse/invalid-dataverse.003.ddl.sqlpp  |  2 +-
 .../algebricks/common/exceptions/AlgebricksException.java  |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index 95fb793,66ea5f8..3e64d37
--- 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
@@@ -1643,7 -1579,12 +1643,12 @@@ public class QueryTranslator extends Ab
              // Check if the dataverse exists
              Dataverse dv = MetadataManager.INSTANCE.getDataverse(mdTxnCtx.getValue(), dataverseName);
              if (dv == null) {
-                 throw new CompilationException(ErrorCode.UNKNOWN_DATAVERSE, sourceLoc, dataverseName);
+                 if (ifExists) {
+                     MetadataManager.INSTANCE.commitTransaction(mdTxnCtx.getValue());
 -                    return;
++                    return false;
+                 } else {
+                     throw new CompilationException(ErrorCode.UNKNOWN_DATAVERSE, sourceLoc, dataverseName);
+                 }
              }
              Dataset ds = metadataProvider.findDataset(dataverseName, datasetName);
              if (ds == null) {
diff --cc asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index ceb0dbb,e4063c0..2399064
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@@ -68,7 -68,7 +68,8 @@@ import java.util.concurrent.TimeoutExce
  import java.util.function.Predicate;
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;
+ import java.util.regex.PatternSyntaxException;
 +import java.util.stream.Collectors;
  import java.util.stream.IntStream;
  import java.util.stream.Stream;