You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by dl...@apache.org on 2019/05/08 18:01:20 UTC
[asterixdb] branch master updated: [NO ISSUE][FUN] Simplify error
message + cleanup
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
The following commit(s) were added to refs/heads/master by this push:
new eb3cc0c [NO ISSUE][FUN] Simplify error message + cleanup
eb3cc0c is described below
commit eb3cc0c9878776a43c10ac47e7628e42bc75b449
Author: Till Westmann <ti...@apache.org>
AuthorDate: Fri May 3 18:27:37 2019 -0700
[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 <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
---
...1_all_tables.3.query.sqlpp => datagen_sf_1_all_tables.1.query.sqlpp} | 0
...lid_table.3.query.sqlpp => datagen_sf_1_invalid_table.1.query.sqlpp} | 0
...all_tables.3.query.sqlpp => datagen_sf_1_small_tables.1.query.sqlpp} | 0
asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml | 2 +-
asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties | 2 +-
5 files changed, 2 insertions(+), 2 deletions(-)
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