diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties index 97e310d..8aee7f5 100644 --- a/itests/src/test/resources/testconfiguration.properties +++ b/itests/src/test/resources/testconfiguration.properties @@ -26,7 +26,8 @@ disabled.query.files=ql_rewrite_gbtoidx.q,\ ql_rewrite_gbtoidx_cbo_1.q,\ ql_rewrite_gbtoidx_cbo_2.q,\ rcfile_merge1.q,\ - smb_mapjoin_8.q + smb_mapjoin_8.q,\ + stats_filemetadata.q # NOTE: Add tests to minitez only if it is very # specific to tez and cannot be added to minillap. @@ -50,8 +51,6 @@ minitez.query.files=explainuser_3.q,\ explainanalyze_5.q,\ hybridgrace_hashjoin_1.q,\ hybridgrace_hashjoin_2.q,\ - partition_column_names_with_leading_and_trailing_spaces.q,\ - stats_filemetadata.q,\ tez_union_with_udf.q diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java index 366c7b4..c5e027b 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java @@ -129,7 +129,7 @@ public MiniTezCliConfig() { setHiveConfDir("data/conf/tez"); setClusterType(MiniClusterType.tez); - setMetastoreType(MetastoreType.hbase); + setMetastoreType(MetastoreType.sql); setFsType(QTestUtil.FsType.hdfs); } catch (Exception e) { throw new RuntimeException("can't construct cliconfig", e); diff --git a/ql/src/test/queries/clientpositive/partition_column_names_with_leading_and_trailing_spaces.q b/ql/src/test/queries/clientpositive/partition_column_names_with_leading_and_trailing_spaces.q deleted file mode 100644 index f087130..0000000 --- a/ql/src/test/queries/clientpositive/partition_column_names_with_leading_and_trailing_spaces.q +++ /dev/null @@ -1,15 +0,0 @@ -set hive.mapred.mode=nonstrict; - -create table foo (d string); - -create table foo_p (d string) partitioned by (p string); - -insert into foo values ("1"); - -insert into foo_p partition (p="a ") select foo.d from foo; - -insert into foo_p partition (p="a") select foo.d from foo; - -select * from foo_p where p="a "; - -select * from foo_p where p="a"; diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out index 7da21db..ff04e98 100644 --- a/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out +++ b/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out @@ -308,14 +308,14 @@ Stage-3 Reducer 2 File Output Operator [FS_8] table:{"name:":"default.acid_uami"} - Select Operator [SEL_4] (rows=6/2 width=302) + Select Operator [SEL_4] (rows=8/2 width=302) Output:["_col0","_col1","_col2","_col3"] <-Map 1 [SIMPLE_EDGE] SHUFFLE [RS_3] PartitionCols:UDFToInteger(_col0) - Select Operator [SEL_2] (rows=6/2 width=302) + Select Operator [SEL_2] (rows=8/2 width=302) Output:["_col0","_col1","_col3"] - Filter Operator [FIL_9] (rows=6/2 width=226) + Filter Operator [FIL_9] (rows=8/2 width=226) predicate:((de = 109.23) or (de = 119.23)) TableScan [TS_0] (rows=8/4 width=226) default@acid_uami,acid_uami, ACID table,Tbl:COMPLETE,Col:COMPLETE,Output:["i","de","vc"] diff --git a/ql/src/test/results/clientpositive/tez/partition_column_names_with_leading_and_trailing_spaces.q.out b/ql/src/test/results/clientpositive/tez/partition_column_names_with_leading_and_trailing_spaces.q.out deleted file mode 100644 index 92fdbe1..0000000 --- a/ql/src/test/results/clientpositive/tez/partition_column_names_with_leading_and_trailing_spaces.q.out +++ /dev/null @@ -1,65 +0,0 @@ -PREHOOK: query: create table foo (d string) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@foo -POSTHOOK: query: create table foo (d string) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@foo -PREHOOK: query: create table foo_p (d string) partitioned by (p string) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@foo_p -POSTHOOK: query: create table foo_p (d string) partitioned by (p string) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@foo_p -PREHOOK: query: insert into foo values ("1") -PREHOOK: type: QUERY -PREHOOK: Input: default@values__tmp__table__1 -PREHOOK: Output: default@foo -POSTHOOK: query: insert into foo values ("1") -POSTHOOK: type: QUERY -POSTHOOK: Input: default@values__tmp__table__1 -POSTHOOK: Output: default@foo -POSTHOOK: Lineage: foo.d SIMPLE [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ] -PREHOOK: query: insert into foo_p partition (p="a ") select foo.d from foo -PREHOOK: type: QUERY -PREHOOK: Input: default@foo -PREHOOK: Output: default@foo_p@p=a -POSTHOOK: query: insert into foo_p partition (p="a ") select foo.d from foo -POSTHOOK: type: QUERY -POSTHOOK: Input: default@foo -POSTHOOK: Output: default@foo_p@p=a -POSTHOOK: Lineage: foo_p PARTITION(p=a ).d SIMPLE [(foo)foo.FieldSchema(name:d, type:string, comment:null), ] -PREHOOK: query: insert into foo_p partition (p="a") select foo.d from foo -PREHOOK: type: QUERY -PREHOOK: Input: default@foo -PREHOOK: Output: default@foo_p@p=a -POSTHOOK: query: insert into foo_p partition (p="a") select foo.d from foo -POSTHOOK: type: QUERY -POSTHOOK: Input: default@foo -POSTHOOK: Output: default@foo_p@p=a -POSTHOOK: Lineage: foo_p PARTITION(p=a).d SIMPLE [(foo)foo.FieldSchema(name:d, type:string, comment:null), ] -PREHOOK: query: select * from foo_p where p="a " -PREHOOK: type: QUERY -PREHOOK: Input: default@foo_p -PREHOOK: Input: default@foo_p@p=a -#### A masked pattern was here #### -POSTHOOK: query: select * from foo_p where p="a " -POSTHOOK: type: QUERY -POSTHOOK: Input: default@foo_p -POSTHOOK: Input: default@foo_p@p=a -#### A masked pattern was here #### -1 a -PREHOOK: query: select * from foo_p where p="a" -PREHOOK: type: QUERY -PREHOOK: Input: default@foo_p -PREHOOK: Input: default@foo_p@p=a -#### A masked pattern was here #### -POSTHOOK: query: select * from foo_p where p="a" -POSTHOOK: type: QUERY -POSTHOOK: Input: default@foo_p -POSTHOOK: Input: default@foo_p@p=a -#### A masked pattern was here #### -1 a diff --git a/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out b/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out index bd4ca72..304d74f 100644 --- a/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out +++ b/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out @@ -365,7 +365,7 @@ union select `u2`.`key`, `u2`.`value` from `default`.`u2` union all select `u3`.`key` as `key`, `u3`.`value` from `default`.`u3` -) `tab`, tableType:VIRTUAL_VIEW, privileges:PrincipalPrivilegeSet(userPrivileges:{hive_test_user=[PrivilegeGrantInfo(privilege:INSERT, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true), PrivilegeGrantInfo(privilege:SELECT, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true), PrivilegeGrantInfo(privilege:UPDATE, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true), PrivilegeGrantInfo(privilege:DELETE, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true)]}, groupPrivileges:null, rolePrivileges:null)) +) `tab`, tableType:VIRTUAL_VIEW) PREHOOK: query: select * from v PREHOOK: type: QUERY PREHOOK: Input: default@u1 @@ -435,7 +435,7 @@ select distinct * from u2 select distinct `u1`.`key`, `u1`.`value` from `default`.`u1` union select distinct `u2`.`key`, `u2`.`value` from `default`.`u2` -) `tab`, tableType:VIRTUAL_VIEW, privileges:PrincipalPrivilegeSet(userPrivileges:{hive_test_user=[PrivilegeGrantInfo(privilege:INSERT, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true), PrivilegeGrantInfo(privilege:SELECT, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true), PrivilegeGrantInfo(privilege:UPDATE, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true), PrivilegeGrantInfo(privilege:DELETE, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true)]}, groupPrivileges:null, rolePrivileges:null)) +) `tab`, tableType:VIRTUAL_VIEW) PREHOOK: query: select * from v PREHOOK: type: QUERY PREHOOK: Input: default@u1 @@ -500,7 +500,7 @@ select distinct * from u2 select distinct `u1`.`key`, `u1`.`value` from `default`.`u1` union all select distinct `u2`.`key`, `u2`.`value` from `default`.`u2` -) `tab`, tableType:VIRTUAL_VIEW, privileges:PrincipalPrivilegeSet(userPrivileges:{hive_test_user=[PrivilegeGrantInfo(privilege:INSERT, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true), PrivilegeGrantInfo(privilege:SELECT, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true), PrivilegeGrantInfo(privilege:UPDATE, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true), PrivilegeGrantInfo(privilege:DELETE, createTime:-1, grantor:hive_test_user, grantorType:USER, grantOption:true)]}, groupPrivileges:null, rolePrivileges:null)) +) `tab`, tableType:VIRTUAL_VIEW) PREHOOK: query: select * from v PREHOOK: type: QUERY PREHOOK: Input: default@u1 diff --git a/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out b/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out index ca7b93e..2cb78e5 100644 --- a/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out +++ b/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out @@ -87,16 +87,16 @@ PREHOOK: Input: default@char_tbl1 POSTHOOK: query: show partitions char_tbl1 POSTHOOK: type: SHOWPARTITIONS POSTHOOK: Input: default@char_tbl1 -gpa=2.5 -gpa=3.5 +gpa=2.5 +gpa=3.5 PREHOOK: query: show partitions char_tbl2 PREHOOK: type: SHOWPARTITIONS PREHOOK: Input: default@char_tbl2 POSTHOOK: query: show partitions char_tbl2 POSTHOOK: type: SHOWPARTITIONS POSTHOOK: Input: default@char_tbl2 -gpa=3 -gpa=3.5 +gpa=3 +gpa=3.5 PREHOOK: query: explain vectorization select c1.name, c1.age, c1.gpa, c2.name, c2.age, c2.gpa from char_tbl1 c1 join char_tbl2 c2 on (c1.gpa = c2.gpa) PREHOOK: type: QUERY POSTHOOK: query: explain vectorization select c1.name, c1.age, c1.gpa, c2.name, c2.age, c2.gpa from char_tbl1 c1 join char_tbl2 c2 on (c1.gpa = c2.gpa) @@ -138,38 +138,38 @@ Stage-0 PREHOOK: query: select c1.name, c1.age, c1.gpa, c2.name, c2.age, c2.gpa from char_tbl1 c1 join char_tbl2 c2 on (c1.gpa = c2.gpa) PREHOOK: type: QUERY PREHOOK: Input: default@char_tbl1 -PREHOOK: Input: default@char_tbl1@gpa=2.5 -PREHOOK: Input: default@char_tbl1@gpa=3.5 +PREHOOK: Input: default@char_tbl1@gpa=2.5 +PREHOOK: Input: default@char_tbl1@gpa=3.5 PREHOOK: Input: default@char_tbl2 -PREHOOK: Input: default@char_tbl2@gpa=3 -PREHOOK: Input: default@char_tbl2@gpa=3.5 +PREHOOK: Input: default@char_tbl2@gpa=3 +PREHOOK: Input: default@char_tbl2@gpa=3.5 #### A masked pattern was here #### POSTHOOK: query: select c1.name, c1.age, c1.gpa, c2.name, c2.age, c2.gpa from char_tbl1 c1 join char_tbl2 c2 on (c1.gpa = c2.gpa) POSTHOOK: type: QUERY POSTHOOK: Input: default@char_tbl1 -POSTHOOK: Input: default@char_tbl1@gpa=2.5 -POSTHOOK: Input: default@char_tbl1@gpa=3.5 +POSTHOOK: Input: default@char_tbl1@gpa=2.5 +POSTHOOK: Input: default@char_tbl1@gpa=3.5 POSTHOOK: Input: default@char_tbl2 -POSTHOOK: Input: default@char_tbl2@gpa=3 -POSTHOOK: Input: default@char_tbl2@gpa=3.5 +POSTHOOK: Input: default@char_tbl2@gpa=3 +POSTHOOK: Input: default@char_tbl2@gpa=3.5 #### A masked pattern was here #### alice underhill 46 3.5 alice underhill 46 3.5 PREHOOK: query: select c1.name, c1.age, c1.gpa, c2.name, c2.age, c2.gpa from char_tbl1 c1 join char_tbl2 c2 on (c1.gpa = c2.gpa) PREHOOK: type: QUERY PREHOOK: Input: default@char_tbl1 -PREHOOK: Input: default@char_tbl1@gpa=2.5 -PREHOOK: Input: default@char_tbl1@gpa=3.5 +PREHOOK: Input: default@char_tbl1@gpa=2.5 +PREHOOK: Input: default@char_tbl1@gpa=3.5 PREHOOK: Input: default@char_tbl2 -PREHOOK: Input: default@char_tbl2@gpa=3 -PREHOOK: Input: default@char_tbl2@gpa=3.5 +PREHOOK: Input: default@char_tbl2@gpa=3 +PREHOOK: Input: default@char_tbl2@gpa=3.5 #### A masked pattern was here #### POSTHOOK: query: select c1.name, c1.age, c1.gpa, c2.name, c2.age, c2.gpa from char_tbl1 c1 join char_tbl2 c2 on (c1.gpa = c2.gpa) POSTHOOK: type: QUERY POSTHOOK: Input: default@char_tbl1 -POSTHOOK: Input: default@char_tbl1@gpa=2.5 -POSTHOOK: Input: default@char_tbl1@gpa=3.5 +POSTHOOK: Input: default@char_tbl1@gpa=2.5 +POSTHOOK: Input: default@char_tbl1@gpa=3.5 POSTHOOK: Input: default@char_tbl2 -POSTHOOK: Input: default@char_tbl2@gpa=3 -POSTHOOK: Input: default@char_tbl2@gpa=3.5 +POSTHOOK: Input: default@char_tbl2@gpa=3 +POSTHOOK: Input: default@char_tbl2@gpa=3.5 #### A masked pattern was here #### alice underhill 46 3.5 alice underhill 46 3.5