Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Murtadha Hubail has submitted this change and it was merged. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. [ASTERIXDB-2030][FAIL] Do not reformat error messages - user model changes: no - storage format changes: no - interface changes: no Details: - if the error message is already formatted, just reuse it - Add test case Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Reviewed-on: https://asterix-gerrit.ics.uci.edu/1932 Sonar-Qube: Jenkins Tested-by: Jenkins Contrib: Jenkins Integration-Tests: Jenkins Reviewed-by: Yingyi Bu --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java A hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/test/HyracksDataExceptionTest.java 2 files changed, 47 insertions(+), 0 deletions(-) Approvals: Yingyi Bu: Looks good to me, approved Jenkins: Verified; No violations found; ; Verified diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java index 467d148..285e932 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java @@ -91,6 +91,10 @@ if (!NONE.equals(component)) { fmt.format("%1$s%2$04d: ", component, errorCode); } +// if the message is already formatted, just return it +if (!fmt.toString().isEmpty() && message.startsWith(fmt.toString())) { +return message; +} fmt.format(message == null ? "null" : message, (Object[]) params); return fmt.out().toString(); } catch (Exception e) { diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/test/HyracksDataExceptionTest.java b/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/test/HyracksDataExceptionTest.java new file mode 100644 index 000..23a1caa --- /dev/null +++ b/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/test/HyracksDataExceptionTest.java @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.hyracks.api.test; + +import org.apache.hyracks.api.exceptions.ErrorCode; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.api.util.ErrorMessageUtil; +import org.junit.Assert; +import org.junit.Test; + +public class HyracksDataExceptionTest { + +@Test +public void returnedMessageWithComponentTest() { +HyracksDataException cause = HyracksDataException.create(ErrorCode.ERROR_PROCESSING_TUPLE, 3); +HyracksDataException causeWithNodeId = HyracksDataException.create(cause, "nc1"); +Assert.assertEquals(cause.getMessage(), causeWithNodeId.getMessage()); +} + +@Test +public void returnedMessageWithNoComponentTest() { +HyracksDataException cause = new HyracksDataException(ErrorMessageUtil.NONE, ErrorCode.ERROR_PROCESSING_TUPLE, +ErrorCode.getErrorMessage(ErrorCode.ERROR_PROCESSING_TUPLE), null, null, 2); +HyracksDataException causeWithNodeId = HyracksDataException.create(cause, "nc1"); +Assert.assertEquals(cause.getMessage(), causeWithNodeId.getMessage()); +} +} \ No newline at end of file -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Yingyi Bu has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3663/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Contrib+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1611/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1611/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/575/ (11/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/1263/ (10/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/1485/ (9/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3663/ -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/1201/ (8/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-rebalance-cancellation/404/ (4/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/921/ (3/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/6145/ (1/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/584/ (7/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/4664/ (2/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/1318/ (5/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Jenkins has posted comments on this change. Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/588/ (6/11) -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: [ASTERIXDB-2030][FAIL] Do not reformat error messages
Murtadha Hubail has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1932 Change subject: [ASTERIXDB-2030][FAIL] Do not reformat error messages .. [ASTERIXDB-2030][FAIL] Do not reformat error messages - user model changes: no - storage format changes: no - interface changes: no Details: - if the error message is already formatted, just reuse it - Add test case Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java A hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/test/HyracksDataExceptionTest.java 2 files changed, 47 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/32/1932/1 diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java index 467d148..285e932 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java @@ -91,6 +91,10 @@ if (!NONE.equals(component)) { fmt.format("%1$s%2$04d: ", component, errorCode); } +// if the message is already formatted, just return it +if (!fmt.toString().isEmpty() && message.startsWith(fmt.toString())) { +return message; +} fmt.format(message == null ? "null" : message, (Object[]) params); return fmt.out().toString(); } catch (Exception e) { diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/test/HyracksDataExceptionTest.java b/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/test/HyracksDataExceptionTest.java new file mode 100644 index 000..23a1caa --- /dev/null +++ b/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/test/HyracksDataExceptionTest.java @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.hyracks.api.test; + +import org.apache.hyracks.api.exceptions.ErrorCode; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.api.util.ErrorMessageUtil; +import org.junit.Assert; +import org.junit.Test; + +public class HyracksDataExceptionTest { + +@Test +public void returnedMessageWithComponentTest() { +HyracksDataException cause = HyracksDataException.create(ErrorCode.ERROR_PROCESSING_TUPLE, 3); +HyracksDataException causeWithNodeId = HyracksDataException.create(cause, "nc1"); +Assert.assertEquals(cause.getMessage(), causeWithNodeId.getMessage()); +} + +@Test +public void returnedMessageWithNoComponentTest() { +HyracksDataException cause = new HyracksDataException(ErrorMessageUtil.NONE, ErrorCode.ERROR_PROCESSING_TUPLE, +ErrorCode.getErrorMessage(ErrorCode.ERROR_PROCESSING_TUPLE), null, null, 2); +HyracksDataException causeWithNodeId = HyracksDataException.create(cause, "nc1"); +Assert.assertEquals(cause.getMessage(), causeWithNodeId.getMessage()); +} +} \ No newline at end of file -- To view, visit https://asterix-gerrit.ics.uci.edu/1932 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd922bca36c7b40903c8b7abbe3386fbedd9c77b Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail