You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2016/09/14 03:15:30 UTC
asterixdb git commit: ASTERIXDB-1630: fix ATypeHierarchy to handle
ANY.
Repository: asterixdb
Updated Branches:
refs/heads/master 93846a75b -> 06370fe90
ASTERIXDB-1630: fix ATypeHierarchy to handle ANY.
Change-Id: Ic22421d12b1a6a17f15283e1e1403961e7fe17d0
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1168
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Taewoo Kim <wa...@yahoo.com>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/06370fe9
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/06370fe9
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/06370fe9
Branch: refs/heads/master
Commit: 06370fe90e1074ce97b515231b504460a6dd07d1
Parents: 93846a7
Author: Yingyi Bu <yi...@couchbase.com>
Authored: Tue Sep 13 17:33:04 2016 -0700
Committer: Yingyi Bu <bu...@gmail.com>
Committed: Tue Sep 13 20:15:11 2016 -0700
----------------------------------------------------------------------
.../asterix/om/typecomputer/base/TypeCastUtils.java | 4 +---
.../apache/asterix/om/types/hierachy/ATypeHierarchy.java | 10 +++++-----
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06370fe9/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/TypeCastUtils.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/TypeCastUtils.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/TypeCastUtils.java
index 4bdcbba..91990f2 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/TypeCastUtils.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/base/TypeCastUtils.java
@@ -39,9 +39,7 @@ public class TypeCastUtils {
opaqueParameters = new Object[2];
opaqueParameters[0] = requiredType;
opaqueParameters[1] = inputType;
- if (TypeComputeUtils.getActualType(inputType).getTypeTag() != ATypeTag.ANY
- && TypeComputeUtils.getActualType(requiredType).getTypeTag() != ATypeTag.ANY
- && !ATypeHierarchy.isCompatible(requiredType.getTypeTag(),
+ if (!ATypeHierarchy.isCompatible(requiredType.getTypeTag(),
TypeComputeUtils.getActualType(inputType).getTypeTag())) {
throw new AlgebricksException(inputType + " can't be casted to " + requiredType);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06370fe9/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java
index f85aa50..af4d2a2 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java
@@ -169,11 +169,11 @@ public class ATypeHierarchy {
}
public static boolean isCompatible(ATypeTag type1, ATypeTag type2) {
- return canPromote(type1, type2) | canPromote(type2, type1);
- }
-
- public static boolean isDemoteCompatible(ATypeTag type1, ATypeTag type2) {
- return canDemote(type1, type2) | canDemote(type2, type1);
+ // The type tag ANY is only used at compile time to represent all possibilities.
+ // There is no runtime data model instance that has a type tag ANY.
+ // If we encounter type tag ANY, we should let it pass at compile time and defer erring to the runtime.
+ // Therefore, "type1 == ATypeTag.ANY || type2 == ATypeTag.ANY" works for both compiler and runtime.
+ return type1 == ATypeTag.ANY || type2 == ATypeTag.ANY || canPromote(type1, type2) || canPromote(type2, type1);
}
// Get an AsterixConstantValue from a source Object