You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/10/29 17:02:58 UTC
svn commit: r1635186 - in /hive/branches/branch-0.14: ./
hbase-handler/src/test/queries/positive/hbase_ppd_join.q
hbase-handler/src/test/results/positive/hbase_ppd_join.q.out
ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
Author: brock
Date: Wed Oct 29 16:02:57 2014
New Revision: 1635186
URL: http://svn.apache.org/r1635186
Log:
Merge HIVE-8189 - A select statement with a subquery is failing with HBaseSerde from trunk
Added:
hive/branches/branch-0.14/hbase-handler/src/test/queries/positive/hbase_ppd_join.q
- copied unchanged from r1627830, hive/trunk/hbase-handler/src/test/queries/positive/hbase_ppd_join.q
hive/branches/branch-0.14/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out
- copied unchanged from r1627830, hive/trunk/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out
Modified:
hive/branches/branch-0.14/ (props changed)
hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
Propchange: hive/branches/branch-0.14/
------------------------------------------------------------------------------
Merged /hive/trunk:r1627830
Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java?rev=1635186&r1=1635185&r2=1635186&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java Wed Oct 29 16:02:57 2014
@@ -428,6 +428,9 @@ public class HiveInputFormat<K extends W
public static void pushFilters(JobConf jobConf, TableScanOperator tableScan) {
+ // ensure filters are not set from previous pushFilters
+ jobConf.unset(TableScanDesc.FILTER_TEXT_CONF_STR);
+ jobConf.unset(TableScanDesc.FILTER_EXPR_CONF_STR);
TableScanDesc scanDesc = tableScan.getConf();
if (scanDesc == null) {
return;