hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r936037 - in /hadoop/hive/trunk: CHANGES.txt data/conf/hive-site.xml ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java ql/src/test/queries/clientpositive/bucketmapjoin6.q ql/src/test/results/clientpositive/bucketmapjoin6.q.out
Date Tue, 20 Apr 2010 19:28:09 GMT
Author: namit
Date: Tue Apr 20 19:28:09 2010
New Revision: 936037

URL: http://svn.apache.org/viewvc?rev=936037&view=rev
Log:
HIVE-1315. Bug in sort-merge join
(Ning Zhang via namit)


Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/data/conf/hive-site.xml
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
    hadoop/hive/trunk/ql/src/test/queries/clientpositive/bucketmapjoin6.q
    hadoop/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin6.q.out

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=936037&r1=936036&r2=936037&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Tue Apr 20 19:28:09 2010
@@ -381,6 +381,9 @@ Trunk -  Unreleased
     HIVE-1260. from_unixtime should accept bigints
     (Ning Zhang via namit)
 
+    HIVE-1315. Bug in sort-merge join
+    (Ning Zhang via namit)
+
 Release 0.5.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/trunk/data/conf/hive-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/data/conf/hive-site.xml?rev=936037&r1=936036&r2=936037&view=diff
==============================================================================
--- hadoop/hive/trunk/data/conf/hive-site.xml (original)
+++ hadoop/hive/trunk/data/conf/hive-site.xml Tue Apr 20 19:28:09 2010
@@ -16,6 +16,14 @@
   <description>A base for other temporary directories.</description>
 </property>
 
+<!--
+<property>
+  <name>hive.exec.reducers.max</name>
+  <value>1</value>
+  <description>maximum number of reducers</description>
+</property>
+-->
+
 <property>
   <name>hive.exec.scratchdir</name>
   <value>${build.dir}/scratchdir</value>

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java?rev=936037&r1=936036&r2=936037&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java Tue
Apr 20 19:28:09 2010
@@ -316,7 +316,7 @@ public class FileSinkOperator extends Te
 
       	// Create all the files - this is required because empty files need to be created
for
       	// empty buckets
-      	createBucketFiles(fsp);
+      	// createBucketFiles(fsp);
       	valToPaths.put("", fsp); // special entry for non-DP case
       }
 

Modified: hadoop/hive/trunk/ql/src/test/queries/clientpositive/bucketmapjoin6.q
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/queries/clientpositive/bucketmapjoin6.q?rev=936037&r1=936036&r2=936037&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/queries/clientpositive/bucketmapjoin6.q (original)
+++ hadoop/hive/trunk/ql/src/test/queries/clientpositive/bucketmapjoin6.q Tue Apr 20 19:28:09
2010
@@ -7,6 +7,7 @@ create table tmp2 (a string, b string) c
 
 set hive.enforce.bucketing = true;
 set hive.enforce.sorting = true;
+set hive.exec.reducers.max=1;
 
 
 insert overwrite table tmp1 select * from src where key < 50;
@@ -25,7 +26,7 @@ insert overwrite table tmp3
   select /*+ MAPJOIN(l) */ i.a, i.b, l.b
   from tmp1 i join tmp2 l ON i.a = l.a;
 
-select * from tmp3;
+select * from tmp3 order by a, b, c;
 
 drop table tmp1;
 drop table tmp2;

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin6.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin6.q.out?rev=936037&r1=936036&r2=936037&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin6.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin6.q.out Tue Apr 20 19:28:09
2010
@@ -76,14 +76,14 @@ POSTHOOK: Lineage: tmp2.b SIMPLE [(src)s
 POSTHOOK: Lineage: tmp3.a SIMPLE [(tmp1)i.FieldSchema(name:a, type:string, comment:null),
]
 POSTHOOK: Lineage: tmp3.b SIMPLE [(tmp1)i.FieldSchema(name:b, type:string, comment:null),
]
 POSTHOOK: Lineage: tmp3.c SIMPLE [(tmp2)l.FieldSchema(name:b, type:string, comment:null),
]
-PREHOOK: query: select * from tmp3
+PREHOOK: query: select * from tmp3 order by a, b, c
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tmp3
-PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-04-06_13-16-17_519_5426148572496063749/10000
-POSTHOOK: query: select * from tmp3
+PREHOOK: Output: file:/data/users/nzhang/work/999/trunk/VENDOR.hive/trunk/build/ql/scratchdir/hive_2010-04-20_11-17-38_126_6207291158988738744/10000
+POSTHOOK: query: select * from tmp3 order by a, b, c
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tmp3
-POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-04-06_13-16-17_519_5426148572496063749/10000
+POSTHOOK: Output: file:/data/users/nzhang/work/999/trunk/VENDOR.hive/trunk/build/ql/scratchdir/hive_2010-04-20_11-17-38_126_6207291158988738744/10000
 POSTHOOK: Lineage: tmp1.a SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default),
]
 POSTHOOK: Lineage: tmp1.b SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default),
]
 POSTHOOK: Lineage: tmp2.a SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default),
]



Mime
View raw message