This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 281218fb1412e13cc127dd230e98f79c7d9f0f4e Merge: 41cbadf 594e7ec Author: Ali Alsuliman <[email protected]> AuthorDate: Mon May 18 16:32:31 2020 -0700 Merge commit '594e7eca21' from 'gerrit/mad-hatter' Change-Id: I975228925366adc94f136bbbb014cb6817bf180e .../asterix/app/translator/QueryTranslator.java | 8 ++++---- .../aws/s3/csv-header/query-dataset.001.ddl.sqlpp | 2 +- .../s3/csv-warnings/query-dataset.007.ddl.sqlpp | 2 +- .../s3/csv-warnings/query-dataset.010.ddl.sqlpp | 2 +- .../aws/s3/csv/csv/query-dataset.000.ddl.sqlpp | 2 +- .../aws/s3/csv/gz/query-dataset.000.ddl.sqlpp | 2 +- .../asterix/common/exceptions/ErrorCode.java | 8 ++++---- .../src/main/resources/asx_errormsg/en.properties | 12 ++++++------ .../asterix/external/util/ExternalDataUtils.java | 22 ++++++++++++++-------- asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj | 4 +++- .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 4 +++- .../src/main/resources/errormsg/en.properties | 1 + 12 files changed, 40 insertions(+), 29 deletions(-) diff --cc asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java index e064e8c,37043b2..f689b5a --- 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 @@@ -81,7 -81,8 +81,9 @@@ public class ErrorCode public static final int INVALID_LIKE_PATTERN = 46; public static final int INVALID_REQ_PARAM_VAL = 47; public static final int INVALID_REQ_JSON_VAL = 48; - public static final int INCOMPARABLE_TYPES = 49; + public static final int PARAMETERS_REQUIRED = 49; + public static final int INVALID_PARAM = 50; ++ public static final int INCOMPARABLE_TYPES = 51; public static final int UNSUPPORTED_JRE = 100; @@@ -314,9 -309,6 +316,7 @@@ public static final int FAILED_TO_PARSE_METADATA = 3115; public static final int INPUT_DECODE_FAILURE = 3116; public static final int FAILED_TO_PARSE_MALFORMED_LOG_RECORD = 3117; - public static final int PARAMETERS_REQUIRED = 3118; - public static final int MALFORMED_RECORD = 3119; - public static final int METADATA_DROP_LIBRARY_IN_USE = 3120; ++ public static final int METADATA_DROP_LIBRARY_IN_USE = 3118; // Lifecycle management errors public static final int DUPLICATE_PARTITION_ID = 4000; diff --cc asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties index 35509f7,d3a2215..033f377 --- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties +++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties @@@ -40,7 -40,7 +40,7 @@@ 13,1006 = Duplicate field name \"%1$s\" 1009 = A returning expression cannot contain dataset access 37,1091 = Type mismatch: expected value of type %1$s, but got the value of type %2$s - 49 = Incomparable input types: %1$s and %2$s - ++51 = Incomparable input types: %1$s and %2$s # Data errors 6 = Invalid format for %1$s in %2$s @@@ -83,7 -83,8 +83,9 @@@ 46 = Invalid pattern \"%1$s\" for LIKE 47 = Invalid value for parameter \"%1$s\": %2$s 48 = Unable to process JSON content in request - #49 is used + 49 = Parameter(s) %1$s must be specified + 50 = Invalid parameter \"%1$s\" ++#51 is used 100 = Unsupported JRE: %1$s @@@ -312,9 -307,6 +314,7 @@@ 3115 = Failed to parse record metadata 3116 = Failed to decode input 3117 = Failed to parse record, malformed log record - 3118 = Parameter(s) %1$s must be specified - 3119 = Record number %1$s is malformed - 3120 = Library %1$s is being used. It cannot be dropped ++3118 = Library %1$s is being used. It cannot be dropped # Lifecycle management errors 4000 = Partition id %1$s for node %2$s already in use by node %3$s
