Repository: asterixdb Updated Branches: refs/heads/master 700bbddf5 -> 53f4f6f48
[NO ISSUE][FAIL] Use Formatted Exception For Duplicate Fields - user model changes: no - storage format changes: no - interface changes: no Details: - Use formatted duplicate field name exception instead of illegal state exception. Change-Id: I7ef04b8723c027aa3b43d35bfe96ecaf575ccc4c Reviewed-on: https://asterix-gerrit.ics.uci.edu/2852 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Murtadha Hubail <mhub...@apache.org> Reviewed-by: Till Westmann <ti...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/53f4f6f4 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/53f4f6f4 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/53f4f6f4 Branch: refs/heads/master Commit: 53f4f6f486d856ec8694d89883a89fa7ab70b9f4 Parents: 700bbdd Author: Murtadha Hubail <mhub...@apache.org> Authored: Mon Aug 6 21:32:26 2018 -0700 Committer: Murtadha Hubail <mhub...@apache.org> Committed: Tue Aug 7 10:15:34 2018 -0700 ---------------------------------------------------------------------- .../test/resources/runtimets/queries/objects/ObjectsQueries.xml | 2 +- .../runtimets/queries_sqlpp/objects/ObjectsQueries.xml | 2 +- .../apache/asterix/om/types/runtime/RuntimeRecordTypeInfo.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/53f4f6f4/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/ObjectsQueries.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/ObjectsQueries.xml b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/ObjectsQueries.xml index 44eb244..4d9403d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/ObjectsQueries.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/ObjectsQueries.xml @@ -115,7 +115,7 @@ <test-case FilePath="objects"> <compilation-unit name="closed-closed-fieldname-conflict_issue173"> <output-dir compare="Text">closed-closed-fieldname-conflict_issue173</output-dir> - <expected-error>Closed fields 0 and 1 have the same field name "name"</expected-error> + <expected-error>Duplicate field name "name"</expected-error> </compilation-unit> </test-case> <test-case FilePath="objects"> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/53f4f6f4/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml index c217aa4..cfd8aeb 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml @@ -178,7 +178,7 @@ <test-case FilePath="objects"> <compilation-unit name="closed-closed-fieldname-conflict_issue173"> <output-dir compare="Text">closed-closed-fieldname-conflict_issue173</output-dir> - <expected-error>Closed fields 0 and 1 have the same field name "name"</expected-error> + <expected-error>Duplicate field name "name"</expected-error> <source-location>false</source-location> </compilation-unit> </test-case> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/53f4f6f4/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/runtime/RuntimeRecordTypeInfo.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/runtime/RuntimeRecordTypeInfo.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/runtime/RuntimeRecordTypeInfo.java index 55108a1..be6cf62 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/runtime/RuntimeRecordTypeInfo.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/runtime/RuntimeRecordTypeInfo.java @@ -22,6 +22,8 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; +import org.apache.asterix.common.exceptions.ErrorCode; +import org.apache.asterix.common.exceptions.RuntimeDataException; import org.apache.asterix.om.types.ARecordType; import org.apache.hyracks.api.dataflow.value.IBinaryComparator; import org.apache.hyracks.api.dataflow.value.IBinaryHashFunction; @@ -99,8 +101,7 @@ public class RuntimeRecordTypeInfo { int j = getFieldIndex(baaos.getByteArray(), serializedFieldNameOffsets[i], UTF8StringUtil.getStringLength(baaos.getByteArray(), serializedFieldNameOffsets[i])); if (j != i) { - throw new IllegalStateException("Closed fields " + j + " and " + i - + " have the same field name \"" + fieldNames[i] + "\""); + throw new RuntimeDataException(ErrorCode.DUPLICATE_FIELD_NAME, fieldNames[i]); } } } catch (IOException e) {
