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
commit c561f444e51bf8d5d9b0a8a58d66a69fa30d6931 Merge: 0425295 ef1479a Author: Dmitry Lychagin <[email protected]> AuthorDate: Tue Jan 26 14:44:04 2021 -0800 Merge branch 'gerrit/cheshire-cat' Change-Id: Ida0aef82a8fc4553bed96ceed230ce97af2c6f3f asterixdb/NOTICE | 2 +- .../subplan/InlineAllNtsInSubplanVisitor.java | 12 +- asterixdb/asterix-app/pom.xml | 4 + .../apache/asterix/test/common/TestConstants.java | 31 ++- .../apache/asterix/test/common/TestExecutor.java | 28 +- .../AzureBlobStorageExternalDatasetTest.java | 18 ++ .../queries/subquery/query-ASTERIXDB-2815-2.sqlpp | 42 +++ .../queries/subquery/query-ASTERIXDB-2815-3.sqlpp | 45 ++++ .../results/subquery/query-ASTERIXDB-2815-2.plan | 72 +++++ .../results/subquery/query-ASTERIXDB-2815-3.plan | 73 +++++ .../invalid-auth-methods/test.000.ddl.sqlpp | 38 +++ .../invalid-auth-methods/test.099.ddl.sqlpp | 20 ++ .../invalid-no-auth/test.000.ddl.sqlpp | 35 +++ .../invalid-no-auth/test.099.ddl.sqlpp | 20 ++ .../valid-auth-methods/test.000.ddl.sqlpp | 36 +++ .../valid-auth-methods/test.001.query.sqlpp | 21 ++ .../valid-auth-methods/test.099.ddl.sqlpp | 20 ++ .../query-ASTERIXDB-2815.4.query.sqlpp | 32 +++ .../query-ASTERIXDB-2815.5.query.sqlpp | 35 +++ .../auth-methods/valid-auth-methods/result.001.adm | 1 + .../query-ASTERIXDB-2815.4.adm | 5 + .../query-ASTERIXDB-2815.5.adm | 5 + ...stsuite_external_dataset_azure_blob_storage.xml | 56 ++++ .../common/context/GlobalVirtualBufferCache.java | 7 +- .../asterix/common/exceptions/ErrorCode.java | 2 + .../src/main/resources/asx_errormsg/en.properties | 2 + asterixdb/asterix-doc/src/main/grammar/sqlpp.ebnf | 156 +++++------ .../asterix-doc/src/main/markdown/sqlpp/0_toc.md | 2 +- .../asterix-doc/src/main/markdown/sqlpp/2_expr.md | 53 ++-- .../src/main/markdown/sqlpp/3_declare_dataverse.md | 33 --- .../src/main/markdown/sqlpp/3_declare_function.md | 45 ---- .../asterix-doc/src/main/markdown/sqlpp/3_query.md | 12 + .../asterix-doc/src/main/markdown/sqlpp/4_error.md | 113 -------- .../src/main/markdown/sqlpp/4_error_title.md | 20 -- .../src/main/markdown/sqlpp/5_ddl_dataset_index.md | 296 --------------------- .../src/main/markdown/sqlpp/5_ddl_dml.md | 92 ------- .../main/markdown/sqlpp/5_ddl_function_removal.md | 120 --------- .../src/main/markdown/sqlpp/5_ddl_head.md | 36 --- .../src/main/markdown/sqlpp/7_ddl_dml.md | 98 +++++-- .../src/main/markdown/sqlpp/appendix_1_keywords.md | 34 +-- .../external/util/ExternalDataConstants.java | 6 +- .../asterix/external/util/ExternalDataUtils.java | 84 ++++-- .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 13 +- asterixdb/pom.xml | 47 ++++ hyracks-fullstack/NOTICE | 2 +- .../runtime/SuperActivityOperatorNodePushable.java | 4 +- .../org/apache/hyracks/http/server/HttpServer.java | 105 +++++--- .../apache/hyracks/test/http/HttpServerTest.java | 49 +++- 48 files changed, 1097 insertions(+), 985 deletions(-) diff --cc asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_azure_blob_storage.xml index a715e7e,df60e60..c6bad70 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_azure_blob_storage.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_azure_blob_storage.xml @@@ -18,6 -18,62 +18,62 @@@ ! under the License. !--> <test-suite xmlns="urn:xml.testframework.asterix.apache.org" ResultOffsetPath="results" QueryOffsetPath="queries_sqlpp" QueryFileExtension=".sqlpp"> + <test-group name="authentication"> + <test-case FilePath="external-dataset/azure_blob_storage/auth-methods"> + <compilation-unit name="valid-auth-methods"> + <placeholder name="azureblob-credentialsname" value="accountKey" /> + <placeholder name="azureblob-credentialsvalue" value="%azureblob-accountkey%" /> + <output-dir compare="Text">valid-auth-methods</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/azure_blob_storage/auth-methods"> + <compilation-unit name="valid-auth-methods"> + <placeholder name="azureblob-credentialsname" value="sharedAccessSignature" /> + <placeholder name="azureblob-credentialsvalue" value="%azureblob-sas%" /> + <output-dir compare="Text">valid-auth-methods</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/azure_blob_storage/auth-methods"> + <compilation-unit name="valid-auth-methods"> + <placeholder name="azureblob-credentialsname" value="connectionString" /> + <placeholder name="azureblob-credentialsvalue" value="%azureblob-connectionstringaccountkey%" /> + <output-dir compare="Text">valid-auth-methods</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/azure_blob_storage/auth-methods"> + <compilation-unit name="valid-auth-methods"> + <placeholder name="azureblob-credentialsname" value="connectionString" /> + <placeholder name="azureblob-credentialsvalue" value="%azureblob-connectionstringsas%" /> + <output-dir compare="Text">valid-auth-methods</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/azure_blob_storage/auth-methods"> + <compilation-unit name="invalid-auth-methods"> + <placeholder name="azureblob-credentialsname-1" value="accountKey" /> + <placeholder name="azureblob-credentialsvalue-1" value="%azureblob-accountkey%" /> + <placeholder name="azureblob-credentialsname-2" value="connectionString" /> + <placeholder name="azureblob-credentialsvalue-2" value="%azureblob-connectionstringaccountkey%" /> + <output-dir compare="Text">invalid-auth-methods</output-dir> - <expected-error>ASX1133: Only a single authentication method is allowed: connectionString, accountName & accountKey, or accountName & sharedAccessSignature</expected-error> ++ <expected-error>ASX1138: Only a single authentication method is allowed: connectionString, accountName & accountKey, or accountName & sharedAccessSignature</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/azure_blob_storage/auth-methods"> + <compilation-unit name="invalid-auth-methods"> + <placeholder name="azureblob-credentialsname-1" value="sharedAccessSignature" /> + <placeholder name="azureblob-credentialsvalue-1" value="%azureblob-sas%" /> + <placeholder name="azureblob-credentialsname-2" value="connectionString" /> + <placeholder name="azureblob-credentialsvalue-2" value="%azureblob-connectionstringaccountkey%" /> + <output-dir compare="Text">invalid-auth-methods</output-dir> - <expected-error>ASX1133: Only a single authentication method is allowed: connectionString, accountName & accountKey, or accountName & sharedAccessSignature</expected-error> ++ <expected-error>ASX1138: Only a single authentication method is allowed: connectionString, accountName & accountKey, or accountName & sharedAccessSignature</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="external-dataset/azure_blob_storage/auth-methods"> + <compilation-unit name="invalid-no-auth"> + <output-dir compare="Text">invalid-no-auth</output-dir> - <expected-error>ASX1134: No authentication parameters provided</expected-error> ++ <expected-error>ASX1139: No authentication parameters provided</expected-error> + </compilation-unit> + </test-case> + </test-group> <test-group name="external-dataset"> <test-case FilePath="external-dataset"> <compilation-unit name="common/json/json"> diff --cc asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java index 93d0ee9,d662c8d..77c6b8d --- 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 @@@ -222,12 -222,8 +222,14 @@@ public class ErrorCode public static final int ILLEGAL_RIGHT_OUTER_JOIN = 1130; public static final int SYNONYM_EXISTS = 1131; public static final int INVALID_HINT = 1132; - public static final int ONLY_SINGLE_AUTHENTICATION_IS_ALLOWED = 1133; - public static final int NO_AUTH_METHOD_PROVIDED = 1134; + public static final int FULL_TEXT_FILTER_NOT_FOUND = 1133; + public static final int FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED = 1134; + public static final int FULL_TEXT_CONFIG_ALREADY_EXISTS = 1135; + public static final int FULL_TEXT_FILTER_ALREADY_EXISTS = 1136; + public static final int FULL_TEXT_CONFIG_NOT_FOUND = 1137; ++ public static final int ONLY_SINGLE_AUTHENTICATION_IS_ALLOWED = 1138; ++ public static final int NO_AUTH_METHOD_PROVIDED = 1139; + // Feed errors public static final int DATAFLOW_ILLEGAL_STATE = 3001; public static final int UTIL_DATAFLOW_UTILS_TUPLE_TOO_LARGE = 3002; diff --cc asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties index c5e4ce9,3eed1d8..5b993a7 --- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties +++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties @@@ -219,11 -219,8 +219,13 @@@ 1130 = Illegal use of RIGHT OUTER JOIN 1131 = A synonym with this name %1$s already exists 1132 = Invalid specification for hint %1$s. %2$s -1133 = Only a single authentication method is allowed: connectionString, accountName & accountKey, or accountName & sharedAccessSignature -1134 = No authentication parameters provided +1133 = Full-text filter %1$s not found +1134 = Default full-text config with a name of null cannot be deleted or created +1135 = Full-text config %1$s already exists +1136 = Full-text filter %1$s already exists +1137 = Full-text config %1$s not found ++1138 = Only a single authentication method is allowed: connectionString, accountName & accountKey, or accountName & sharedAccessSignature ++1139 = No authentication parameters provided # Feed Errors 3001 = Illegal state.
