You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by px...@apache.org on 2015/08/14 02:28:11 UTC
hive git commit: HIVE-11551 : Branch 1.0 : test cases regression
after cherry-pick HIVE-9397 (Pengcheng Xiong)
Repository: hive
Updated Branches:
refs/heads/branch-1.0 d5dcd3e3e -> f47b0849c
HIVE-11551 : Branch 1.0 : test cases regression after cherry-pick HIVE-9397 (Pengcheng Xiong)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f47b0849
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f47b0849
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f47b0849
Branch: refs/heads/branch-1.0
Commit: f47b0849ce3a6a1c50d755c1d50b62f17c1e8e47
Parents: d5dcd3e
Author: Pengcheng Xiong <px...@apache.org>
Authored: Thu Aug 13 17:28:06 2015 -0700
Committer: Pengcheng Xiong <px...@apache.org>
Committed: Thu Aug 13 17:28:06 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hive/ql/exec/ColumnInfo.java | 15 +++++++++++++++
.../apache/hadoop/hive/ql/exec/SelectOperator.java | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/f47b0849/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnInfo.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnInfo.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnInfo.java
index a34a31d..e3cc946 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnInfo.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnInfo.java
@@ -237,4 +237,19 @@ public class ColumnInfo implements Serializable {
public void setObjectinspector(ObjectInspector writableObjectInspector) {
this.objectInspector = writableObjectInspector;
}
+
+ public boolean internalEquals(ColumnInfo dest) {
+ if (dest == null) {
+ return false;
+ }
+
+ if ((!checkEquals(internalName, dest.getInternalName()))
+ || (!checkEquals(getType(), dest.getType())) || (isSkewedCol != dest.isSkewedCol())
+ || (isVirtualCol != dest.getIsVirtualCol())
+ || (isHiddenVirtualCol != dest.isHiddenVirtualCol())) {
+ return false;
+ }
+
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/f47b0849/ql/src/java/org/apache/hadoop/hive/ql/exec/SelectOperator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/SelectOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/SelectOperator.java
index 93017d3..82b7cbf 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/SelectOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/SelectOperator.java
@@ -172,7 +172,7 @@ public class SelectOperator extends Operator<SelectDesc> implements Serializable
return false;
}
- if(!origColumn.equals(destColumn)) {
+ if(!origColumn.internalEquals(destColumn)) {
return false;
}