| commit | 5ef0db347a89d8e523f11ba9199f7169437f1c18 | [log] [tgz] |
|---|---|---|
| author | khfaraaz82@gmail.com <khfaraaz82@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> | Wed Jun 13 20:58:51 2012 +0000 |
| committer | khfaraaz82@gmail.com <khfaraaz82@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> | Wed Jun 13 20:58:51 2012 +0000 |
| tree | c79a529090ec7b630cb3044a46a3ad6fb93cfeb4 | |
| parent | 5aa6d5c086e363dce0eeca1bb6061bdc03dde073 [diff] |
Implemented BuiltinType equals() and hashCode() git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization@382 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/AUnionType.java b/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/AUnionType.java index 4ba5a4c..1e70f15 100644 --- a/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/AUnionType.java +++ b/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/AUnionType.java
@@ -27,7 +27,7 @@ } public boolean isNullableType() { - return unionList.size() == 2 && unionList.get(0).getTypeTag().equals(BuiltinType.ANULL.getTypeTag()); + return unionList.size() == 2 && unionList.get(0).equals(BuiltinType.ANULL); } @Override
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/BuiltinType.java b/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/BuiltinType.java index 3af6e6f..0ec3b21 100644 --- a/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/BuiltinType.java +++ b/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/BuiltinType.java
@@ -515,15 +515,26 @@ return getTypeTag().toString(); } - @Override - public boolean deepEqual(IAObject obj) { - return obj == this; - } + @Override + public boolean deepEqual(IAObject obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof BuiltinType)) { + return false; + } + return ((BuiltinType) obj).getTypeTag().equals(getTypeTag()); + } @Override public boolean equals(Object object) { return this.deepEqual((IAObject) object); } + + @Override + public int hashCode() { + return getTypeTag().hashCode(); + } @Override public int hash() {