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 7e74c73fd93aa5c5aaae3db2494acd1486ac9650 Merge: 047c9e0 0163af6 Author: Hussain Towaileb <[email protected]> AuthorDate: Fri Jun 12 14:31:21 2020 +0300 Merge commit '0163af68d0' from 'gerrit/mad-hatter' Change-Id: I5b53384961e42fe070d2e1b885e762428f6f8c45 .../asterix/app/translator/QueryTranslator.java | 14 +- .../aws/AwsS3ExternalDatasetOnePartitionTest.java | 6 +- .../aws/AwsS3ExternalDatasetTest.java | 154 ++++++++++++++---- .../external_dataset.000.ddl.sqlpp | 2 +- .../bad-name-1/test.000.ddl.sqlpp} | 8 +- .../bad-name-1/test.099.ddl.sqlpp} | 19 +-- .../bad-name-2/test.000.ddl.sqlpp} | 8 +- .../bad-name-2/test.099.ddl.sqlpp} | 19 +-- .../bad-name-3/test.000.ddl.sqlpp} | 8 +- .../bad-name-3/test.099.ddl.sqlpp} | 19 +-- .../both/test.000.ddl.sqlpp} | 8 +- .../both/test.099.ddl.sqlpp} | 19 +-- .../exclude-1/test.000.ddl.sqlpp} | 7 +- .../exclude-1/test.001.query.sqlpp} | 18 +-- .../exclude-1/test.099.ddl.sqlpp} | 19 +-- .../exclude-2/test.000.ddl.sqlpp} | 9 +- .../exclude-2/test.001.query.sqlpp} | 18 +-- .../exclude-2/test.099.ddl.sqlpp} | 19 +-- .../exclude-3/test.000.ddl.sqlpp} | 8 +- .../exclude-3/test.001.query.sqlpp} | 18 +-- .../exclude-3/test.099.ddl.sqlpp} | 19 +-- .../exclude-4/test.000.ddl.sqlpp} | 8 +- .../exclude-4/test.001.query.sqlpp} | 18 +-- .../exclude-4/test.099.ddl.sqlpp} | 19 +-- .../exclude-5/test.000.ddl.sqlpp} | 8 +- .../exclude-5/test.001.query.sqlpp} | 18 +-- .../exclude-5/test.099.ddl.sqlpp} | 19 +-- .../exclude-6/test.000.ddl.sqlpp} | 7 +- .../exclude-6/test.001.query.sqlpp} | 18 +-- .../exclude-6/test.099.ddl.sqlpp} | 19 +-- .../exclude-all/test.000.ddl.sqlpp} | 7 +- .../exclude-all/test.001.query.sqlpp} | 18 +-- .../exclude-all/test.099.ddl.sqlpp} | 19 +-- .../include-1/test.000.ddl.sqlpp} | 7 +- .../include-1/test.001.query.sqlpp} | 18 +-- .../include-1/test.099.ddl.sqlpp} | 19 +-- .../include-10/test.000.ddl.sqlpp} | 8 +- .../include-10/test.001.query.sqlpp} | 18 +-- .../include-10/test.099.ddl.sqlpp} | 19 +-- .../include-2/test.000.ddl.sqlpp} | 7 +- .../include-2/test.001.query.sqlpp} | 18 +-- .../include-2/test.002.query.sqlpp} | 18 +-- .../include-2/test.099.ddl.sqlpp} | 19 +-- .../include-3/test.000.ddl.sqlpp} | 10 +- .../include-3/test.001.query.sqlpp} | 18 +-- .../include-3/test.099.ddl.sqlpp} | 19 +-- .../include-4/test.000.ddl.sqlpp} | 10 +- .../include-4/test.001.query.sqlpp} | 18 +-- .../include-4/test.099.ddl.sqlpp} | 19 +-- .../include-5/test.000.ddl.sqlpp} | 7 +- .../include-5/test.001.query.sqlpp} | 18 +-- .../include-5/test.099.ddl.sqlpp} | 19 +-- .../include-6/test.000.ddl.sqlpp} | 7 +- .../include-6/test.001.query.sqlpp} | 18 +-- .../include-6/test.099.ddl.sqlpp} | 19 +-- .../include-7/test.000.ddl.sqlpp} | 8 +- .../include-7/test.001.query.sqlpp} | 18 +-- .../include-7/test.099.ddl.sqlpp} | 19 +-- .../include-8/test.000.ddl.sqlpp} | 8 +- .../include-8/test.001.query.sqlpp} | 18 +-- .../include-8/test.099.ddl.sqlpp} | 19 +-- .../include-9/test.000.ddl.sqlpp} | 8 +- .../include-9/test.001.query.sqlpp} | 18 +-- .../include-9/test.099.ddl.sqlpp} | 19 +-- .../include-all/test.000.ddl.sqlpp} | 7 +- .../include-all/test.001.query.sqlpp} | 18 +-- .../include-all/test.099.ddl.sqlpp} | 19 +-- .../s3/include-exclude/exclude-1/result.001.adm | 1 + .../s3/include-exclude/exclude-2/result.001.adm | 1 + .../s3/include-exclude/exclude-3/result.001.adm | 1 + .../s3/include-exclude/exclude-4/result.001.adm | 1 + .../s3/include-exclude/exclude-5/result.001.adm | 1 + .../s3/include-exclude/exclude-6/result.001.adm | 1 + .../s3/include-exclude/exclude-all/result.001.adm | 1 + .../s3/include-exclude/include-1/result.001.adm | 1 + .../s3/include-exclude/include-2/result.001.adm | 1 + .../s3/include-exclude/include-2/result.002.adm | 4 + .../s3/include-exclude/include-3/result.001.adm | 1 + .../s3/include-exclude/include-4/result.001.adm | 1 + .../s3/include-exclude/include-5/result.001.adm | 1 + .../s3/include-exclude/include-6/result.001.adm | 1 + .../s3/include-exclude/include-7/result.001.adm | 1 + .../s3/include-exclude/include-8/result.001.adm | 1 + .../s3/include-exclude/include-9/result.001.adm | 1 + .../runtimets/testsuite_external_dataset.xml | 118 ++++++++++++++ .../test/resources/runtimets/testsuite_sqlpp.xml | 22 +-- .../asterix/common/exceptions/ErrorCode.java | 18 ++- .../src/main/resources/asx_errormsg/en.properties | 18 ++- .../record/reader/aws/AwsS3InputStreamFactory.java | 113 ++++++------- .../external/util/ExternalDataConstants.java | 2 + .../asterix/external/util/ExternalDataUtils.java | 174 ++++++++++++++++++++- 91 files changed, 681 insertions(+), 913 deletions(-) diff --cc asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index deb8503,f127fbd..a052f99 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@@ -2862,23 -2837,6 +2862,23 @@@ </compilation-unit> </test-case> </test-group> + <test-group name="aggregate-subclause"> + <test-case FilePath="aggregate-subclause"> + <compilation-unit name="agg_filter_01"> + <output-dir compare="Text">agg_filter_01</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="aggregate-subclause"> + <compilation-unit name="agg_filter_02_neg"> + <output-dir compare="Text">agg_filter_01</output-dir> - <expected-error>ASX1116: Illegal use of aggregate FILTER clause</expected-error> - <expected-error>ASX1116: Illegal use of aggregate FILTER clause</expected-error> ++ <expected-error>ASX1120: Illegal use of aggregate FILTER clause</expected-error> ++ <expected-error>ASX1120: Illegal use of aggregate FILTER clause</expected-error> + <expected-error>ASX1073: Cannot resolve alias reference for undefined identifier r</expected-error> - <expected-error>ASX1116: Illegal use of aggregate FILTER clause</expected-error> - <expected-error>ASX1116: Illegal use of aggregate FILTER clause</expected-error> ++ <expected-error>ASX1120: Illegal use of aggregate FILTER clause</expected-error> ++ <expected-error>ASX1120: Illegal use of aggregate FILTER clause</expected-error> + </compilation-unit> + </test-case> + </test-group> <test-group name="array_fun"> <test-case FilePath="array_fun"> <compilation-unit name="array_prepend"> @@@ -5611,29 -5405,6 +5611,29 @@@ </compilation-unit> </test-case> <test-case FilePath="group-by"> + <compilation-unit name="grouping-sets-1"> + <output-dir compare="Text">grouping-sets-1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="group-by"> + <compilation-unit name="grouping-sets-2"> + <output-dir compare="Text">grouping-sets-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="group-by"> + <compilation-unit name="grouping-sets-3-negative"> + <output-dir compare="Text">grouping-sets-2</output-dir> - <expected-error>ASX1115: Unexpected alias: v21</expected-error> - <expected-error>ASX1115: Unexpected alias: v22</expected-error> - <expected-error>ASX1115: Unexpected alias: v23</expected-error> ++ <expected-error>ASX1119: Unexpected alias: v21</expected-error> ++ <expected-error>ASX1119: Unexpected alias: v22</expected-error> ++ <expected-error>ASX1119: Unexpected alias: v23</expected-error> + <expected-error>ASX1087: Invalid number of arguments for function grouping</expected-error> - <expected-error>ASX1114: Invalid argument to grouping() function</expected-error> - <expected-error>ASX1114: Invalid argument to grouping() function</expected-error> - <expected-error>ASX1114: Invalid argument to grouping() function</expected-error> - <expected-error>ASX1113: Too many grouping sets in group by clause: 512. Maximum allowed: 128.</expected-error> ++ <expected-error>ASX1118: Invalid argument to grouping() function</expected-error> ++ <expected-error>ASX1118: Invalid argument to grouping() function</expected-error> ++ <expected-error>ASX1118: Invalid argument to grouping() function</expected-error> ++ <expected-error>ASX1117: Too many grouping sets in group by clause: 512. Maximum allowed: 128.</expected-error> + </compilation-unit> + </test-case> + <test-case FilePath="group-by"> <compilation-unit name="having"> <output-dir compare="Text">core-02</output-dir> </compilation-unit> diff --cc asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java index 2bb62b1,46a6228..503ff6e --- 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 @@@ -199,13 -198,10 +199,17 @@@ public class ErrorCode public static final int UNEXPECTED_HINT = 1107; public static final int EXTERNAL_SOURCE_ERROR = 1108; public static final int EXTERNAL_SOURCE_CONTAINER_NOT_FOUND = 1109; - public static final int SYNONYM_EXISTS = 1110; - public static final int UNKNOWN_SYNONYM = 1111; - public static final int UNKNOWN_LIBRARY = 1112; - public static final int COMPILATION_GROUPING_SETS_OVERFLOW = 1113; - public static final int COMPILATION_GROUPING_OPERATION_INVALID_ARG = 1114; - public static final int COMPILATION_UNEXPECTED_ALIAS = 1115; - public static final int COMPILATION_ILLEGAL_USE_OF_FILTER_CLAUSE = 1116; + public static final int PARAMETERS_NOT_ALLOWED_AT_SAME_TIME = 1110; + public static final int PROPERTY_INVALID_VALUE_TYPE = 1111; + public static final int INVALID_PROPERTY_FORMAT = 1112; + public static final int INVALID_REGEX_PATTERN = 1113; ++ public static final int SYNONYM_EXISTS = 1114; ++ public static final int UNKNOWN_SYNONYM = 1115; ++ public static final int UNKNOWN_LIBRARY = 1116; ++ public static final int COMPILATION_GROUPING_SETS_OVERFLOW = 1117; ++ public static final int COMPILATION_GROUPING_OPERATION_INVALID_ARG = 1118; ++ public static final int COMPILATION_UNEXPECTED_ALIAS = 1119; ++ public static final int COMPILATION_ILLEGAL_USE_OF_FILTER_CLAUSE = 1120; // Feed errors public static final int DATAFLOW_ILLEGAL_STATE = 3001; diff --cc asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties index fa0f469,b070552..e612503 --- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties +++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties @@@ -194,13 -193,10 +194,17 @@@ 1107 = Unexpected hint: %1$s. %2$s expected at this location 1108 = External source error. %1$s 1109 = External source container %1$s not found - 1110 = A synonym with this name %1$s already exists - 1111 = Cannot find synonym with name %1$s - 1112 = Unknown library %1$s - 1113 = Too many grouping sets in group by clause: %1$s. Maximum allowed: %2$s. - 1114 = Invalid argument to grouping() function - 1115 = Unexpected alias: %1$s - 1116 = Illegal use of aggregate FILTER clause + 1110 = The parameters \"%1$s\" and \"%2$s\" cannot be provided at the same time + 1111 = Property \"%1$s\" expects value(s) of type %2$s + 1112 = Invalid format for property \"%1$s\" + 1113 = Invalid pattern %1$s ++1114 = A synonym with this name %1$s already exists ++1115 = Cannot find synonym with name %1$s ++1116 = Unknown library %1$s ++1117 = Too many grouping sets in group by clause: %1$s. Maximum allowed: %2$s. ++1118 = Invalid argument to grouping() function ++1119 = Unexpected alias: %1$s ++1120 = Illegal use of aggregate FILTER clause # Feed Errors 3001 = Illegal state.
