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 c8dd3792e5026893d4189ab920b93607ed39be3b Author: Hussain Towaileb <[email protected]> AuthorDate: Thu Aug 27 23:08:29 2020 +0300 [ASTERIXDB-2768][COMP] Warn in DROP ... IF EXISTS when dataverse not found. - user model changes: no - storage format changes: no - interface changes: no Details: - For drop commands such as "drop dataset myDataverse.myDataset if exists" should drop a warning if myDataverse is not found. Change-Id: I562d80296d8d2ff343f2a5bf61484f5c9047e2b8 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/7563 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Reviewed-by: Dmitry Lychagin <[email protected]> --- .../asterix/app/translator/QueryTranslator.java | 20 ++++++++++++- .../apache/asterix/test/common/TestExecutor.java | 35 ++++++++++++++-------- .../test.000.ddl.sqlpp} | 13 ++++---- .../test.001.ddl.sqlpp} | 3 +- .../test.002.ddl.sqlpp} | 3 +- .../test.003.ddl.sqlpp} | 3 +- .../test.004.ddl.sqlpp} | 3 +- .../test.005.ddl.sqlpp} | 3 +- .../test.006.ddl.sqlpp} | 3 +- .../test.007.ddl.sqlpp} | 3 +- .../test.008.ddl.sqlpp} | 3 +- .../test.009.ddl.sqlpp} | 3 +- .../test.010.ddl.sqlpp} | 3 +- .../test.011.ddl.sqlpp} | 3 +- .../test.999.ddl.sqlpp} | 3 +- .../invalid-dataverse.001.ddl.sqlpp | 4 ++- .../invalid-dataverse.002.ddl.sqlpp | 6 ++-- .../invalid-dataverse.003.ddl.sqlpp | 7 +++-- .../invalid-dataverse.004.ddl.sqlpp | 8 +++-- .../invalid-dataverse.005.ddl.sqlpp | 8 +++-- .../invalid-dataverse.006.ddl.sqlpp | 8 +++-- .../invalid-dataverse.007.ddl.sqlpp | 2 ++ .../invalid-dataverse.008.ddl.sqlpp | 2 ++ .../runtimets/testsuite_external_dataset.xml | 2 ++ .../test/resources/runtimets/testsuite_sqlpp.xml | 23 ++++++++++---- 25 files changed, 120 insertions(+), 54 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 66ea5f8..d49996a 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 @@ -199,6 +199,7 @@ import org.apache.hyracks.api.client.IClusterInfoCollector; import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.dataflow.value.ITypeTraits; import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.api.exceptions.IWarningCollector; import org.apache.hyracks.api.exceptions.SourceLocation; import org.apache.hyracks.api.exceptions.Warning; import org.apache.hyracks.api.io.FileSplit; @@ -274,6 +275,10 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen return functionDecls; } + public IWarningCollector getWarningCollector() { + return warningCollector; + } + @Override public void compileAndExecute(IHyracksClientConnection hcc, IRequestParameters requestParameters) throws Exception { validateStatements(statements, requestParameters.isMultiStatement(), @@ -1580,6 +1585,10 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen Dataverse dv = MetadataManager.INSTANCE.getDataverse(mdTxnCtx.getValue(), dataverseName); if (dv == null) { if (ifExists) { + if (warningCollector.shouldWarn()) { + warningCollector + .warn(WarningUtil.forAsterix(sourceLoc, ErrorCode.UNKNOWN_DATAVERSE, dataverseName)); + } MetadataManager.INSTANCE.commitTransaction(mdTxnCtx.getValue()); return; } else { @@ -1864,7 +1873,16 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen // Check if the dataverse exists Dataverse dv = MetadataManager.INSTANCE.getDataverse(mdTxnCtx, dataverseName); if (dv == null) { - throw new CompilationException(ErrorCode.UNKNOWN_DATAVERSE, sourceLoc, dataverseName); + if (stmtTypeDrop.getIfExists()) { + if (warningCollector.shouldWarn()) { + warningCollector + .warn(WarningUtil.forAsterix(sourceLoc, ErrorCode.UNKNOWN_DATAVERSE, dataverseName)); + } + MetadataManager.INSTANCE.commitTransaction(mdTxnCtx); + return; + } else { + throw new CompilationException(ErrorCode.UNKNOWN_DATAVERSE, sourceLoc, dataverseName); + } } Datatype dt = MetadataManager.INSTANCE.getDatatype(mdTxnCtx, dataverseName, typeName); diff --git 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 index e4063c0..8bf2ee5 100644 --- 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 @@ -960,11 +960,14 @@ public class TestExecutor { File expectedResultFile; switch (ctx.getType()) { case "ddl": + ExtractedResult ddlExtractedResult; if (ctx.getFile().getName().endsWith("aql")) { - executeAqlUpdateOrDdl(statement, OutputFormat.CLEAN_JSON); + ddlExtractedResult = executeAqlUpdateOrDdl(statement, OutputFormat.CLEAN_JSON); } else { - executeSqlppUpdateOrDdl(statement, OutputFormat.CLEAN_JSON); + ddlExtractedResult = executeSqlppUpdateOrDdl(statement, OutputFormat.CLEAN_JSON); } + + validateWarning(ddlExtractedResult, testCaseCtx, cUnit, testFile, expectedWarnings); break; case "update": // isDmlRecoveryTest: set IP address @@ -1010,11 +1013,7 @@ public class TestExecutor { variableCtx, ctx, expectedResultFile, actualResultFile, queryCount, expectedResultFileCtxs.size(), cUnit.getParameter(), ComparisonEnum.TEXT); - if (testCaseCtx.getTestCase().isCheckWarnings()) { - boolean expectedSourceLoc = testCaseCtx.isSourceLocationExpected(cUnit); - validateWarnings(extractedResult.getWarnings(), cUnit.getExpectedWarn(), expectedWarnings, - expectedSourceLoc); - } + validateWarning(extractedResult, testCaseCtx, cUnit, testFile, expectedWarnings); break; case "store": // This is a query that returns the expected output of a subsequent query @@ -1560,18 +1559,18 @@ public class TestExecutor { } } - public InputStream executeSqlppUpdateOrDdl(String statement, OutputFormat outputFormat) throws Exception { + public ExtractedResult executeSqlppUpdateOrDdl(String statement, OutputFormat outputFormat) throws Exception { return executeUpdateOrDdl(statement, outputFormat, getQueryServiceUri(SQLPP)); } - private InputStream executeAqlUpdateOrDdl(String statement, OutputFormat outputFormat) throws Exception { + private ExtractedResult executeAqlUpdateOrDdl(String statement, OutputFormat outputFormat) throws Exception { return executeUpdateOrDdl(statement, outputFormat, getQueryServiceUri(AQL)); } - private InputStream executeUpdateOrDdl(String statement, OutputFormat outputFormat, URI serviceUri) + private ExtractedResult executeUpdateOrDdl(String statement, OutputFormat outputFormat, URI serviceUri) throws Exception { InputStream resultStream = executeQueryService(statement, serviceUri, outputFormat, UTF_8); - return ResultExtractor.extract(resultStream, UTF_8).getResult(); + return ResultExtractor.extract(resultStream, UTF_8); } protected static boolean isExpected(Exception e, CompilationUnit cUnit) { @@ -2241,8 +2240,17 @@ public class TestExecutor { return extension.endsWith(AQL) ? getEndpoint(Servlets.QUERY_AQL) : getEndpoint(Servlets.QUERY_SERVICE); } - private void validateWarnings(List<String> actualWarnings, List<String> expectedWarn, BitSet expectedWarnings, - boolean expectedSourceLoc) throws Exception { + protected void validateWarning(ExtractedResult result, TestCaseContext testCaseCtx, CompilationUnit cUnit, + File testFile, BitSet expectedWarnings) throws Exception { + if (testCaseCtx.getTestCase().isCheckWarnings()) { + boolean expectedSourceLoc = testCaseCtx.isSourceLocationExpected(cUnit); + validateWarnings(result.getWarnings(), cUnit.getExpectedWarn(), expectedWarnings, expectedSourceLoc, + testFile); + } + } + + protected void validateWarnings(List<String> actualWarnings, List<String> expectedWarn, BitSet expectedWarnings, + boolean expectedSourceLoc, File testFile) throws Exception { if (actualWarnings != null) { for (String actualWarn : actualWarnings) { OptionalInt first = IntStream.range(0, expectedWarn.size()) @@ -2265,6 +2273,7 @@ public class TestExecutor { } int warningIndex = first.getAsInt(); expectedWarnings.clear(warningIndex); + LOGGER.info("testFile {} issued an (expected) warning", testFile); } } } diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.003.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.000.ddl.sqlpp similarity index 75% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.003.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.000.ddl.sqlpp index 0bb88db..16f4604 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.003.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.000.ddl.sqlpp @@ -17,12 +17,9 @@ * under the License. */ -drop dataverse realDataverse if exists; -create dataverse realDataverse; -use realDataverse; - -drop type realDataverse.myType if exists; -create type realDataverse.myType as open { id: uuid, f1: int }; - -drop dataset fakeDataverse.myDataset /*if exists*/; +-- param max-warnings:json=1000 +create dataverse realDataverse; +create type realDataverse.realType as open { id: uuid }; +create dataset realDataverse.realDataset1(realDataverse.realType) primary key id autogenerated; +create dataset realDataverse.realDataset2(realDataverse.realType) primary key id autogenerated; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.001.ddl.sqlpp similarity index 88% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.001.ddl.sqlpp index 0fb09b8..6d9fcee 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.001.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop type fakeDataverse.fakeType; // fails, error dataverse not found \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.002.ddl.sqlpp similarity index 88% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.002.ddl.sqlpp index 0fb09b8..e864dd6 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.002.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop type fakeDataverse.realType; // fails, error dataverse not found \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.003.ddl.sqlpp similarity index 87% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.003.ddl.sqlpp index 0fb09b8..1de1496 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.003.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop type fakeDataverse.realType if exists; // succeeds, warn dataverse not found \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.004.ddl.sqlpp similarity index 88% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.004.ddl.sqlpp index 0fb09b8..0d1de03 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.004.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop dataset fakeDataverse.fakeDataset1; // fails, error dataverse not found \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.005.ddl.sqlpp similarity index 88% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.005.ddl.sqlpp index 0fb09b8..5abfc5e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.005.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop dataset fakeDataverse.realDataset1; // fails, error dataverse not found \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.006.ddl.sqlpp similarity index 87% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.006.ddl.sqlpp index 0fb09b8..6c7670e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.006.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop dataset fakeDataverse.fakeDataset1 if exists; // succeeds, warn dataverse not found \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.007.ddl.sqlpp similarity index 87% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.007.ddl.sqlpp index 0fb09b8..1a07955 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.007.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop dataset fakeDataverse.realDataset1 if exists; // succeeds, warn dataverse not found \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.008.ddl.sqlpp similarity index 88% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.008.ddl.sqlpp index 0fb09b8..6744022 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.008.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop dataset realDataverse.fakeDataset1; // fails, error dataset not found \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.009.ddl.sqlpp similarity index 90% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.009.ddl.sqlpp index 0fb09b8..d807d1f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.009.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop dataset realDataverse.realDataset1; // succeeds \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.010.ddl.sqlpp similarity index 88% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.010.ddl.sqlpp index 0fb09b8..228c6c7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.010.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop dataset realDataverse.fakeDataset2 if exists; // succeeds, no warning \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.011.ddl.sqlpp similarity index 89% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.011.ddl.sqlpp index 0fb09b8..e5be8cb 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.011.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop dataset realDataverse.realDataset2 if exists; // succeeds \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.999.ddl.sqlpp similarity index 91% copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.999.ddl.sqlpp index 0fb09b8..304387f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/drop_dataset_invalid_dataverse/test.999.ddl.sqlpp @@ -17,5 +17,6 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 +drop dataverse realDataverse if exists; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp index 0fb09b8..67ff279 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.001.ddl.sqlpp @@ -17,5 +17,7 @@ * under the License. */ -drop type fakeDataverse.myType if exists; +-- param max-warnings:json=1000 + +drop type fakeDataverse.myType if exists; // success, issue warning diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.002.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.002.ddl.sqlpp index c6715e4..0bd6b85 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.002.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.002.ddl.sqlpp @@ -17,10 +17,12 @@ * under the License. */ +-- param max-warnings:json=1000 + drop dataverse realDataverse if exists; create dataverse realDataverse; use realDataverse; -drop type realDataverse.myType if exists; -create type fakeDataverse.myType as open { id: uuid, f1: int }; +drop type realDataverse.myType if exists; // success, no warning +create type fakeDataverse.myType as open { id: uuid, f1: int }; // fails, error dataverse not found diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.003.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.003.ddl.sqlpp index 0bb88db..21127f8 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.003.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.003.ddl.sqlpp @@ -17,12 +17,13 @@ * under the License. */ +-- param max-warnings:json=1000 + drop dataverse realDataverse if exists; create dataverse realDataverse; use realDataverse; -drop type realDataverse.myType if exists; +drop type realDataverse.myType if exists; // success, no warning create type realDataverse.myType as open { id: uuid, f1: int }; -drop dataset fakeDataverse.myDataset /*if exists*/; - +drop dataset fakeDataverse.myDataset if exists; // success, issue warning diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.004.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.004.ddl.sqlpp index 2e33fc3..4a820e5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.004.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.004.ddl.sqlpp @@ -17,13 +17,15 @@ * under the License. */ +-- param max-warnings:json=1000 + drop dataverse realDataverse if exists; create dataverse realDataverse; use realDataverse; -drop type realDataverse.myType if exists; +drop type realDataverse.myType if exists; // success, no warning create type realDataverse.myType as open { id: uuid, f1: int }; -drop dataset realDataverse.myDataset if exists; -create dataset fakeDataverse.myDataset(fakeDataverse.myType) primary key id autogenerated; +drop dataset realDataverse.myDataset if exists; // success +create dataset fakeDataverse.myDataset(fakeDataverse.myType) primary key id autogenerated; // fail, fake dataverse not found diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.005.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.005.ddl.sqlpp index 9723237..24aad2a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.005.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.005.ddl.sqlpp @@ -17,13 +17,15 @@ * under the License. */ +-- param max-warnings:json=1000 + drop dataverse realDataverse if exists; create dataverse realDataverse; use realDataverse; -drop type realDataverse.myType if exists; +drop type realDataverse.myType if exists; // success, no warning create type realDataverse.myType as open { id: uuid, f1: int }; -drop dataset realDataverse.myDataset if exists; -create dataset realDataverse.myDataset(fakeDataverse.myType) primary key id autogenerated; +drop dataset realDataverse.myDataset if exists; // success, no warning +create dataset realDataverse.myDataset(fakeDataverse.myType) primary key id autogenerated; // fail, fakeDataverse not found diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.006.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.006.ddl.sqlpp index 9c52c7b..19f55b5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.006.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.006.ddl.sqlpp @@ -17,13 +17,15 @@ * under the License. */ +-- param max-warnings:json=1000 + drop dataverse realDataverse if exists; create dataverse realDataverse; use realDataverse; -drop type realDataverse.myType if exists; +drop type realDataverse.myType if exists; // success create type realDataverse.myType as open { id: uuid, f1: int }; -drop dataset realDataverse.myDataset if exists; -create dataset fakeDataverse.myDataset(realDataverse.myType) primary key id autogenerated; +drop dataset realDataverse.myDataset if exists; // success +create dataset fakeDataverse.myDataset(realDataverse.myType) primary key id autogenerated; // fail, fakeDataverse not found diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.007.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.007.ddl.sqlpp index 56f08fd..89902f1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.007.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.007.ddl.sqlpp @@ -17,6 +17,8 @@ * under the License. */ + -- param max-warnings:json=1000 + drop dataverse realDataverse if exists; create dataverse realDataverse; use realDataverse; diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.008.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.008.ddl.sqlpp index 9375963..2c9da5e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.008.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/ddl/invalid-dataverse/invalid-dataverse.008.ddl.sqlpp @@ -17,6 +17,8 @@ * under the License. */ + -- param max-warnings:json=1000 + drop dataverse realDataverse if exists; create dataverse realDataverse; use realDataverse; diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml index 3a4f03e..87ba14d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset.xml @@ -102,6 +102,8 @@ <test-case FilePath="external-dataset" check-warnings="true"> <compilation-unit name="aws/s3/no-files-returned/definition-points-to-nothing"> <output-dir compare="Text">aws/s3/no-files-returned/definition-points-to-nothing</output-dir> + <source-location>false</source-location> + <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn> <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn> </compilation-unit> </test-case> diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index 51ac565..be3e55c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -3897,17 +3897,17 @@ <expected-error>Cannot drop index "ds". Drop dataset "ds" to remove this index</expected-error> </compilation-unit> </test-case> - <test-case FilePath="ddl"> + <test-case FilePath="ddl" check-warnings="true"> <compilation-unit name="invalid-dataverse"> <output-dir compare="Text">invalid-dataverse</output-dir> <source-location>false</source-location> - <expected-error>Cannot find dataverse with name fakeDataverse (in line 20, at column 1)</expected-error> - <expected-error>Cannot find dataverse with name fakeDataverse (in line 25, at column 1)</expected-error> + <expected-warn>Cannot find dataverse with name fakeDataverse (in line 22, at column 1)</expected-warn> <expected-error>Cannot find dataverse with name fakeDataverse (in line 27, at column 1)</expected-error> - <expected-error>Cannot find dataverse with name fakeDataverse (in line 28, at column 1)</expected-error> + <expected-warn>Cannot find dataverse with name fakeDataverse (in line 29, at column 1)</expected-warn> + <expected-error>Cannot find dataverse with name fakeDataverse (in line 30, at column 1)</expected-error> <expected-error>Cannot find datatype with name fakeDataverse.myType</expected-error> - <expected-error>Cannot find dataverse with name fakeDataverse (in line 28, at column 1)</expected-error> <expected-error>Cannot find dataverse with name fakeDataverse (in line 30, at column 1)</expected-error> + <expected-error>Cannot find dataverse with name fakeDataverse (in line 32, at column 1)</expected-error> </compilation-unit> </test-case> <test-case FilePath="ddl"> @@ -3915,6 +3915,19 @@ <output-dir compare="Text">dataset-and-index-same-dataverse</output-dir> </compilation-unit> </test-case> + <test-case FilePath="ddl" check-warnings="true"> + <compilation-unit name="drop_dataset_invalid_dataverse"> + <output-dir compare="Text">drop_dataset_invalid_dataverse</output-dir> + <expected-error>ASX1063: Cannot find dataverse with name fakeDataverse (in line 22, at column 1)</expected-error> + <expected-error>ASX1063: Cannot find dataverse with name fakeDataverse (in line 22, at column 1)</expected-error> + <expected-error>ASX1063: Cannot find dataverse with name fakeDataverse (in line 22, at column 1)</expected-error> + <expected-error>ASX1063: Cannot find dataverse with name fakeDataverse (in line 22, at column 1)</expected-error> + <expected-error>ASX1050: Cannot find dataset with name fakeDataset1 in dataverse realDataverse (in line 22, at column 1)</expected-error> + <expected-warn>ASX1063: Cannot find dataverse with name fakeDataverse (in line 22, at column 1)</expected-warn> + <expected-warn>ASX1063: Cannot find dataverse with name fakeDataverse (in line 22, at column 1)</expected-warn> + <expected-warn>ASX1063: Cannot find dataverse with name fakeDataverse (in line 22, at column 1)</expected-warn> + </compilation-unit> + </test-case> </test-group> <test-group name="dml"> <test-case FilePath="dml">
