You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/02/25 08:59:20 UTC

svn commit: r1571600 [3/46] - in /hive/branches/tez: ./ ant/src/org/apache/hadoop/hive/ant/ common/src/java/org/apache/hadoop/hive/common/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/java/org/apache/hadoop/hive/conf/ common/src/java/...

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out Tue Feb 25 07:58:52 2014
@@ -11,6 +11,7 @@ PREHOOK: query: CREATE TABLE hbase_src(k
                        double_col DOUBLE,
                        string_col STRING)
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_src(key STRING,
                        tinyint_col TINYINT,
                        smallint_col SMALLINT,
@@ -20,6 +21,7 @@ POSTHOOK: query: CREATE TABLE hbase_src(
                        double_col DOUBLE,
                        string_col STRING)
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_src
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_src
   SELECT key, key, key, key, key, key, key, value
@@ -68,6 +70,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE t_hbase_maps(key STRING,
                           tinyint_map_col MAP<TINYINT, TINYINT>,
                           smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -81,6 +84,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_hbase_maps
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
@@ -209,6 +213,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING,
                                        tinyint_map_col MAP<TINYINT, TINYINT>,
                                        smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -222,6 +227,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_ext_hbase_maps
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
@@ -290,6 +296,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_1(key STRING,
                                          tinyint_map_col MAP<TINYINT, TINYINT>,
                                          smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -303,6 +310,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_ext_hbase_maps_1
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
@@ -373,6 +381,7 @@ TBLPROPERTIES (
 "hbase.table.name"="t_hive_maps",
 "hbase.table.default.storage.type"="binary")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_2(key STRING,
                                          tinyint_map_col MAP<TINYINT, TINYINT>,
                                          smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -388,6 +397,7 @@ TBLPROPERTIES (
 "hbase.table.name"="t_hive_maps",
 "hbase.table.default.storage.type"="binary")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_ext_hbase_maps_2
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
@@ -456,6 +466,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#b:b,cf-smallint:#b:b,cf-int:#b:b,cf-bigint:#b:b,cf-float:#b:b,cf-double:#b:b,cf-string:#b:b,cf-boolean:#b:b")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE t_hbase_maps_1(key STRING,
                             tinyint_map_col MAP<TINYINT, TINYINT>,
                             smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -469,6 +480,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#b:b,cf-smallint:#b:b,cf-int:#b:b,cf-bigint:#b:b,cf-float:#b:b,cf-double:#b:b,cf-string:#b:b,cf-boolean:#b:b")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_hbase_maps_1
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
@@ -597,6 +609,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_3(key STRING,
                                          tinyint_map_col MAP<TINYINT, TINYINT>,
                                          smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -610,6 +623,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_ext_hbase_maps_3
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
@@ -678,6 +692,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_4(key STRING,
                                          tinyint_map_col MAP<TINYINT, TINYINT>,
                                          smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -691,6 +706,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_ext_hbase_maps_4
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
@@ -761,6 +777,7 @@ TBLPROPERTIES (
 "hbase.table.name"="t_hive_maps_1",
 "hbase.table.default.storage.type"="binary")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_5(key STRING,
                                          tinyint_map_col MAP<TINYINT, TINYINT>,
                                          smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -776,6 +793,7 @@ TBLPROPERTIES (
 "hbase.table.name"="t_hive_maps_1",
 "hbase.table.default.storage.type"="binary")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_ext_hbase_maps_5
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out Tue Feb 25 07:58:52 2014
@@ -11,6 +11,7 @@ PREHOOK: query: CREATE TABLE hbase_src(k
                        double_col DOUBLE,
                        string_col STRING)
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_src(key STRING,
                        tinyint_col TINYINT,
                        smallint_col SMALLINT,
@@ -20,6 +21,7 @@ POSTHOOK: query: CREATE TABLE hbase_src(
                        double_col DOUBLE,
                        string_col STRING)
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_src
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_src
   SELECT key, key, key, key, key, key, key, value
@@ -62,6 +64,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:,cf-string:simple_string_col")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE t_hbase_maps(key STRING,
                           string_map_col MAP<STRING, STRING>,
                           simple_string_col STRING)
@@ -69,6 +72,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:,cf-string:simple_string_col")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_hbase_maps
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
@@ -166,12 +170,14 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_col.*,cf-string:simple_string_col")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING,
                                        string_map_cols MAP<STRING, STRING>, simple_string_col STRING)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_col.*,cf-string:simple_string_col")
 TBLPROPERTIES ("hbase.table.name"="t_hive_maps")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_ext_hbase_maps
 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out Tue Feb 25 07:58:52 2014
@@ -15,6 +15,7 @@ WITH SERDEPROPERTIES ("hbase.columns.map
 TBLPROPERTIES ("hbase.table.name" = "t_hive",
                "hbase.table.default.storage.type" = "binary")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE t_hbase(key STRING,
                      tinyint_col TINYINT,
                      smallint_col SMALLINT,
@@ -28,6 +29,7 @@ WITH SERDEPROPERTIES ("hbase.columns.map
 TBLPROPERTIES ("hbase.table.name" = "t_hive",
                "hbase.table.default.storage.type" = "binary")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_hbase
 PREHOOK: query: DESCRIBE FORMATTED t_hbase
 PREHOOK: type: DESCTABLE
@@ -187,6 +189,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b")
 TBLPROPERTIES ("hbase.table.name" = "t_hive")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_hbase_1(key STRING,
                                 tinyint_col TINYINT,
                                 smallint_col SMALLINT,
@@ -199,6 +202,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b")
 TBLPROPERTIES ("hbase.table.name" = "t_hive")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_hbase_1
 PREHOOK: query: DESCRIBE FORMATTED t_hbase_1
 PREHOOK: type: DESCTABLE
@@ -332,6 +336,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-")
 TBLPROPERTIES ("hbase.table.name" = "t_hive_2")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE t_hbase_2(key STRING,
                      tinyint_col TINYINT,
                      smallint_col SMALLINT,
@@ -344,6 +349,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-")
 TBLPROPERTIES ("hbase.table.name" = "t_hive_2")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_hbase_2
 PREHOOK: query: INSERT OVERWRITE TABLE t_hbase_2
 SELECT 'user1', 1, 1, 1, 1, 1.0, 1.0, true
@@ -464,6 +470,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b")
 TBLPROPERTIES ("hbase.table.name" = "t_hive_2")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_hbase_3(key STRING,
                                 tinyint_col TINYINT,
                                 smallint_col SMALLINT,
@@ -476,6 +483,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b")
 TBLPROPERTIES ("hbase.table.name" = "t_hive_2")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_hbase_3
 PREHOOK: query: SELECT * FROM t_hbase_3
 PREHOOK: type: QUERY
@@ -564,6 +572,7 @@ TBLPROPERTIES (
 "hbase.table.name" = "t_hive_2",
 "hbase.table.default.storage.type" = "binary")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE t_hbase_4(key STRING,
                      tinyint_col TINYINT,
                      smallint_col SMALLINT,
@@ -578,6 +587,7 @@ TBLPROPERTIES (
 "hbase.table.name" = "t_hive_2",
 "hbase.table.default.storage.type" = "binary")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t_hbase_4
 PREHOOK: query: SELECT * FROM t_hbase_4
 PREHOOK: type: QUERY

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_bulk.m.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_bulk.m.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_bulk.m.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_bulk.m.out Tue Feb 25 07:58:52 2014
@@ -14,6 +14,7 @@ INPUTFORMAT 'org.apache.hadoop.mapred.Te
 OUTPUTFORMAT 'org.apache.hadoop.hive.hbase.HiveHFileOutputFormat'
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: -- this is a dummy table used for controlling how the HFiles are
 -- created
 create table hbsort(key string, val string, val2 string)
@@ -22,6 +23,7 @@ INPUTFORMAT 'org.apache.hadoop.mapred.Te
 OUTPUTFORMAT 'org.apache.hadoop.hive.hbase.HiveHFileOutputFormat'
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbsort
 PREHOOK: query: -- this is a dummy table used for controlling how the input file
 -- for TotalOrderPartitioner is created
@@ -35,6 +37,8 @@ outputformat
 'org.apache.hadoop.hive.ql.io.HiveNullValueSequenceFileOutputFormat'
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
+#### A masked pattern was here ####
+PREHOOK: Output: database:default
 POSTHOOK: query: -- this is a dummy table used for controlling how the input file
 -- for TotalOrderPartitioner is created
 create table hbpartition(part_break string)
@@ -47,6 +51,8 @@ outputformat
 'org.apache.hadoop.hive.ql.io.HiveNullValueSequenceFileOutputFormat'
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
+#### A masked pattern was here ####
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbpartition
 PREHOOK: query: -- this should produce one file, but we do not
 -- know what it will be called, so we will copy it to a well known

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_joins.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_joins.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_joins.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_joins.q.out Tue Feb 25 07:58:52 2014
@@ -22,6 +22,7 @@ WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "info:state,info:country,info:country_id"
 )
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: -- From HIVE-1257
 
 CREATE TABLE users(key string, state string, country string, country_id int)
@@ -30,6 +31,7 @@ WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "info:state,info:country,info:country_id"
 )
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@users
 PREHOOK: query: CREATE TABLE states(key string, name string)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
@@ -37,12 +39,14 @@ WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "state:name"
 )
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE states(key string, name string)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "state:name"
 )
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@states
 PREHOOK: query: CREATE TABLE countries(key string, name string, country string, country_id int)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
@@ -50,12 +54,14 @@ WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "info:name,info:country,info:country_id"
 )
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE countries(key string, name string, country string, country_id int)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "info:name,info:country,info:country_id"
 )
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@countries
 PREHOOK: query: INSERT OVERWRITE TABLE users SELECT 'user1', 'IA', 'USA', 0
 FROM src WHERE key=100
@@ -217,19 +223,23 @@ PREHOOK: query: CREATE TABLE users(key i
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:nickname,f:created")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE users(key int, userid int, username string, created int) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:nickname,f:created")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@users
 PREHOOK: query: CREATE TABLE users_level(key int, userid int, level int)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:level")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE users_level(key int, userid int, level int)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:level")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@users_level
 PREHOOK: query: -- HIVE-1903:  the problem fixed here showed up even without any data,
 -- so no need to load any to test it

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out Tue Feb 25 07:58:52 2014
@@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE hbase_pushd
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_pushdown(key string, value string) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_pushdown
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_pushdown 
 SELECT cast(key as string), value

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_pushdown.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_pushdown.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_pushdown.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_pushdown.q.out Tue Feb 25 07:58:52 2014
@@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE hbase_pushd
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_pushdown(key int, value string) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_pushdown
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_pushdown 
 SELECT *

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_queries.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_queries.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_queries.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_queries.q.out Tue Feb 25 07:58:52 2014
@@ -7,11 +7,13 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
 TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_table_1(key int, value string) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
 TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_table_1
 PREHOOK: query: DESCRIBE EXTENDED hbase_table_1
 PREHOOK: type: DESCTABLE
@@ -76,11 +78,13 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
 TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_2(key int, value string) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
 TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_table_2
 PREHOOK: query: EXPLAIN 
 SELECT Y.* 
@@ -359,10 +363,12 @@ PREHOOK: query: CREATE TABLE empty_hbase
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE empty_hbase_table(key int, value string) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@empty_hbase_table
 PREHOOK: query: DROP TABLE empty_normal_table
 PREHOOK: type: DROPTABLE
@@ -370,8 +376,10 @@ POSTHOOK: query: DROP TABLE empty_normal
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: CREATE TABLE empty_normal_table(key int, value string)
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE empty_normal_table(key int, value string)
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@empty_normal_table
 PREHOOK: query: select * from (select count(1) as c from empty_normal_table union all select count(1) as c from empty_hbase_table) x order by c
 PREHOOK: type: QUERY
@@ -427,12 +435,14 @@ WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "cf:val,cf2:count"
 )
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_table_3(key int, value string, count int) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "cf:val,cf2:count"
 )
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_table_3
 PREHOOK: query: EXPLAIN 
 INSERT OVERWRITE TABLE hbase_table_3
@@ -609,12 +619,14 @@ WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "a:b,a:c,d:e"
 )
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_table_4(key int, value1 string, value2 int, value3 int) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "a:b,a:c,d:e"
 )
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_table_4
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_table_4 SELECT key, value, key+1, key+2 
 FROM src WHERE key=98 OR key=100
@@ -645,11 +657,13 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = "a:")
 TBLPROPERTIES ("hbase.table.name" = "hbase_table_4")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_5(key int, value map<string,string>) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = "a:")
 TBLPROPERTIES ("hbase.table.name" = "hbase_table_4")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_table_5
 PREHOOK: query: SELECT * FROM hbase_table_5 ORDER BY key
 PREHOOK: type: QUERY
