You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2011/04/26 06:11:37 UTC

svn commit: r1096651 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/udf/generic/ test/queries/clientpositive/ test/results/clientpositive/

Author: jvs
Date: Tue Apr 26 04:11:36 2011
New Revision: 1096651

URL: http://svn.apache.org/viewvc?rev=1096651&view=rev
Log:
HIVE-2131. Bitmap Operation UDF doesn't clear return list
(Marquis Wang via jvs)


Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java
    hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_and.q
    hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_or.q
    hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_and.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_or.q.out

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java?rev=1096651&r1=1096650&r2=1096651&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java Tue Apr 26 04:11:36 2011
@@ -104,6 +104,7 @@ abstract public class AbstractGenericUDF
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
+    ret.clear();
     List<LongWritable> retList = bitmapToWordArray(bitmapAnd);
     for (LongWritable l : retList) {
       ret.add(l);

Modified: hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_and.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_and.q?rev=1096651&r1=1096650&r2=1096651&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_and.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_and.q Tue Apr 26 04:11:36 2011
@@ -1,3 +1,12 @@
 select ewah_bitmap_and(array(13,2,4,8589934592,4096,0), array(13,2,4,8589934592,4096,0)) from src limit 1;
-
 select ewah_bitmap_and(array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0)) from src limit 1;
+
+drop table bitmap_test;
+create table bitmap_test (a array<bigint>, b array<bigint>);
+
+insert overwrite table bitmap_test
+select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src limit 10;
+
+select ewah_bitmap_and(a,b) from bitmap_test;
+
+drop table bitmap_test;

Modified: hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_or.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_or.q?rev=1096651&r1=1096650&r2=1096651&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_or.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/udf_bitmap_or.q Tue Apr 26 04:11:36 2011
@@ -1,3 +1,12 @@
 select ewah_bitmap_or(array(13,2,4,8589934592,4096,0), array(13,2,4,8589934592,4096,0)) from src limit 1;
-
 select ewah_bitmap_or(array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0)) from src limit 1;
+
+drop table bitmap_test;
+create table bitmap_test (a array<bigint>, b array<bigint>);
+
+insert overwrite table bitmap_test
+select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src limit 10;
+
+select ewah_bitmap_or(a,b) from bitmap_test;
+
+drop table bitmap_test;

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_and.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_and.q.out?rev=1096651&r1=1096650&r2=1096651&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_and.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_and.q.out Tue Apr 26 04:11:36 2011
@@ -1,18 +1,69 @@
 PREHOOK: query: select ewah_bitmap_and(array(13,2,4,8589934592,4096,0), array(13,2,4,8589934592,4096,0)) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/mwang/hive_2011-03-31_14-41-33_816_4178335076582662801/-mr-10000
+PREHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-55-37_521_2361768713695885204/-mr-10000
 POSTHOOK: query: select ewah_bitmap_and(array(13,2,4,8589934592,4096,0), array(13,2,4,8589934592,4096,0)) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/mwang/hive_2011-03-31_14-41-33_816_4178335076582662801/-mr-10000
+POSTHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-55-37_521_2361768713695885204/-mr-10000
 [13,2,4,8589934592,4096,0]
 PREHOOK: query: select ewah_bitmap_and(array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0)) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/mwang/hive_2011-03-31_14-41-37_642_5072652249123670071/-mr-10000
+PREHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-55-41_155_4144834788434053923/-mr-10000
 POSTHOOK: query: select ewah_bitmap_and(array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0)) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/mwang/hive_2011-03-31_14-41-37_642_5072652249123670071/-mr-10000
+POSTHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-55-41_155_4144834788434053923/-mr-10000
 [13,1,4,2,0]
