Till Westmann has submitted this change and it was merged. ( https://asterix-gerrit.ics.uci.edu/3381 )
Change subject: [NO ISSUE][FUN] Simplify error message + cleanup ...................................................................... [NO ISSUE][FUN] Simplify error message + cleanup - user model changes: different error message - storage format changes: no - interface changes: no Change-Id: I5bbcb63f266685befc80de957687249191345063 Reviewed-on: https://asterix-gerrit.ics.uci.edu/3381 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_all_tables/datagen_sf_1_all_tables.1.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_invalid_table/datagen_sf_1_invalid_table.1.query.sqlpp R asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_small_tables/datagen_sf_1_small_tables.1.query.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties 5 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins: Verified; No violations found; Verified Till Westmann: Looks good to me, approved diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_all_tables/datagen_sf_1_all_tables.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_all_tables/datagen_sf_1_all_tables.1.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_all_tables/datagen_sf_1_all_tables.3.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_all_tables/datagen_sf_1_all_tables.1.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_invalid_table/datagen_sf_1_invalid_table.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_invalid_table/datagen_sf_1_invalid_table.1.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_invalid_table/datagen_sf_1_invalid_table.3.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_invalid_table/datagen_sf_1_invalid_table.1.query.sqlpp diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_small_tables/datagen_sf_1_small_tables.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_small_tables/datagen_sf_1_small_tables.1.query.sqlpp similarity index 100% rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_small_tables/datagen_sf_1_small_tables.3.query.sqlpp rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/datagen_sf_1_small_tables/datagen_sf_1_small_tables.1.query.sqlpp 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 baeb7c5..9a561fc 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -8855,7 +8855,7 @@ <test-case FilePath="tpcds"> <compilation-unit name="datagen_sf_1_invalid_table"> <output-dir compare="Text">datagen_sf_1_invalid_table</output-dir> - <expected-error>Invalid value</expected-error> + <expected-error>is not a TPC-DS table name</expected-error> <source-location>false</source-location> </compilation-unit> </test-case> 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 4243837..36a2021 100644 --- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties +++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties @@ -76,7 +76,7 @@ 39 = Expected integer value, got %1$s 40 = No statement provided 41 = Request %1$s has been cancelled -42 = Invalid value: function %1$s input \"%2$s\" did not match any TPC-DS tables +42 = %1$s: \"%2$s\" is not a TPC-DS table name 100 = Unsupported JRE: %1$s -- To view, visit https://asterix-gerrit.ics.uci.edu/3381 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5bbcb63f266685befc80de957687249191345063 Gerrit-Change-Number: 3381 Gerrit-PatchSet: 4 Gerrit-Owner: Till Westmann <[email protected]> Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