@@ -671,12 +685,14 @@ WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = ":key,cf:"
 )
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_table_6(key int, value map<string,string>) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = ":key,cf:"
 )
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_table_6
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_table_6 SELECT key, map(value, key) FROM src
 WHERE key=98 OR key=100
@@ -708,12 +724,14 @@ WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "cf:,:key"
 )
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_table_7(value map<string,string>, key int) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "cf:,:key"
 )
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_table_7
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_table_7 
 SELECT map(value, key, upper(value), key+1), key FROM src
@@ -747,12 +765,14 @@ WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "a:b,a:c,d:e"
 )
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_table_8(key int, value1 string, value2 int, value3 int) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES (
 "hbase.columns.mapping" = "a:b,a:c,d:e"
 )
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_table_8
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_table_8 SELECT key, value, key+1, key+2 
 FROM src WHERE key=98 OR key=100

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_scan_params.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_scan_params.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_scan_params.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_scan_params.q.out Tue Feb 25 07:58:52 2014
@@ -3,11 +3,13 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string",
 "hbase.scan.cache" = "500", "hbase.scan.cacheblocks" = "true", "hbase.scan.batch" = "1")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_pushdown(key int, value string)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string",
 "hbase.scan.cache" = "500", "hbase.scan.cacheblocks" = "true", "hbase.scan.batch" = "1")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_pushdown
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_pushdown SELECT * FROM src
 PREHOOK: type: QUERY

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out Tue Feb 25 07:58:52 2014
@@ -1,18 +1,22 @@
 PREHOOK: query: -- HIVE-4375 Single sourced multi insert consists of native and non-native table mixed throws NPE
 CREATE TABLE src_x1(key string, value string)
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: -- HIVE-4375 Single sourced multi insert consists of native and non-native table mixed throws NPE
 CREATE TABLE src_x1(key string, value string)
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_x1
 PREHOOK: query: CREATE TABLE src_x2(key string, value string)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key, cf:value")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE src_x2(key string, value string)
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key, cf:value")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_x2
 PREHOOK: query: explain
 from src a

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats.q.out Tue Feb 25 07:58:52 2014
@@ -1,7 +1,9 @@
 PREHOOK: query: create table stats_src like src
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: create table stats_src like src
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@stats_src
 PREHOOK: query: insert overwrite table stats_src select * from src
 PREHOOK: type: QUERY