+PREHOOK: query: drop table bitmap_test
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table bitmap_test
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table bitmap_test (a array<bigint>, b array<bigint>)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table bitmap_test (a array<bigint>, b array<bigint>)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@bitmap_test
+PREHOOK: query: insert overwrite table bitmap_test
+select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src limit 10
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bitmap_test
+POSTHOOK: query: insert overwrite table bitmap_test
+select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src limit 10
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bitmap_test
+POSTHOOK: Lineage: bitmap_test.a EXPRESSION []
+POSTHOOK: Lineage: bitmap_test.b EXPRESSION []
+PREHOOK: query: select ewah_bitmap_and(a,b) from bitmap_test
+PREHOOK: type: QUERY
+PREHOOK: Input: default@bitmap_test
+PREHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-55-56_130_3048969228702680151/-mr-10000
+POSTHOOK: query: select ewah_bitmap_and(a,b) from bitmap_test
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bitmap_test
+POSTHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-55-56_130_3048969228702680151/-mr-10000
+POSTHOOK: Lineage: bitmap_test.a EXPRESSION []
+POSTHOOK: Lineage: bitmap_test.b EXPRESSION []
+[13,1,4,2,0]
+[13,1,4,2,0]
+[13,1,4,2,0]
+[13,1,4,2,0]
+[13,1,4,2,0]
+[13,1,4,2,0]
+[13,1,4,2,0]
+[13,1,4,2,0]
+[13,1,4,2,0]
+[13,1,4,2,0]
+PREHOOK: query: drop table bitmap_test
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@bitmap_test
+PREHOOK: Output: default@bitmap_test
+POSTHOOK: query: drop table bitmap_test
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@bitmap_test
+POSTHOOK: Output: default@bitmap_test
+POSTHOOK: Lineage: bitmap_test.a EXPRESSION []
+POSTHOOK: Lineage: bitmap_test.b EXPRESSION []

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_or.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_or.q.out?rev=1096651&r1=1096650&r2=1096651&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_or.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_bitmap_or.q.out Tue Apr 26 04:11:36 2011
@@ -1,18 +1,69 @@
 PREHOOK: query: select ewah_bitmap_or(array(13,2,4,8589934592,4096,0), array(13,2,4,8589934592,4096,0)) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/mwang/hive_2011-03-31_14-41-44_597_3278606557866613164/-mr-10000
+PREHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-56-01_728_4880587758754766124/-mr-10000
 POSTHOOK: query: select ewah_bitmap_or(array(13,2,4,8589934592,4096,0), array(13,2,4,8589934592,4096,0)) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/mwang/hive_2011-03-31_14-41-44_597_3278606557866613164/-mr-10000
+POSTHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-56-01_728_4880587758754766124/-mr-10000
 [13,2,4,8589934592,4096,0]
 PREHOOK: query: select ewah_bitmap_or(array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0)) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/mwang/hive_2011-03-31_14-41-47_891_1868628369790989248/-mr-10000
+PREHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-56-04_966_4403664262746873723/-mr-10000
 POSTHOOK: query: select ewah_bitmap_or(array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0)) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/mwang/hive_2011-03-31_14-41-47_891_1868628369790989248/-mr-10000
+POSTHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-56-04_966_4403664262746873723/-mr-10000
 [13,2,4,8589934592,4224,0]
+PREHOOK: query: drop table bitmap_test
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table bitmap_test
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table bitmap_test (a array<bigint>, b array<bigint>)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table bitmap_test (a array<bigint>, b array<bigint>)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@bitmap_test
+PREHOOK: query: insert overwrite table bitmap_test
+select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src limit 10
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bitmap_test
+POSTHOOK: query: insert overwrite table bitmap_test
+select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src limit 10
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bitmap_test
+POSTHOOK: Lineage: bitmap_test.a EXPRESSION []
+POSTHOOK: Lineage: bitmap_test.b EXPRESSION []
+PREHOOK: query: select ewah_bitmap_or(a,b) from bitmap_test
+PREHOOK: type: QUERY
+PREHOOK: Input: default@bitmap_test
+PREHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-56-14_800_8527224122491229569/-mr-10000
+POSTHOOK: query: select ewah_bitmap_or(a,b) from bitmap_test
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bitmap_test
+POSTHOOK: Output: file:/tmp/mwang/hive_2011-04-25_13-56-14_800_8527224122491229569/-mr-10000
+POSTHOOK: Lineage: bitmap_test.a EXPRESSION []
+POSTHOOK: Lineage: bitmap_test.b EXPRESSION []
+[13,2,4,8589934592,4224,0]
+[13,2,4,8589934592,4224,0]
+[13,2,4,8589934592,4224,0]
+[13,2,4,8589934592,4224,0]
+[13,2,4,8589934592,4224,0]
+[13,2,4,8589934592,4224,0]
+[13,2,4,8589934592,4224,0]
+[13,2,4,8589934592,4224,0]
+[13,2,4,8589934592,4224,0]
+[13,2,4,8589934592,4224,0]
+PREHOOK: query: drop table bitmap_test
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@bitmap_test
+PREHOOK: Output: default@bitmap_test
+POSTHOOK: query: drop table bitmap_test
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@bitmap_test
+POSTHOOK: Output: default@bitmap_test
+POSTHOOK: Lineage: bitmap_test.a EXPRESSION []
+POSTHOOK: Lineage: bitmap_test.b EXPRESSION []