>From Hussain Towaileb <hussai...@gmail.com>:
Hussain Towaileb has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12204 )
Change subject: Merge branch 'gerrit/cheshire-cat'
......................................................................
Merge branch 'gerrit/cheshire-cat'
Change-Id: I94f48e4cf9322d85743b1eb0f9d750502ee84e70
---
M
asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_azure_blob_storage.xml
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
5 files changed, 14 insertions(+), 26 deletions(-)
Approvals:
Jenkins: Verified; Verified
Murtadha Hubail: Looks good to me, approved
diff --git
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
index 192dd94..b732c55 100644
---
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
@@ -68,11 +68,6 @@
</compilation-unit>
</test-case>
<test-case FilePath="external-dataset/azure_blob_storage/auth-methods">
-<<<<<<< HEAD (19039c Merge branch 'gerrit/cheshire-cat' into 'master')
- <compilation-unit name="invalid-no-auth">
- <output-dir compare="Text">invalid-no-auth</output-dir>
- <expected-error>ASX1139: No authentication parameters
provided</expected-error>
-=======
<compilation-unit name="anonymous-no-auth-public-access-allowed">
<output-dir
compare="Text">anonymous-no-auth-public-access-allowed</output-dir>
</compilation-unit>
@@ -87,7 +82,6 @@
<compilation-unit name="anonymous-no-auth-no-endpoint">
<output-dir compare="Text">anonymous-no-auth-no-endpoint</output-dir>
<expected-error>ASX1151: No authentication credentials provided,
'blobEndpoint' field is required for anonymous access</expected-error>
->>>>>>> BRANCH (a98062 [ASTERIXDB-2919] Azure Blob external datasets: add
support t)
</compilation-unit>
</test-case>
</test-group>
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 72ad331..02b5721 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -8000,14 +8000,14 @@
<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>
diff --git
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
index ef8816c..1f25cc1 100644
---
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,16 +235,13 @@
CANNOT_DROP_OBJECT_DEPENDENT_EXISTS(1148),
ILLEGAL_FUNCTION_RECURSION(1149),
ILLEGAL_FUNCTION_USE(1150),
-<<<<<<< HEAD (19039c Merge branch 'gerrit/cheshire-cat' into 'master')
- 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),
->>>>>>> BRANCH (a98062 [ASTERIXDB-2919] Azure Blob external datasets: add
support t)
+ 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 --git
a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
index b882a4b..e68db6a 100644
--- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
+++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
@@ -237,16 +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
-<<<<<<< HEAD (19039c Merge branch 'gerrit/cheshire-cat' into 'master')
-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
->>>>>>> BRANCH (a98062 [ASTERIXDB-2919] Azure Blob external datasets: add
support t)
+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.
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/12204
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I94f48e4cf9322d85743b1eb0f9d750502ee84e70
Gerrit-Change-Number: 12204
Gerrit-PatchSet: 2
Gerrit-Owner: Hussain Towaileb <hussai...@gmail.com>
Gerrit-Reviewer: Hussain Towaileb <hussai...@gmail.com>
Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Murtadha Hubail <mhub...@apache.org>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-MessageType: merged
