You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2009/06/30 02:24:48 UTC
svn commit: r789504 - in /hadoop/hive/trunk: ./
ql/src/java/org/apache/hadoop/hive/ql/optimizer/
ql/src/test/results/clientpositive/
Author: namit
Date: Tue Jun 30 00:24:48 2009
New Revision: 789504
URL: http://svn.apache.org/viewvc?rev=789504&view=rev
Log:
HIVE-582. bug in column pruning
(He Yongqiang via namit)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java
hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup.q.out
hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup2.q.out
hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=789504&r1=789503&r2=789504&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Tue Jun 30 00:24:48 2009
@@ -282,6 +282,9 @@
HIVE-587. Duplicate results from multiple TIP
(Zheng Shao via namit)
+ HIVE-582. bug in column pruning
+ (He Yongqiang via namit)
+
Release 0.3.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java?rev=789504&r1=789503&r2=789504&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java Tue Jun 30 00:24:48 2009
@@ -301,14 +301,17 @@
}
}
- private static boolean[] getPruneReduceSinkOpRetainFlags(List<String> retainedParentOpOutputCols, ReduceSinkOperator reduce){
+ private static boolean[] getPruneReduceSinkOpRetainFlags(
+ List<String> retainedParentOpOutputCols, ReduceSinkOperator reduce) {
reduceSinkDesc reduceConf = reduce.getConf();
java.util.ArrayList<exprNodeDesc> originalValueEval = reduceConf.getValueCols();
boolean[] flags = new boolean[originalValueEval.size()];
for (int i = 0; i < originalValueEval.size(); i++) {
flags[i] = false;
List<String> current = originalValueEval.get(i).getCols();
- if (current != null) {
+ if (current == null || current.size() == 0) {
+ flags[i] = true;
+ } else {
for (int j = 0; j < current.size(); j++) {
if (retainedParentOpOutputCols.contains(current.get(j))) {
flags[i] = true;
Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup.q.out?rev=789504&r1=789503&r2=789504&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup.q.out Tue Jun 30 00:24:48 2009
@@ -54,7 +54,7 @@
query: select count(1) from src x where x.key > 9999
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/956604429/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1268175684/10000
0
query: explain
select count(1) from src x where x.key > 9999
@@ -112,7 +112,7 @@
query: select count(1) from src x where x.key > 9999
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/354015080/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1223713151/10000
0
query: explain
select count(1) from src x where x.key > 9999
@@ -144,6 +144,9 @@
expr: rand()
type: double
tag: -1
+ value expressions:
+ expr: 1
+ type: int
Reduce Operator Tree:
Group By Operator
aggregations:
@@ -160,7 +163,7 @@
Stage: Stage-2
Map Reduce
Alias -> Map Operator Tree:
- file:/data/users/pchakka/workspace/oshive/build/ql/tmp/200770525/10002
+ file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/163149910/10002
Reduce Output Operator
sort order:
tag: -1
@@ -190,7 +193,7 @@
query: select count(1) from src x where x.key > 9999
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1979407901/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1599407772/10000
0
query: explain
select count(1) from src x where x.key > 9999
@@ -218,6 +221,9 @@
Reduce Output Operator
sort order:
tag: -1
+ value expressions:
+ expr: 1
+ type: int
Reduce Operator Tree:
Group By Operator
aggregations:
@@ -241,5 +247,5 @@
query: select count(1) from src x where x.key > 9999
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/126794078/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1652857331/10000
0
Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup2.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup2.q.out?rev=789504&r1=789503&r2=789504&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup2.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup2.q.out Tue Jun 30 00:24:48 2009
@@ -63,7 +63,7 @@
Stage: Stage-2
Map Reduce
Alias -> Map Operator Tree:
- file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1813446506/10002
+ file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/728386179/10002
Reduce Output Operator
key expressions:
expr: _col0
@@ -104,7 +104,7 @@
query: select x.key, count(1) from src x where x.key > 9999 group by x.key
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1274223349/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/284238698/10000
query: explain
select x.key, count(1) from src x where x.key > 9999 group by x.key
ABSTRACT SYNTAX TREE:
@@ -178,7 +178,7 @@
query: select x.key, count(1) from src x where x.key > 9999 group by x.key
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2031150875/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1931999488/10000
query: explain
select x.key, count(1) from src x where x.key > 9999 group by x.key
ABSTRACT SYNTAX TREE:
@@ -215,6 +215,9 @@
expr: rand()
type: double
tag: -1
+ value expressions:
+ expr: 1
+ type: int
Reduce Operator Tree:
Group By Operator
aggregations:
@@ -234,7 +237,7 @@
Stage: Stage-2
Map Reduce
Alias -> Map Operator Tree:
- file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1094899532/10002
+ file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1264700371/10002
Reduce Output Operator
key expressions:
expr: _col0
@@ -275,7 +278,7 @@
query: select x.key, count(1) from src x where x.key > 9999 group by x.key
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2019724226/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/192620128/10000
query: explain
select x.key, count(1) from src x where x.key > 9999 group by x.key
ABSTRACT SYNTAX TREE:
@@ -311,6 +314,9 @@
expr: key
type: string
tag: -1
+ value expressions:
+ expr: 1
+ type: int
Reduce Operator Tree:
Group By Operator
aggregations:
@@ -339,4 +345,4 @@
query: select x.key, count(1) from src x where x.key > 9999 group by x.key
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/629412428/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/5517742/10000
Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out?rev=789504&r1=789503&r2=789504&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out Tue Jun 30 00:24:48 2009
@@ -64,7 +64,7 @@
Stage: Stage-2
Map Reduce
Alias -> Map Operator Tree:
- file:/data/users/pchakka/workspace/oshive/build/ql/tmp/797179428/10002
+ file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/630845842/10002
Reduce Output Operator
sort order:
tag: -1
@@ -99,7 +99,7 @@
query: select count(1), count(distinct x.value) from src x where x.key = 9999
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/176192106/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1938635713/10000
0 0
query: explain
select count(1), count(distinct x.value) from src x where x.key = 9999
@@ -172,7 +172,7 @@
query: select count(1), count(distinct x.value) from src x where x.key = 9999
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1240165665/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/2019754835/10000
0 0
query: explain
select count(1), count(distinct x.value) from src x where x.key = 9999
@@ -210,6 +210,9 @@
expr: value
type: string
tag: -1
+ value expressions:
+ expr: 1
+ type: int
Reduce Operator Tree:
Group By Operator
aggregations:
@@ -227,7 +230,7 @@
Stage: Stage-2
Map Reduce
Alias -> Map Operator Tree:
- file:/data/users/pchakka/workspace/oshive/build/ql/tmp/123668648/10002
+ file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1425841757/10002
Reduce Output Operator
sort order:
tag: -1
@@ -262,7 +265,7 @@
query: select count(1), count(distinct x.value) from src x where x.key = 9999
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2060544994/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/2042822876/10000
0 0
query: explain
select count(1), count(distinct x.value) from src x where x.key = 9999
@@ -296,6 +299,9 @@
type: string
sort order: +
tag: -1
+ value expressions:
+ expr: 1
+ type: int
Reduce Operator Tree:
Group By Operator
aggregations:
@@ -322,5 +328,5 @@
query: select count(1), count(distinct x.value) from src x where x.key = 9999
Input: default/src
-Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/131032386/10000
+Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/2013029014/10000
0 0