This is an automated email from the ASF dual-hosted git repository. dlych pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit c326e5e58ac0dff1aaefd8ddb41641e87815a90f Merge: 888fb45 7c62452 Author: Dmitry Lychagin <[email protected]> AuthorDate: Mon Dec 7 11:16:37 2020 -0800 Merge commit '7c62452' Change-Id: I17dc5463db8531c1b68891b872b35210ea824255 .../hints-indexnl-params-8.sqlpp | 65 +++++++++++++++++++++ .../hints-skip-index/hints-skip-index-13.sqlpp | 60 +++++++++++++++++++ .../hints-use-index/hints-use-index-18.sqlpp | 67 ++++++++++++++++++++++ .../hints-use-index/hints-use-index-19.sqlpp | 67 ++++++++++++++++++++++ .../hints-indexnl-params-8.plan | 25 ++++++++ .../hints-skip-index/hints-skip-index-13.plan | 19 ++++++ .../hints-use-index/hints-use-index-18.plan | 19 ++++++ .../hints-use-index/hints-use-index-19.plan | 19 ++++++ .../hints-indexnl-params.8.query.sqlpp | 36 ++++++++++++ .../hints-skip-index.11.query.sqlpp | 30 ++++++++++ .../hints-skip-index.12.query.sqlpp | 30 ++++++++++ .../hints-skip-index.13.query.sqlpp | 33 +++++++++++ .../hints-use-index/hints-use-index.18.query.sqlpp | 34 +++++++++++ .../hints-use-index/hints-use-index.19.query.sqlpp | 34 +++++++++++ .../hints-indexnl-params.8.adm | 10 ++++ .../hints-skip-index/hints-skip-index.11.adm | 20 +++++++ .../hints-skip-index/hints-skip-index.12.adm | 20 +++++++ .../hints-skip-index/hints-skip-index.13.adm | 10 ++++ .../hints-use-index/hints-use-index.18.adm | 10 ++++ .../hints-use-index/hints-use-index.19.adm | 10 ++++ .../test/resources/runtimets/testsuite_sqlpp.xml | 10 +++- .../asterix/common/exceptions/ErrorCode.java | 3 +- .../src/main/resources/asx_errormsg/en.properties | 3 +- .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 26 +++++++-- 24 files changed, 649 insertions(+), 11 deletions(-) diff --cc asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java index b7b8b66,6dbb46b..93d0ee9 --- 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 @@@ -221,12 -221,7 +221,13 @@@ public class ErrorCode public static final int UNSUPPORTED_GBY_OBY_SELECT_COMBO = 1129; public static final int ILLEGAL_RIGHT_OUTER_JOIN = 1130; public static final int SYNONYM_EXISTS = 1131; - public static final int FULL_TEXT_CONFIG_NOT_FOUND = 1132; + public static final int INVALID_HINT = 1132; + public static final int FULL_TEXT_FILTER_NOT_FOUND = 1133; + public static final int FULL_TEXT_DEFAULT_CONFIG_CANNOT_BE_DELETED_OR_CREATED = 1134; + public static final int FULL_TEXT_CONFIG_ALREADY_EXISTS = 1135; + public static final int FULL_TEXT_FILTER_ALREADY_EXISTS = 1136; ++ public static final int FULL_TEXT_CONFIG_NOT_FOUND = 1137; + // Feed errors public static final int DATAFLOW_ILLEGAL_STATE = 3001; public static final int UTIL_DATAFLOW_UTILS_TUPLE_TOO_LARGE = 3002; diff --cc asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties index 9c8bf75,22f7308..15f0d1b --- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties +++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties @@@ -218,11 -218,7 +218,12 @@@ 1129 = Cannot compile SELECT variable.* with GROUP BY GROUPING SETS/ROLLUP/CUBE followed by ORDER BY/LIMIT 1130 = Illegal use of RIGHT OUTER JOIN 1131 = A synonym with this name %1$s already exists - 1132 = Full-text config %1$s not found + 1132 = Invalid specification for hint %1$s. %2$s +1133 = Full-text filter %1$s not found +1134 = Default full-text config with a name of null cannot be deleted or created +1135 = Full-text config %1$s already exists +1136 = Full-text filter %1$s already exists ++1137 = Full-text config %1$s not found # Feed Errors 3001 = Illegal state.
