>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19009 )
Change subject: Merge branch 'gerrit/goldfish' into 'master'
......................................................................
Merge branch 'gerrit/goldfish' into 'master'
Change-Id: I088ea2f4a99970b30cdd15f723f05e2db1da9277
---
M
asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.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
4 files changed, 26 insertions(+), 15 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
index 949c0a3..aadc42b 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
@@ -117,8 +117,8 @@
<expected-error>HYR0132: Extra field in the result, field 'second'
does not exist at 'nested' in the schema</expected-error>
<expected-error>HYR0131: Result does not follow the schema, group type
expected but found primitive type at 'nested'</expected-error>
<expected-error>HYR0131: Result does not follow the schema, primitive
type expected but found group type at 'name'</expected-error>
- <expected-error>ASX1201: Storage units expected for the field
'row-group-size' (e.g., 0.1KB, 100kb, 1mb, 3MB, 8.5GB ...). Provided
'random'</expected-error>
- <expected-error>ASX1201: Storage units expected for the field
'page-size' (e.g., 0.1KB, 100kb, 1mb, 3MB, 8.5GB ...). Provided
'random'</expected-error>
+ <expected-error>ASX1206: Storage units expected for the field
'row-group-size' (e.g., 0.1KB, 100kb, 1mb, 3MB, 8.5GB ...). Provided
'random'</expected-error>
+ <expected-error>ASX1206: Storage units expected for the field
'page-size' (e.g., 0.1KB, 100kb, 1mb, 3MB, 8.5GB ...). Provided
'random'</expected-error>
<expected-error>ASX1202: Unsupported compression scheme rar. Supported
schemes for parquet are [gzip, snappy, zstd]</expected-error>
<expected-error>ASX1001: Syntax error</expected-error>
<expected-error>ASX1204: 'binary' type not supported in parquet
format</expected-error>
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 2bd1948..ea7cc3b 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
@@ -303,17 +303,12 @@
DUPLICATE_FIELD_IN_PRIMARY_KEY(1198),
INCOMPATIBLE_FIELDS_IN_PRIMARY_KEY(1199),
PREFIX_SHOULD_NOT_START_WITH_SLASH(1200),
-<<<<<<< HEAD (715652 [ASTERIXDB-3483]: Add method for extensions)
- ILLEGAL_SIZE_PROVIDED(1201),
+ INVALID_DELTA_TABLE_FORMAT(1201),
UNSUPPORTED_WRITER_COMPRESSION_SCHEME(1202),
INVALID_PARQUET_SCHEMA(1203),
TYPE_UNSUPPORTED_PARQUET_WRITE(1204),
INVALID_PARQUET_WRITER_VERSION(1205),
- INVALID_DELTA_TABLE_FORMAT(1206),
-=======
- INVALID_DELTA_TABLE_FORMAT(1201),
-
->>>>>>> BRANCH (7e7960 [ASTERIXDB-3503][EXT] Deltalake invalid type error code
chan)
+ ILLEGAL_SIZE_PROVIDED(1206),
// Feed errors
DATAFLOW_ILLEGAL_STATE(3001),
UTIL_DATAFLOW_UTILS_TUPLE_TOO_LARGE(3002),
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 f372523..3e2f124 100644
--- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
+++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
@@ -305,16 +305,12 @@
1198 = Duplicate field '%1$s' in primary key
1199 = Fields '%1$s' and '%2$s' are incompatible for primary key
1200 = Prefix should not start with "/". Prefix: '%1$s'
-<<<<<<< HEAD (715652 [ASTERIXDB-3483]: Add method for extensions)
-1201 = Storage units expected for the field '%1$s' (e.g., 0.1KB, 100kb, 1mb,
3MB, 8.5GB ...). Provided '%2$s'
+1201 = Supported file format for 'delta' tables is 'parquet', but '%1$s' was
provided.
1202 = Unsupported compression scheme %1$s. Supported schemes for %2$s are %3$s
1203 = Invalid schema provided: '%1$s'
1204 = '%1$s' type not supported in parquet format
1205 = Invalid Parquet Writer Version provided '%1$s'. Supported values: %2$s
-1206 = Supported file format for 'delta' tables is 'parquet', but '%1$s' was
provided.
-=======
-1201 = Supported file format for 'delta' tables is 'parquet', but '%1$s' was
provided.
->>>>>>> BRANCH (7e7960 [ASTERIXDB-3503][EXT] Deltalake invalid type error code
chan)
+1206 = Storage units expected for the field '%1$s' (e.g., 0.1KB, 100kb, 1mb,
3MB, 8.5GB ...). Provided '%2$s'
# Feed Errors
3001 = Illegal state.
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19009
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: I088ea2f4a99970b30cdd15f723f05e2db1da9277
Gerrit-Change-Number: 19009
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