@@ -61,8 +63,10 @@ Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: create table stats_part like srcpart
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: create table stats_part like srcpart
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@stats_part
 POSTHOOK: Lineage: stats_src.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_src.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats2.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats2.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats2.q.out Tue Feb 25 07:58:52 2014
@@ -1,7 +1,9 @@
 PREHOOK: query: create table stats_src like src
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: create table stats_src like src
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@stats_src
 PREHOOK: query: insert overwrite table stats_src select * from src
 PREHOOK: type: QUERY
@@ -61,8 +63,10 @@ Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: create table stats_part like srcpart
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: create table stats_part like srcpart
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@stats_part
 POSTHOOK: Lineage: stats_src.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_src.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats3.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats3.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats3.q.out Tue Feb 25 07:58:52 2014
@@ -1,7 +1,9 @@
 PREHOOK: query: create table stats_part like srcpart
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: create table stats_part like srcpart
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@stats_part
 PREHOOK: query: -- The stats key should be hashed since the max length is too small
 insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out Tue Feb 25 07:58:52 2014
@@ -3,11 +3,13 @@ PREHOOK: query: -- This test verifies th
 
 create table tmptable(key string, value string) partitioned by (part string)
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: -- This test verifies that writing an empty partition succeeds when
 -- hive.stats.reliable is set to true.
 
 create table tmptable(key string, value string) partitioned by (part string)
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tmptable
 PREHOOK: query: insert overwrite table tmptable partition (part = '1') select * from src where key = 'no_such_value'
 PREHOOK: type: QUERY

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out Tue Feb 25 07:58:52 2014
@@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE hbase_ppd_k
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#binary,cf:string")
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
 POSTHOOK: query: CREATE TABLE hbase_ppd_keyrange(key int, value string) 
 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#binary,cf:string")
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
 POSTHOOK: Output: default@hbase_ppd_keyrange
 PREHOOK: query: INSERT OVERWRITE TABLE hbase_ppd_keyrange 
 SELECT *

Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputFormatContainer.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputFormatContainer.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputFormatContainer.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputFormatContainer.java Tue Feb 25 07:58:52 2014
@@ -24,6 +24,7 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.metastore.MetaStoreUtils;
 import org.apache.hadoop.hive.ql.metadata.HiveStorageHandler;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
