Change in asterixdb[master]: improve error messages
Michael Blow has submitted this change and it was merged. Change subject: improve error messages .. improve error messages Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1225 Sonar-Qube: JenkinsTested-by: Jenkins Integration-Tests: Jenkins Reviewed-by: Michael Blow --- M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java M asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj 5 files changed, 26 insertions(+), 8 deletions(-) Approvals: Michael Blow: Looks good to me, approved Jenkins: Verified; No violations found; Verified diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml index a244a74..0a45cdf 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml @@ -6263,7 +6263,7 @@ query-issue455 -Error: function test.printName@0 is undefined +Error: function test.printName@0 is not defined @@ -6439,7 +6439,7 @@ f01 -Error: function test.int8@0 is undefined +Error: function test.int8@0 is not defined 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 2838f1f..5dd0bd0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -7040,7 +7040,7 @@ query-issue455 -function test.printName@0 is undefined +function test.printName@0 is not defined @@ -7212,7 +7212,7 @@ f01 -function test.tinyint@0 is undefined +function test.tinyint@0 is not defined diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml index 1296955..5fee98c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml @@ -1143,6 +1143,12 @@ + +Syntax error: Could not parse numeric literal +int_01 + + + interval diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java index 94866eb..2bc78a1 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java @@ -116,7 +116,7 @@ messageBuilder.append("function " + functionDecls.get(functionDecls.size() - 1).getSignature() + " depends upon function " + signature + " which is undefined"); } else { -messageBuilder.append("function " + signature + " is undefined "); +messageBuilder.append("function " + signature + " is not defined"); } throw new AsterixException(messageBuilder.toString()); } diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj index 697439d..f330f40 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj +++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj @@ -2187,15 +2187,27 @@ } | { - lit.setValue(new LongIntegerLiteral(new Long(token.image))); +try { +lit.setValue(new LongIntegerLiteral(Long.valueOf(token.image))); +} catch (NumberFormatException e) { +throw new ParseException("Could not parse numeric literal \"" + token.image +'"'); +} } | { - lit.setValue(new FloatLiteral(new Float(token.image))); +try { +lit.setValue(new FloatLiteral(Float.valueOf(token.image))); +} catch (NumberFormatException e) { +throw new ParseException("Could not parse numeric literal \"" + token.image +'"'); +} } | { - lit.setValue(new DoubleLiteral(new
Change in asterixdb[master]: improve error messages
Michael Blow has posted comments on this change. Change subject: improve error messages .. Patch Set 5: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 5: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/799/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 5: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/799/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 5: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2853/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Hello Michael Blow, Yingyi Bu, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1225 to look at the new patch set (#5). Change subject: improve error messages .. improve error messages Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 --- M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java M asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj 5 files changed, 26 insertions(+), 8 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/25/1225/5 -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu
Change in asterixdb[master]: improve error messages
Michael Blow has posted comments on this change. Change subject: improve error messages .. Patch Set 4: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 4: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/792/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 4: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/792/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 4: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2845/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Hello Michael Blow, Yingyi Bu, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1225 to look at the new patch set (#4). Change subject: improve error messages .. improve error messages Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 --- M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java M asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj 5 files changed, 26 insertions(+), 8 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/25/1225/4 -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu
Change in asterixdb[master]: improve error messages
Yingyi Bu has posted comments on this change. Change subject: improve error messages .. Patch Set 3: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Michael Blow has posted comments on this change. Change subject: improve error messages .. Patch Set 3: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 3: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/787/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 3: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2840/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2838/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1225 to look at the new patch set (#2). Change subject: improve error messages .. improve error messages Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 --- M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java M asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj 2 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/25/1225/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins
Change in asterixdb[master]: improve error messages
Jenkins has posted comments on this change. Change subject: improve error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2830/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: improve error messages
Till Westmann has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1225 Change subject: improve error messages .. improve error messages Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 --- M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java M asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj 2 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/25/1225/1 diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java index 94866eb..2bc78a1 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java @@ -116,7 +116,7 @@ messageBuilder.append("function " + functionDecls.get(functionDecls.size() - 1).getSignature() + " depends upon function " + signature + " which is undefined"); } else { -messageBuilder.append("function " + signature + " is undefined "); +messageBuilder.append("function " + signature + " is not defined"); } throw new AsterixException(messageBuilder.toString()); } diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj index 697439d..f330f40 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj +++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj @@ -2187,15 +2187,27 @@ } | { - lit.setValue(new LongIntegerLiteral(new Long(token.image))); +try { +lit.setValue(new LongIntegerLiteral(Long.valueOf(token.image))); +} catch (NumberFormatException e) { +throw new ParseException("Could not parse numeric literal \"" + token.image +'"'); +} } | { - lit.setValue(new FloatLiteral(new Float(token.image))); +try { +lit.setValue(new FloatLiteral(Float.valueOf(token.image))); +} catch (NumberFormatException e) { +throw new ParseException("Could not parse numeric literal \"" + token.image +'"'); +} } | { - lit.setValue(new DoubleLiteral(new Double(token.image))); +try { +lit.setValue(new DoubleLiteral(Double.valueOf(token.image))); +} catch (NumberFormatException e) { +throw new ParseException("Could not parse numeric literal \"" + token.image +'"'); +} } | { -- To view, visit https://asterix-gerrit.ics.uci.edu/1225 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia82cd34ae5099f924302d7d42b541247a258c9b9 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann