This is an automated email from the ASF dual-hosted git repository. htowaileb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 8eba12267c192dc3bccfc6e5e6d4242d8dca310f Merge: 19039cd a980621 Author: Hussain Towaileb <[email protected]> AuthorDate: Tue Jul 6 21:43:13 2021 +0300 Merge branch 'gerrit/cheshire-cat' Change-Id: I94f48e4cf9322d85743b1eb0f9d750502ee84e70 .../test/external_dataset/ExternalDatasetTestUtils.java | 4 ++-- .../microsoft/AzureBlobStorageExternalDatasetTest.java | 7 +++++++ .../test.000.ddl.sqlpp | 3 +-- .../test.099.ddl.sqlpp | 0 .../test.000.ddl.sqlpp | 3 +-- .../test.001.query.sqlpp} | 3 ++- .../test.099.ddl.sqlpp | 0 .../test.000.ddl.sqlpp | 0 .../test.001.query.sqlpp} | 3 ++- .../test.099.ddl.sqlpp | 0 .../result.001.adm | 1 + .../testsuite_external_dataset_azure_blob_storage.xml | 17 ++++++++++++++--- .../src/test/resources/runtimets/testsuite_sqlpp.xml | 4 ++-- .../org/apache/asterix/common/exceptions/ErrorCode.java | 13 +++++++------ .../src/main/resources/asx_errormsg/en.properties | 13 +++++++------ .../apache/asterix/external/util/ExternalDataUtils.java | 13 +++++++------ 16 files changed, 53 insertions(+), 31 deletions(-) diff --cc asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index 72ad331,7e92aff..02b5721 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@@ -7972,416 -7837,6 +7972,416 @@@ </compilation-unit> </test-case> </test-group> + <test-group name="array-index"> + <test-group name="array-index/error-handling"> + <test-case FilePath="array-index/error-handling"> + <compilation-unit name="index-two-array-fields"> + <output-dir compare="Text">index-two-array-fields</output-dir> + <expected-error>ASX1079: Compilation error: Cannot create composite index with multiple array fields using different arrays</expected-error> + <expected-error>ASX1079: Compilation error: Cannot create composite index with multiple array fields using different arrays</expected-error> + <source-location>false</source-location> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/error-handling"> + <compilation-unit name="invalid-array-path"> + <output-dir compare="Text">invalid-array-path</output-dir> + <expected-error>ASX0037: Type mismatch: expected value of type array or multiset, but got the value of type CheckinType_checkin_time:</expected-error> + <expected-error>ASX0037: Type mismatch: expected value of type array or multiset, but got the value of type string</expected-error> + <source-location>false</source-location> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/error-handling"> + <compilation-unit name="index-on-closed-array"> + <output-dir compare="Text">index-on-closed-array</output-dir> + <expected-error>ASX1014: Field "date" is not found</expected-error> + <source-location>false</source-location> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/error-handling"> + <compilation-unit name="index-with-enforced-type"> + <output-dir compare="Text">index-with-enforced-type</output-dir> - <expected-error>ASX1154: Incompatible index type ARRAY</expected-error> ++ <expected-error>ASX1155: Incompatible index type ARRAY</expected-error> + <source-location>false</source-location> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/error-handling"> + <compilation-unit name="index-mixed-composite"> + <output-dir compare="Text">index-mixed-composite</output-dir> - <expected-error>ASX1154: Incompatible index type ARRAY</expected-error> ++ <expected-error>ASX1155: Incompatible index type ARRAY</expected-error> + <source-location>false</source-location> + </compilation-unit> + </test-case> + </test-group> + <test-group name="array-index/metadata"> + <test-case FilePath="array-index/metadata/closed"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/open"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/closed"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/open"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/closed"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/open"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/closed"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/open"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <!-- <test-case FilePath="array-index/metadata/closed">--> + <!-- <compilation-unit name="with-composite-sk">--> + <!-- <output-dir compare="Text">with-composite-sk</output-dir>--> + <!-- </compilation-unit>--> + <!-- </test-case>--> + <!-- <test-case FilePath="array-index/metadata/open">--> + <!-- <compilation-unit name="with-composite-sk">--> + <!-- <output-dir compare="Text">with-composite-sk</output-dir>--> + <!-- </compilation-unit>--> + <!-- </test-case>--> + <test-case FilePath="array-index/metadata/closed"> + <compilation-unit name="with-composite-array-different-indicators"> + <output-dir compare="Text">with-composite-array-different-indicators</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/open"> + <compilation-unit name="with-composite-array-different-indicators"> + <output-dir compare="Text">with-composite-array-different-indicators</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/closed"> + <compilation-unit name="with-3-level-record-path"> + <output-dir compare="Text">with-3-level-record-path</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/metadata/open"> + <compilation-unit name="with-3-level-record-path"> + <output-dir compare="Text">with-3-level-record-path</output-dir> + </compilation-unit> + </test-case> + </test-group> + <test-group name="array-index/bulk-loading/on-index-creation"> + <test-case FilePath="array-index/bulk-loading/on-index-creation/closed"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/open"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/closed"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/open"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/closed"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/open"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/closed"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/open"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/closed"> + <compilation-unit name="with-composite-pk"> + <output-dir compare="Text">with-composite-pk</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/closed"> + <compilation-unit name="with-filter-fields"> + <output-dir compare="Text">with-filter-fields</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/on-index-creation/closed"> + <compilation-unit name="with-3-level-record-path"> + <output-dir compare="Text">with-3-level-record-path</output-dir> + </compilation-unit> + </test-case> + </test-group> + <test-group name="array-index/bulk-loading/after-index-creation"> + <test-case FilePath="array-index/bulk-loading/after-index-creation"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/after-index-creation"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/after-index-creation"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/after-index-creation"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/after-index-creation"> + <compilation-unit name="with-3-level-record-path"> + <output-dir compare="Text">with-3-level-record-path</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/after-index-creation"> + <compilation-unit name="with-composite-pk"> + <output-dir compare="Text">with-composite-pk</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/after-index-creation"> + <compilation-unit name="with-filter-fields"> + <output-dir compare="Text">with-filter-fields</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/bulk-loading/after-index-creation"> + <compilation-unit name="with-open-index"> + <output-dir compare="Text">with-open-index</output-dir> + </compilation-unit> + </test-case> + </test-group> + <test-group name="array-index/insert-upsert-delete"> + <test-case FilePath="array-index/insert-upsert-delete/closed"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/open"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/closed"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/open"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/closed"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/open"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/closed"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/open"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/closed"> + <compilation-unit name="with-composite-sk"> + <output-dir compare="Text">with-composite-sk</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/open"> + <compilation-unit name="with-composite-sk"> + <output-dir compare="Text">with-composite-sk</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/closed"> + <compilation-unit name="with-additional-atomic-index"> + <output-dir compare="Text">with-additional-atomic-index</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/open"> + <compilation-unit name="with-additional-atomic-index"> + <output-dir compare="Text">with-additional-atomic-index</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/insert-upsert-delete/closed"> + <compilation-unit name="with-filter-fields"> + <output-dir compare="Text">with-filter-fields</output-dir> + </compilation-unit> + </test-case> + </test-group> + <test-group name="array-index/join-unnest-queries"> + <test-case FilePath="array-index/join-unnest-queries"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/join-unnest-queries"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/join-unnest-queries"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/join-unnest-queries"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/join-unnest-queries"> + <compilation-unit name="with-open-index"> + <output-dir compare="Text">with-open-index</output-dir> + </compilation-unit> + </test-case> + </test-group> + <test-group name="array-index/select-unnest-queries"> + <test-case FilePath="array-index/select-unnest-queries/closed"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/open"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/closed"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/open"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/closed"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/open"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/closed"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/open"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/closed"> + <compilation-unit name="with-3-level-record-path"> + <output-dir compare="Text">with-3-level-record-path</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/open"> + <compilation-unit name="with-3-level-record-path"> + <output-dir compare="Text">with-3-level-record-path</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/closed"> + <compilation-unit name="with-composite-sk"> + <output-dir compare="Text">with-composite-sk</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/open"> + <compilation-unit name="with-composite-sk"> + <output-dir compare="Text">with-composite-sk</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/closed"> + <compilation-unit name="with-composite-pk"> + <output-dir compare="Text">with-composite-pk</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-unnest-queries/closed"> + <compilation-unit name="with-filter-fields"> + <output-dir compare="Text">with-filter-fields</output-dir> + </compilation-unit> + </test-case> + </test-group> + <test-group name="array-index/select-quantified-queries"> + <test-case FilePath="array-index/select-quantified-queries"> + <compilation-unit name="use-case-1"> + <output-dir compare="Text">use-case-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-quantified-queries"> + <compilation-unit name="use-case-2"> + <output-dir compare="Text">use-case-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-quantified-queries"> + <compilation-unit name="use-case-3"> + <output-dir compare="Text">use-case-3</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-quantified-queries"> + <compilation-unit name="use-case-4"> + <output-dir compare="Text">use-case-4</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-quantified-queries"> + <compilation-unit name="with-composite-pk"> + <output-dir compare="Text">with-composite-pk</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="array-index/select-quantified-queries"> + <compilation-unit name="with-open-index"> + <output-dir compare="Text">with-open-index</output-dir> + </compilation-unit> + </test-case> + </test-group> + </test-group> <test-group name="nestrecords"> <test-case FilePath="nestrecords"> <compilation-unit name="nestrecord"> diff --cc asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java index c87cb7f,e80dbfb..1f25cc1 --- 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 @@@ -235,12 -235,7 +235,13 @@@ public enum ErrorCode implements IErro CANNOT_DROP_OBJECT_DEPENDENT_EXISTS(1148), ILLEGAL_FUNCTION_RECURSION(1149), ILLEGAL_FUNCTION_USE(1150), - FULL_TEXT_CONFIG_NOT_FOUND(1151), - FULL_TEXT_FILTER_NOT_FOUND(1152), - FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED(1153), - COMPILATION_INCOMPATIBLE_INDEX_TYPE(1154), - FULL_TEXT_CONFIG_ALREADY_EXISTS(1155), - FULL_TEXT_FILTER_ALREADY_EXISTS(1156), + NO_AUTH_PROVIDED_ENDPOINT_REQUIRED_FOR_ANONYMOUS_ACCESS(1151), ++ FULL_TEXT_CONFIG_NOT_FOUND(1152), ++ FULL_TEXT_FILTER_NOT_FOUND(1153), ++ FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED(1154), ++ COMPILATION_INCOMPATIBLE_INDEX_TYPE(1155), ++ FULL_TEXT_CONFIG_ALREADY_EXISTS(1156), ++ FULL_TEXT_FILTER_ALREADY_EXISTS(1157), // Feed errors DATAFLOW_ILLEGAL_STATE(3001), diff --cc asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties index f7c6a77,cd4a289..e68db6a --- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties +++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties @@@ -237,12 -237,7 +237,13 @@@ 1148 = Cannot drop %1$s %2$s being used by %3$s %4$s 1149 = Illegal function recursion 1150 = Illegal use of function %1$s - 1151 = Full-text config %1$s not found - 1152 = Full-text filter %1$s not found - 1153 = Default full-text config with a name of null cannot be deleted or created - 1154 = Incompatible index type %1$s - 1155 = Full-text config %1$s already exists - 1156 = Full-text filter %1$s already exists + 1151 = No authentication credentials provided, '%1$s' field is required for anonymous access ++1152 = Full-text config %1$s not found ++1153 = Full-text filter %1$s not found ++1154 = Default full-text config with a name of null cannot be deleted or created ++1155 = Incompatible index type %1$s ++1156 = Full-text config %1$s already exists ++1157 = Full-text filter %1$s already exists # Feed Errors 3001 = Illegal state.