@@ -60,13 +61,6 @@ import java.util.Map;
  */
 class FileOutputFormatContainer extends OutputFormatContainer {
 
-  private static final PathFilter hiddenFileFilter = new PathFilter() {
-    public boolean accept(Path p) {
-      String name = p.getName();
-      return !name.startsWith("_") && !name.startsWith(".");
-    }
-  };
-
   /**
    * @param of base OutputFormat to contain
    */
@@ -198,13 +192,9 @@ class FileOutputFormatContainer extends 
       Path tablePath = new Path(table.getTTable().getSd().getLocation());
       FileSystem fs = tablePath.getFileSystem(context.getConfiguration());
 
-      if (fs.exists(tablePath)) {
-        FileStatus[] status = fs.globStatus(new Path(tablePath, "*"), hiddenFileFilter);
-
-        if (status.length > 0) {
-          throw new HCatException(ErrorType.ERROR_NON_EMPTY_TABLE,
+      if (!MetaStoreUtils.isDirEmpty(fs,tablePath)){
+        throw new HCatException(ErrorType.ERROR_NON_EMPTY_TABLE,
             table.getDbName() + "." + table.getTableName());
-        }
       }
     }
   }

Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatBaseOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatBaseOutputFormat.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatBaseOutputFormat.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatBaseOutputFormat.java Tue Feb 25 07:58:52 2014
@@ -84,7 +84,7 @@ public abstract class HCatBaseOutputForm
     OutputJobInfo jobInfo = getJobInfo(context);
     HiveStorageHandler storageHandler = HCatUtil.getStorageHandler(context.getConfiguration(), 
         jobInfo.getTableInfo().getStorerInfo());
-    //why do we need this?
+    // Always configure storage handler with jobproperties/jobconf before calling any methods on it
     configureOutputStorageHandler(context);
     if (storageHandler instanceof FosterStorageHandler) {
       return new FileOutputFormatContainer(ReflectionUtils.newInstance(

Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java Tue Feb 25 07:58:52 2014
@@ -27,6 +27,9 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.Job;
+import org.apache.hive.hcatalog.common.HCatConstants;
+import org.apache.hive.hcatalog.common.HCatUtil;
+import org.apache.hive.hcatalog.data.schema.HCatSchema;
 
 /**
  * The InputFormat to use to read data from HCatalog.
@@ -140,4 +143,31 @@ public class HCatInputFormat extends HCa
     }
     return this;
   }
+
+  /**
+   * Return partitioning columns for this input, can only be called after setInput is called.
+   * @return partitioning columns of the table specified by the job.
+   * @throws IOException
+   */
+  public static HCatSchema getPartitionColumns(Configuration conf) throws IOException {
+    InputJobInfo inputInfo = (InputJobInfo) HCatUtil.deserialize(
+        conf.get(HCatConstants.HCAT_KEY_JOB_INFO));
+    Preconditions.checkNotNull(inputInfo,
+        "inputJobInfo is null, setInput has not yet been called to save job into conf supplied.");
+    return inputInfo.getTableInfo().getPartitionColumns();
+
+  }
+
+  /**
+   * Return data columns for this input, can only be called after setInput is called.
+   * @return data columns of the table specified by the job.
+   * @throws IOException
+   */
+  public static HCatSchema getDataColumns(Configuration conf) throws IOException {
+    InputJobInfo inputInfo = (InputJobInfo) HCatUtil.deserialize(
+        conf.get(HCatConstants.HCAT_KEY_JOB_INFO));
+    Preconditions.checkNotNull(inputInfo,
+        "inputJobInfo is null, setInput has not yet been called to save job into conf supplied.");
+    return inputInfo.getTableInfo().getDataColumns();
+  }
 }

Modified: hive/branches/tez/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestPermsGrp.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestPermsGrp.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestPermsGrp.java (original)
+++ hive/branches/tez/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestPermsGrp.java Tue Feb 25 07:58:52 2014
@@ -20,6 +20,8 @@ package org.apache.hcatalog.cli;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -45,15 +47,16 @@ import org.apache.hadoop.hive.serde.serd
 import org.apache.hadoop.hive.shims.ShimLoader;
 import org.apache.hcatalog.ExitException;
 import org.apache.hcatalog.NoExitSecurityManager;
-
 import org.apache.hcatalog.cli.SemanticAnalysis.HCatSemanticAnalyzer;
 import org.apache.hcatalog.common.HCatConstants;
+import org.apache.hive.hcatalog.cli.HCatCli;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 /**
  * @deprecated Use/modify {@link org.apache.hive.hcatalog.cli.TestPermsGrp} instead
  */
+@Deprecated
 public class TestPermsGrp extends TestCase {
 
   private boolean isServerRunning = false;
@@ -118,7 +121,7 @@ public class TestPermsGrp extends TestCa
 
       // Next user did specify perms.
       try {
-        HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx-wx---"});
+        callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx-wx---"});
       } catch (Exception e) {
         assertTrue(e instanceof ExitException);
         assertEquals(((ExitException) e).getStatus(), 0);
@@ -132,7 +135,7 @@ public class TestPermsGrp extends TestCa
       hcatConf.set(HCatConstants.HCAT_PERMS, "rwx");
       // make sure create table fails.
       try {
-        HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx"});
+        callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx"});
         assert false;
       } catch (Exception me) {
         assertTrue(me instanceof ExitException);
@@ -161,7 +164,7 @@ public class TestPermsGrp extends TestCa
 
       try {
         // create table must fail.
-        HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rw-rw-rw-", "-g", "THIS_CANNOT_BE_A_VALID_GRP_NAME_EVER"});
+        callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rw-rw-rw-", "-g", "THIS_CANNOT_BE_A_VALID_GRP_NAME_EVER"});
         assert false;
       } catch (Exception me) {
         assertTrue(me instanceof SecurityException);
@@ -189,6 +192,13 @@ public class TestPermsGrp extends TestCa
     }
   }
 
+  private void callHCatCli(String[] args) {
+    List<String> argsList = new ArrayList<String>();
+    argsList.add("-Dhive.support.concurrency=false");
+    argsList.addAll(Arrays.asList(args));
+    HCatCli.main(argsList.toArray(new String[]{}));
+  }
+
   private void silentDropDatabase(String dbName) throws MetaException, TException {
     try {
       for (String tableName : msc.getTables(dbName, "*")) {

Modified: hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java (original)
+++ hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java Tue Feb 25 07:58:52 2014
@@ -20,6 +20,8 @@ package org.apache.hive.hcatalog.cli;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -45,7 +47,6 @@ import org.apache.hadoop.hive.serde.serd
 import org.apache.hadoop.hive.shims.ShimLoader;
 import org.apache.hive.hcatalog.ExitException;
 import org.apache.hive.hcatalog.NoExitSecurityManager;
-
 import org.apache.hive.hcatalog.cli.SemanticAnalysis.HCatSemanticAnalyzer;
 import org.apache.hive.hcatalog.common.HCatConstants;
 import org.apache.thrift.TException;
@@ -72,8 +73,8 @@ public class TestPermsGrp extends TestCa
     if (isServerRunning) {
       return;
     }
-    
-    
+
+
     msPort = MetaStoreUtils.findFreePort();
     MetaStoreUtils.startMetaStore(msPort, ShimLoader.getHadoopThriftAuthBridge());
 
@@ -94,6 +95,7 @@ public class TestPermsGrp extends TestCa
     hcatConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, "");
     hcatConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
     hcatConf.set(HiveConf.ConfVars.METASTORE_CLIENT_SOCKET_TIMEOUT.varname, "60");
+    hcatConf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
     clientWH = new Warehouse(hcatConf);
     msc = new HiveMetaStoreClient(hcatConf, null);
     System.setProperty(HiveConf.ConfVars.PREEXECHOOKS.varname, " ");
@@ -117,7 +119,7 @@ public class TestPermsGrp extends TestCa
 
       // Next user did specify perms.
       try {
-        HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx-wx---"});
+        callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx-wx---"});
       } catch (Exception e) {
         assertTrue(e instanceof ExitException);
         assertEquals(((ExitException) e).getStatus(), 0);
@@ -131,7 +133,7 @@ public class TestPermsGrp extends TestCa
       hcatConf.set(HCatConstants.HCAT_PERMS, "rwx");
       // make sure create table fails.
       try {
-        HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx"});
+        callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx"});
         assert false;
       } catch (Exception me) {
         assertTrue(me instanceof ExitException);
@@ -160,7 +162,7 @@ public class TestPermsGrp extends TestCa
 
       try {
         // create table must fail.
-        HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rw-rw-rw-", "-g", "THIS_CANNOT_BE_A_VALID_GRP_NAME_EVER"});
+        callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rw-rw-rw-", "-g", "THIS_CANNOT_BE_A_VALID_GRP_NAME_EVER"});
         assert false;
       } catch (Exception me) {
         assertTrue(me instanceof SecurityException);
@@ -188,6 +190,13 @@ public class TestPermsGrp extends TestCa
     }
   }
 
+  private void callHCatCli(String[] args) {
+    List<String> argsList = new ArrayList<String>();
+    argsList.add("-Dhive.support.concurrency=false");
+    argsList.addAll(Arrays.asList(args));
+    HCatCli.main(argsList.toArray(new String[]{}));
+  }
+
   private void silentDropDatabase(String dbName) throws MetaException, TException {
     try {
       for (String tableName : msc.getTables(dbName, "*")) {

Modified: hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java (original)
+++ hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java Tue Feb 25 07:58:52 2014
@@ -48,12 +48,16 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.hadoop.hive.metastore.api.DoubleColumnStatsData;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
+import org.apache.hadoop.hive.metastore.api.Function;
 import org.apache.hadoop.hive.metastore.api.InvalidObjectException;
 import org.apache.hadoop.hive.metastore.api.InvalidOperationException;
 import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.metastore.api.Order;
 import org.apache.hadoop.hive.metastore.api.Partition;
+import org.apache.hadoop.hive.metastore.api.PrincipalType;
+import org.apache.hadoop.hive.metastore.api.ResourceType;
+import org.apache.hadoop.hive.metastore.api.ResourceUri;
 import org.apache.hadoop.hive.metastore.api.SerDeInfo;
 import org.apache.hadoop.hive.metastore.api.SkewedInfo;
 import org.apache.hadoop.hive.metastore.api.StorageDescriptor;
@@ -61,10 +65,13 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hadoop.hive.metastore.api.Table;
 import org.apache.hadoop.hive.metastore.api.Type;
 import org.apache.hadoop.hive.metastore.api.UnknownDBException;
+import org.apache.hadoop.hive.metastore.api.FunctionType;
 import org.apache.hadoop.hive.ql.exec.Utilities;
+import org.apache.hadoop.hive.ql.session.SessionState;
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.thrift.TException;
+import org.junit.Test;
 
 import com.google.common.collect.Lists;
 
@@ -923,6 +930,8 @@ public abstract class TestHiveMetaStore 
 
       Database db = new Database();
       db.setName(TEST_DB1_NAME);
+      db.setOwnerName(SessionState.getUserFromAuthenticator());
+      db.setOwnerType(PrincipalType.USER);
       client.createDatabase(db);
 
       db = client.getDatabase(TEST_DB1_NAME);
@@ -931,7 +940,8 @@ public abstract class TestHiveMetaStore 
           TEST_DB1_NAME, db.getName());
       assertEquals("location of the returned db is different from that of inserted db",
           warehouse.getDatabasePath(db).toString(), db.getLocationUri());
-
+      assertEquals(db.getOwnerName(), SessionState.getUserFromAuthenticator());
+      assertEquals(db.getOwnerType(), PrincipalType.USER);
       Database db2 = new Database();
       db2.setName(TEST_DB2_NAME);
       client.createDatabase(db2);
@@ -2483,7 +2493,114 @@ public abstract class TestHiveMetaStore 
     }
   }
 
+  public void testSimpleFunction() throws Exception {
+    String dbName = "test_db";
+    String funcName = "test_func";
+    String className = "org.apache.hadoop.hive.ql.udf.generic.GenericUDFUpper";
+    String owner = "test_owner";
+    PrincipalType ownerType = PrincipalType.USER;
+    int createTime = (int) (System.currentTimeMillis() / 1000);
+    FunctionType funcType = FunctionType.JAVA;
+
+    try {
+      cleanUp(dbName, null, null);
+
+      createDb(dbName);
+
+      createFunction(dbName, funcName, className, owner, ownerType, createTime, funcType, null);
+
+      // Try the different getters
+
+      // getFunction()
+      Function func = client.getFunction(dbName, funcName);
+      assertEquals("function db name", dbName, func.getDbName());
+      assertEquals("function name", funcName, func.getFunctionName());
+      assertEquals("function class name", className, func.getClassName());
+      assertEquals("function owner name", owner, func.getOwnerName());
+      assertEquals("function owner type", PrincipalType.USER, func.getOwnerType());
+      assertEquals("function type", funcType, func.getFunctionType());
+      List<ResourceUri> resources = func.getResourceUris();
+      assertTrue("function resources", resources == null || resources.size() == 0);
+
+      boolean gotException = false;
+      try {
+        func = client.getFunction(dbName, "nonexistent_func");
+      } catch (MetaException e) {
+        // expected failure
+        gotException = true;
+      }
+      assertEquals(true, gotException);
+
+      // getFunctions()
+      List<String> funcs = client.getFunctions(dbName, "*_func");
+      assertEquals(1, funcs.size());
+      assertEquals(funcName, funcs.get(0));
+
+      funcs = client.getFunctions(dbName, "nonexistent_func");
+      assertEquals(0, funcs.size());
+
+      // dropFunction()
+      client.dropFunction(dbName, funcName);
+
+      // Confirm that the function is now gone
+      funcs = client.getFunctions(dbName, funcName);
+      assertEquals(0, funcs.size());
+
+    } catch (Exception e) {
+      System.err.println(StringUtils.stringifyException(e));
+      System.err.println("testConcurrentMetastores() failed.");
+      throw e;
+    } finally {
+      silentDropDatabase(dbName);
+    }
+  }
+
+  public void testFunctionWithResources() throws Exception {
+    String dbName = "test_db2";
+    String funcName = "test_func";
+    String className = "org.apache.hadoop.hive.ql.udf.generic.GenericUDFUpper";
+    String owner = "test_owner";
+    PrincipalType ownerType = PrincipalType.USER;
+    int createTime = (int) (System.currentTimeMillis() / 1000);
+    FunctionType funcType = FunctionType.JAVA;
+    List<ResourceUri> resList = new ArrayList<ResourceUri>();
+    resList.add(new ResourceUri(ResourceType.JAR, "hdfs:///tmp/jar1.jar"));
+    resList.add(new ResourceUri(ResourceType.FILE, "hdfs:///tmp/file1.txt"));
+    resList.add(new ResourceUri(ResourceType.ARCHIVE, "hdfs:///tmp/archive1.tgz"));
+
+    try {
+      cleanUp(dbName, null, null);
+
+      createDb(dbName);
+
+      createFunction(dbName, funcName, className, owner, ownerType, createTime, funcType, resList);
+
+      // Try the different getters
 
+      // getFunction()
+      Function func = client.getFunction(dbName, funcName);
+      assertEquals("function db name", dbName, func.getDbName());
+      assertEquals("function name", funcName, func.getFunctionName());
+      assertEquals("function class name", className, func.getClassName());
+      assertEquals("function owner name", owner, func.getOwnerName());
+      assertEquals("function owner type", PrincipalType.USER, func.getOwnerType());
+      assertEquals("function type", funcType, func.getFunctionType());
+      List<ResourceUri> resources = func.getResourceUris();
+      assertEquals("Resource list size", resList.size(), resources.size());
+      for (ResourceUri res : resources) {
+        assertTrue("Matching resource " + res.getResourceType() + " " + res.getUri(),
+            resList.indexOf(res) >= 0);
+      }
+
+      client.dropFunction(dbName, funcName);
+    } catch (Exception e) {
+      System.err.println(StringUtils.stringifyException(e));
+      System.err.println("testConcurrentMetastores() failed.");
+      throw e;
+    } finally {
+      silentDropDatabase(dbName);
+    }
+  }
 
   /**
    * This method simulates another Hive metastore renaming a table, by accessing the db and
@@ -2659,4 +2776,20 @@ public abstract class TestHiveMetaStore 
 
     createPartitions(dbName, tbl, values);
   }
+
+    @Test
+    public void testDBOwner() throws NoSuchObjectException, MetaException, TException {
+      Database db = client.getDatabase(MetaStoreUtils.DEFAULT_DATABASE_NAME);
+      assertEquals(db.getOwnerName(), HiveMetaStore.PUBLIC);
+      assertEquals(db.getOwnerType(), PrincipalType.ROLE);
+    }
+
+  private void createFunction(String dbName, String funcName, String className,
+      String ownerName, PrincipalType ownerType, int createTime,
+      org.apache.hadoop.hive.metastore.api.FunctionType functionType, List<ResourceUri> resources)
+          throws Exception {
+    Function func = new Function(funcName, dbName, className,
+        ownerName, ownerType, createTime, functionType, resources);
+    client.createFunction(func);
+  }
 }

Modified: hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java (original)
+++ hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java Tue Feb 25 07:58:52 2014
@@ -1837,15 +1837,17 @@ public class TestJdbcDriver2 {
    * Test the cursor repositioning to start of resultset
    * @throws Exception
    */
+  @Test
   public void testFetchFirstQuery() throws Exception {
-    execFetchFirst("select c4 from " + dataTypeTableName + " order by c1", "c4", false);
-    execFetchFirst("select c4 from " + dataTypeTableName + " order by c1", "c4",  true);
+    execFetchFirst("select c4, c1 from " + dataTypeTableName + " order by c1", "c4", false);
+    execFetchFirst("select c4, c1 from " + dataTypeTableName + " order by c1", "c4",  true);
   }
 
   /**
    * Test the cursor repositioning to start of resultset from non-mr query
    * @throws Exception
    */
+  @Test
   public void testFetchFirstNonMR() throws Exception {
     execFetchFirst("select * from " + dataTypeTableName, "c4", false);
   }
@@ -1854,6 +1856,7 @@ public class TestJdbcDriver2 {
    *  Test for cursor repositioning to start of resultset for non-sql commands
    * @throws Exception
    */
+  @Test
   public void testFetchFirstSetCmds() throws Exception {
     execFetchFirst("set -v", SetProcessor.SET_COLUMN_NAME, false);
   }
@@ -1862,6 +1865,7 @@ public class TestJdbcDriver2 {
    *  Test for cursor repositioning to start of resultset for non-sql commands
    * @throws Exception
    */
+  @Test
   public void testFetchFirstDfsCmds() throws Exception {
     String wareHouseDir = conf.get(HiveConf.ConfVars.METASTOREWAREHOUSE.varname);
     execFetchFirst("dfs -ls " + wareHouseDir, DfsProcessor.DFS_RESULT_HEADER, false);
@@ -1873,6 +1877,7 @@ public class TestJdbcDriver2 {
    * Verify unsupported JDBC resultset attributes
    * @throws Exception
    */
+  @Test
   public void testUnsupportedFetchTypes() throws Exception {
     try {
       con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE,
@@ -1896,6 +1901,7 @@ public class TestJdbcDriver2 {
    * Verify unsupported JDBC resultset methods
    * @throws Exception
    */
+  @Test
   public void testFetchFirstError() throws Exception {
     Statement stmt = con.createStatement();
     ResultSet res = stmt.executeQuery("select * from " + tableName);

Modified: hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java (original)
+++ hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java Tue Feb 25 07:58:52 2014
@@ -19,20 +19,21 @@
 package org.apache.hive.jdbc;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hive.jdbc.miniHS2.MiniHS2;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -50,6 +51,7 @@ import org.junit.Test;
     public static void beforeTest() throws Exception {
       Class.forName(MiniHS2.getJdbcDriverName());
       HiveConf conf = new HiveConf();
+      conf.setBoolVar(ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
       miniHS2 = new MiniHS2(conf);
       String dataFileDir = conf.get("test.data.files").replace('\\', '/')
           .replace("c:", "");
@@ -60,8 +62,13 @@ import org.junit.Test;
 
     @Before
     public void setUp() throws Exception {
-      hs2Conn = DriverManager.getConnection(miniHS2.getJdbcURL(), System.getProperty("user.name"), "bar");
-      hs2Conn.createStatement().execute("set hive.support.concurrency = false");
+      hs2Conn = getConnection(miniHS2.getJdbcURL(), System.getProperty("user.name"), "bar");
+    }
+
+    private Connection getConnection(String jdbcURL, String user, String pwd) throws SQLException {
+      Connection conn = DriverManager.getConnection(jdbcURL, user, pwd);
+      conn.createStatement().execute("set hive.support.concurrency = false");
+      return conn;
     }
 
     @After
@@ -113,7 +120,7 @@ import org.junit.Test;
 
      String  jdbcUri  = miniHS2.getJdbcURL().substring(0, miniHS2.getJdbcURL().indexOf("default"));
 
-     hs2Conn= DriverManager.getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar");
+     hs2Conn= getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar");
      String dbName="test_connection_non_default_db";
      String tableInNonDefaultSchema="table_in_non_default_schema";
      Statement stmt = hs2Conn.createStatement();
@@ -121,13 +128,13 @@ import org.junit.Test;
      stmt.close();
      hs2Conn.close();
 
-     hs2Conn = DriverManager.getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar");
+     hs2Conn = getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar");
      stmt = hs2Conn .createStatement();
      boolean expected = stmt.execute(" create table "+tableInNonDefaultSchema +" (x int)");
      stmt.close();
      hs2Conn .close();
 
-     hs2Conn  = DriverManager.getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar");
+     hs2Conn  = getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar");
      stmt = hs2Conn .createStatement();
      ResultSet res = stmt.executeQuery("show tables");
      boolean testTableExists = false;
@@ -142,7 +149,7 @@ import org.junit.Test;
      stmt.close();
      hs2Conn .close();
 
-     hs2Conn  = DriverManager.getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar");
+     hs2Conn  = getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar");
      stmt = hs2Conn .createStatement();
      res = stmt.executeQuery("show tables");
      testTableExists = false;
@@ -158,7 +165,7 @@ import org.junit.Test;
      stmt.close();
      hs2Conn .close();
 
-     hs2Conn  = DriverManager.getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar");
+     hs2Conn  = getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar");
      stmt = hs2Conn .createStatement();
      stmt.execute("set hive.support.concurrency = false");
      res = stmt.executeQuery("show tables");
@@ -166,8 +173,8 @@ import org.junit.Test;
      stmt.execute(" drop table if exists table_in_non_default_schema");
      expected = stmt.execute("DROP DATABASE "+ dbName);
      stmt.close();
-     
-     hs2Conn  = DriverManager.getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar");
+
+     hs2Conn  = getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar");
      stmt = hs2Conn .createStatement();
      res = stmt.executeQuery("show tables");
      testTableExists = false;
@@ -179,21 +186,52 @@ import org.junit.Test;
      }
 
      // test URI with no dbName
-     hs2Conn  = DriverManager.getConnection(jdbcUri, System.getProperty("user.name"),"bar");
+     hs2Conn  = getConnection(jdbcUri, System.getProperty("user.name"),"bar");
      verifyCurrentDB("default", hs2Conn);
      hs2Conn.close();
 
-     hs2Conn  = DriverManager.getConnection(jdbcUri + ";", System.getProperty("user.name"),"bar");
+     hs2Conn  = getConnection(jdbcUri + ";", System.getProperty("user.name"),"bar");
      verifyCurrentDB("default", hs2Conn);
      hs2Conn.close();
 
-     hs2Conn  = DriverManager.getConnection(jdbcUri + ";/foo=bar;foo1=bar1", System.getProperty("user.name"),"bar");
+     hs2Conn  = getConnection(jdbcUri + ";/foo=bar;foo1=bar1", System.getProperty("user.name"),"bar");
      verifyCurrentDB("default", hs2Conn);
      hs2Conn.close();
      }
 
+     @Test
+     public void testConnectionSchemaAPIs() throws Exception {
+       String db1 = "DB1";
+       /**
+        * get/set Schema are new in JDK7 and not available in java.sql.Connection in JDK6.
+        * Hence the test uses HiveConnection object to call these methods so that test will run with older JDKs
+        */
+       HiveConnection hiveConn = (HiveConnection)hs2Conn;
+
+       assertEquals("default", hiveConn.getSchema());
+       Statement stmt = hs2Conn.createStatement();
+       stmt.execute("DROP DATABASE IF EXISTS " + db1 + " CASCADE");
+       stmt.execute("CREATE DATABASE " + db1);
+       assertEquals("default", hiveConn.getSchema());
+
+       stmt.execute("USE " + db1);
+       assertEquals(db1, hiveConn.getSchema());
+
+       stmt.execute("USE default");
+       assertEquals("default", hiveConn.getSchema());
+
+       hiveConn.setSchema(db1);
+       assertEquals(db1, hiveConn.getSchema());
+       hiveConn.setSchema("default");
+       assertEquals("default", hiveConn.getSchema());
+
+       assertTrue(hiveConn.getCatalog().isEmpty());
+       hiveConn.setCatalog("foo");
+       assertTrue(hiveConn.getCatalog().isEmpty());
+     }
+
    /**
-    * verify that the current db is the one expected. first create table as <db>.tab and then 
+    * verify that the current db is the one expected. first create table as <db>.tab and then
     * describe that table to check if <db> is the current database
     * @param expectedDbName
     * @param hs2Conn
@@ -208,4 +246,4 @@ import org.junit.Test;
      stmt.execute("DROP TABLE IF EXISTS " + expectedDbName + "." + verifyTab);
      stmt.close();
    }
-}
+  }

Modified: hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java (original)
+++ hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java Tue Feb 25 07:58:52 2014
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hive.service.cli.CLIServiceClient;
 import org.apache.hive.service.cli.OperationHandle;
 import org.apache.hive.service.cli.RowSet;
@@ -48,6 +49,7 @@ public class TestHiveServer2 {
   @Before
   public void setUp() throws Exception {
     confOverlay = new HashMap<String, String>();
+    confOverlay.put(ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
     miniHS2.start(confOverlay);
   }
 

Modified: hive/branches/tez/itests/qtest/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/itests/qtest/pom.xml?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/itests/qtest/pom.xml (original)
+++ hive/branches/tez/itests/qtest/pom.xml Tue Feb 25 07:58:52 2014
@@ -36,8 +36,8 @@
     <run_disabled>false</run_disabled>
     <clustermode></clustermode>
     <execute.beeline.tests>false</execute.beeline.tests>
-    <minimr.query.files>stats_counter_partitioned.q,list_bucket_dml_10.q,input16_cc.q,scriptfile1.q,scriptfile1_win.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q,bucketmapjoin7.q,optrstat_groupby.q,bucket_num_reducers.q,bucket5.q,load_fs2.q,bucket_num_reducers2.q,infer_bucket_sort_merge.q,infer_bucket_sort_reducers_power_two.q,infer_bucket_sort_dyn_part.q,infer_bucket_sort_bucketed_table.q,infer_bucket_sort_map_operators.q,infer_bucket_sort_num_buckets.q,leftsemijoin_mr.q,schemeAuthority.q,schemeAuthority2.q,truncate_column_buckets.q,remote_script.q,,load_hdfs_file_with_space_in_the_name.q,parallel_orderby.q,import_exported_table.q,stats_counter.q,auto_sortmerge_join_16.q,quotedid_smb.q,file_with_header_footer.q,external_table_with_space_in_location_path.q,root_dir_external_table.q,index_bitmap3.q,ql_rewrite_gbtoidx.q,index_bitmap_auto.q</minimr.query.files>
-    <minimr.query.negative.files>cluster_tasklog_retrieval.q,minimr_broken_pipe.q,mapreduce_stack_trace.q,mapreduce_stack_trace_turnoff.q,mapreduce_stack_trace_hadoop20.q,mapreduce_stack_trace_turnoff_hadoop20.q,file_with_header_footer_negative.q</minimr.query.negative.files>
+    <minimr.query.files>stats_counter_partitioned.q,list_bucket_dml_10.q,input16_cc.q,scriptfile1.q,scriptfile1_win.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q,bucketmapjoin7.q,optrstat_groupby.q,bucket_num_reducers.q,bucket5.q,load_fs2.q,bucket_num_reducers2.q,infer_bucket_sort_merge.q,infer_bucket_sort_reducers_power_two.q,infer_bucket_sort_dyn_part.q,infer_bucket_sort_bucketed_table.q,infer_bucket_sort_map_operators.q,infer_bucket_sort_num_buckets.q,leftsemijoin_mr.q,schemeAuthority.q,schemeAuthority2.q,truncate_column_buckets.q,remote_script.q,,load_hdfs_file_with_space_in_the_name.q,parallel_orderby.q,import_exported_table.q,stats_counter.q,auto_sortmerge_join_16.q,quotedid_smb.q,file_with_header_footer.q,external_table_with_space_in_location_path.q,root_dir_external_table.q,index_bitmap3.q,ql_rewrite_gbtoidx.q,index_bitmap_auto.q,udf_using.q</minimr.query.files>
+    <minimr.query.negative.files>cluster_tasklog_retrieval.q,minimr_broken_pipe.q,mapreduce_stack_trace.q,mapreduce_stack_trace_turnoff.q,mapreduce_stack_trace_hadoop20.q,mapreduce_stack_trace_turnoff_hadoop20.q,file_with_header_footer_negative.q,udf_local_resource.q</minimr.query.negative.files>
     <minitez.query.files>tez_join_tests.q,tez_joins_explain.q,mrr.q,tez_dml.q,tez_insert_overwrite_local_directory_1.q</minitez.query.files>
     <minitez.query.files.shared>join0.q,join1.q,auto_join0.q,auto_join1.q,bucket2.q,bucket3.q,bucket4.q,count.q,create_merge_compressed.q,cross_join.q,ctas.q,custom_input_output_format.q,disable_merge_for_bucketing.q,enforce_order.q,filter_join_breaktask.q,filter_join_breaktask2.q,groupby1.q,groupby2.q,groupby3.q,having.q,insert1.q,insert_into1.q,insert_into2.q,leftsemijoin.q,limit_pushdown.q,load_dyn_part1.q,load_dyn_part2.q,load_dyn_part3.q,mapjoin_mapjoin.q,mapreduce1.q,mapreduce2.q,merge1.q,merge2.q,metadata_only_queries.q,sample1.q,subquery_in.q,subquery_exists.q,vectorization_15.q,ptf.q,stats_counter.q,stats_noscan_1.q,stats_counter_partitioned.q,union2.q,union3.q,union4.q,union5.q,union6.q,union7.q,union8.q,union9.q</minitez.query.files.shared>
     <beeline.positive.exclude>add_part_exist.q,alter1.q,alter2.q,alter4.q,alter5.q,alter_rename_partition.q,alter_rename_partition_authorization.q,archive.q,archive_corrupt.q,archive_multi.q,archive_mr_1806.q,archive_multi_mr_1806.q,authorization_1.q,authorization_2.q,authorization_4.q,authorization_5.q,authorization_6.q,authorization_7.q,ba_table1.q,ba_table2.q,ba_table3.q,ba_table_udfs.q,binary_table_bincolserde.q,binary_table_colserde.q,cluster.q,columnarserde_create_shortcut.q,combine2.q,constant_prop.q,create_nested_type.q,create_or_replace_view.q,create_struct_table.q,create_union_table.q,database.q,database_location.q,database_properties.q,ddltime.q,describe_database_json.q,drop_database_removes_partition_dirs.q,escape1.q,escape2.q,exim_00_nonpart_empty.q,exim_01_nonpart.q,exim_02_00_part_empty.q,exim_02_part.q,exim_03_nonpart_over_compat.q,exim_04_all_part.q,exim_04_evolved_parts.q,exim_05_some_part.q,exim_06_one_part.q,exim_07_all_part_over_nonoverlap.q,exim_08_nonpart_rena
 me.q,exim_09_part_spec_nonoverlap.q,exim_10_external_managed.q,exim_11_managed_external.q,exim_12_external_location.q,exim_13_managed_location.q,exim_14_managed_location_over_existing.q,exim_15_external_part.q,exim_16_part_external.q,exim_17_part_managed.q,exim_18_part_external.q,exim_19_00_part_external_location.q,exim_19_part_external_location.q,exim_20_part_managed_location.q,exim_21_export_authsuccess.q,exim_22_import_exist_authsuccess.q,exim_23_import_part_authsuccess.q,exim_24_import_nonexist_authsuccess.q,global_limit.q,groupby_complex_types.q,groupby_complex_types_multi_single_reducer.q,index_auth.q,index_auto.q,index_auto_empty.q,index_bitmap.q,index_bitmap1.q,index_bitmap2.q,index_bitmap3.q,index_bitmap_auto.q,index_bitmap_rc.q,index_compact.q,index_compact_1.q,index_compact_2.q,index_compact_3.q,index_stale_partitioned.q,init_file.q,input16.q,input16_cc.q,input46.q,input_columnarserde.q,input_dynamicserde.q,input_lazyserde.q,input_testxpath3.q,input_testxpath4.q,insert2_o
 verwrite_partitions.q,insertexternal1.q,join_thrift.q,lateral_view.q,load_binary_data.q,load_exist_part_authsuccess.q,load_nonpart_authsuccess.q,load_part_authsuccess.q,loadpart_err.q,lock1.q,lock2.q,lock3.q,lock4.q,merge_dynamic_partition.q,multi_insert.q,multi_insert_move_tasks_share_dependencies.q,null_column.q,ppd_clusterby.q,query_with_semi.q,rename_column.q,sample6.q,sample_islocalmode_hook.q,set_processor_namespaces.q,show_tables.q,source.q,split_sample.q,str_to_map.q,transform1.q,udaf_collect_set.q,udaf_context_ngrams.q,udaf_histogram_numeric.q,udaf_ngrams.q,udaf_percentile_approx.q,udf_array.q,udf_bitmap_and.q,udf_bitmap_or.q,udf_explode.q,udf_format_number.q,udf_map.q,udf_map_keys.q,udf_map_values.q,udf_max.q,udf_min.q,udf_named_struct.q,udf_percentile.q,udf_printf.q,udf_sentences.q,udf_sort_array.q,udf_split.q,udf_struct.q,udf_substr.q,udf_translate.q,udf_union.q,udf_xpath.q,udtf_stack.q,view.q,virtual_column.q</beeline.positive.exclude>

Modified: hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java (original)
+++ hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java Tue Feb 25 07:58:52 2014
@@ -52,6 +52,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import junit.framework.Assert;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -86,8 +87,8 @@ import org.apache.hadoop.hive.ql.session
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer;
 import org.apache.hadoop.hive.serde2.thrift.test.Complex;
-import org.apache.hadoop.hive.shims.HadoopShims;
 import org.apache.hadoop.hive.shims.Hadoop23Shims;
+import org.apache.hadoop.hive.shims.HadoopShims;
 import org.apache.hadoop.hive.shims.ShimLoader;
 import org.apache.hadoop.mapred.SequenceFileInputFormat;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
@@ -100,9 +101,7 @@ import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
 import org.junit.Assume;
 
-import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Ordering;
 
 /**
  * QTestUtil.
@@ -582,7 +581,8 @@ public class QTestUtil {
         }
       }
       if (!DEFAULT_DATABASE_NAME.equals(dbName)) {
-        db.dropDatabase(dbName);
+        // Drop cascade, may need to drop functions
+        db.dropDatabase(dbName, true, true, true);
       }
     }
     SessionState.get().setCurrentDatabase(DEFAULT_DATABASE_NAME);
@@ -650,6 +650,17 @@ public class QTestUtil {
     return;
   }
 
+  private void runCmd(String cmd) throws Exception {
+    int ecode = 0;
+    ecode = drv.run(cmd).getResponseCode();
+    drv.close();
+    if (ecode != 0) {
+      throw new Exception("command: " + cmd
+          + " failed with exit code= " + ecode);
+    }
+    return;
+  }
+
   public void createSources() throws Exception {
 
     startSessionState();
@@ -758,6 +769,10 @@ public class QTestUtil {
     runLoadCmd("LOAD DATA LOCAL INPATH '" + fpath.toUri().getPath()
         + "' INTO  TABLE "+AllVectorTypesRecord.TABLE_NAME);
 
+    runCmd("DROP FUNCTION IF EXISTS qtest_get_java_boolean ");
+    runCmd("CREATE FUNCTION qtest_get_java_boolean "
+        + " AS 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestGetJavaBoolean'");
+
     conf.setBoolean("hive.test.init.phase", false);
 
   }
@@ -1249,7 +1264,9 @@ public class QTestUtil {
       ".*job_local[0-9_]*.*",
       ".*USING 'java -cp.*",
       "^Deleted.*",
-      ".*DagName:.*"
+      ".*DagName:.*",
+      ".*Input:.*/data/files/.*",
+      ".*Output:.*/data/files/.*"
   });
 
   public int checkCliDriverResults(String tname) throws Exception {

Modified: hive/branches/tez/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java?rev=1571600&r1=1571599&r2=1571600&view=diff
==============================================================================
--- hive/branches/tez/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java (original)
+++ hive/branches/tez/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java Tue Feb 25 07:58:52 2014
@@ -667,10 +667,19 @@ public class HiveConnection implements j
     throw new SQLException("Method not supported");
   }
 
-
   public String getSchema() throws SQLException {
-    // JDK 1.7
-    throw new SQLException("Method not supported");
+    if (isClosed) {
+      throw new SQLException("Connection is closed");
+    }
+    Statement stmt = createStatement();
+    ResultSet res = stmt.executeQuery("SELECT current_database()");
+    if (!res.next()) {
+      throw new SQLException("Failed to get schema information");
+    }
+    String schemaName = res.getString(1);
+    res.close();
+    stmt.close();
+    return schemaName;
   }
 
   /*
@@ -923,8 +932,12 @@ public class HiveConnection implements j
 
   @Override
   public void setCatalog(String catalog) throws SQLException {
-    // TODO Auto-generated method stub
-    throw new SQLException("Method not supported");
+    // Per JDBC spec, if the driver does not support catalogs,
+    // it will silently ignore this request.
+    if (isClosed) {
+      throw new SQLException("Connection is closed");
+    }
+    return;
   }
 
   /*
@@ -1008,7 +1021,15 @@ public class HiveConnection implements j
 
   public void setSchema(String schema) throws SQLException {
     // JDK 1.7
-    throw new SQLException("Method not supported");
+    if (isClosed) {
+      throw new SQLException("Connection is closed");
+    }
+    if (schema == null || schema.isEmpty()) {
+      throw new SQLException("Schema name is null or empty");
+    }
+    Statement stmt = createStatement();
+    stmt.execute("use " + schema);
+    stmt.close();
   }
 
   /*