You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2014/08/14 04:16:09 UTC
svn commit: r1617864 - in /hive/trunk/ql/src/test: queries/clientpositive/
results/clientpositive/
Author: navis
Date: Thu Aug 14 02:16:09 2014
New Revision: 1617864
URL: http://svn.apache.org/r1617864
Log:
HIVE-7678 : add more test cases for tables qualified with database/schema name (Thejas M Nair via Navis)
Modified:
hive/trunk/ql/src/test/queries/clientpositive/repair.q
hive/trunk/ql/src/test/queries/clientpositive/show_partitions.q
hive/trunk/ql/src/test/queries/clientpositive/show_tblproperties.q
hive/trunk/ql/src/test/results/clientpositive/repair.q.out
hive/trunk/ql/src/test/results/clientpositive/show_partitions.q.out
hive/trunk/ql/src/test/results/clientpositive/show_tblproperties.q.out
Modified: hive/trunk/ql/src/test/queries/clientpositive/repair.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/repair.q?rev=1617864&r1=1617863&r2=1617864&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/repair.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/repair.q Thu Aug 14 02:16:09 2014
@@ -8,10 +8,10 @@ dfs ${system:test.dfs.mkdir} ${system:te
dfs ${system:test.dfs.mkdir} ${system:test.warehouse.dir}/repairtable/p1=b/p2=a;
dfs -touchz ${system:test.warehouse.dir}/repairtable/p1=b/p2=a/datafile;
-MSCK TABLE repairtable;
+MSCK TABLE default.repairtable;
-MSCK REPAIR TABLE repairtable;
+MSCK REPAIR TABLE default.repairtable;
MSCK TABLE repairtable;
-DROP TABLE repairtable;
+DROP TABLE default.repairtable;
Modified: hive/trunk/ql/src/test/queries/clientpositive/show_partitions.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/show_partitions.q?rev=1617864&r1=1617863&r2=1617864&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/show_partitions.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/show_partitions.q Thu Aug 14 02:16:09 2014
@@ -3,3 +3,30 @@ SHOW PARTITIONS default.srcpart;
SHOW PARTITIONS srcpart PARTITION(hr='11');
SHOW PARTITIONS srcpart PARTITION(ds='2008-04-08');
SHOW PARTITIONS srcpart PARTITION(ds='2008-04-08', hr='12');
+
+
+SHOW PARTITIONS default.srcpart;
+SHOW PARTITIONS default.srcpart PARTITION(hr='11');
+SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08');
+SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12');
+
+CREATE DATABASE db1;
+USE db1;
+
+CREATE TABLE srcpart (key1 INT, value1 STRING) PARTITIONED BY (ds STRING, hr STRING);
+ALTER TABLE srcpart ADD PARTITION (ds='3', hr='3');
+ALTER TABLE srcpart ADD PARTITION (ds='4', hr='4');
+ALTER TABLE srcpart ADD PARTITION (ds='4', hr='5');
+
+-- from db1 to default db
+SHOW PARTITIONS default.srcpart PARTITION(hr='11');
+SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12');
+
+-- from db1 to db1
+SHOW PARTITIONS srcpart PARTITION(ds='4');
+SHOW PARTITIONS srcpart PARTITION(ds='3', hr='3');
+
+use default;
+-- from default to db1
+SHOW PARTITIONS db1.srcpart PARTITION(ds='4');
+SHOW PARTITIONS db1.srcpart PARTITION(ds='3', hr='3');
\ No newline at end of file
Modified: hive/trunk/ql/src/test/queries/clientpositive/show_tblproperties.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/show_tblproperties.q?rev=1617864&r1=1617863&r2=1617864&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/show_tblproperties.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/show_tblproperties.q Thu Aug 14 02:16:09 2014
@@ -1,6 +1,7 @@
create table tmpfoo (a String);
show tblproperties tmpfoo("bar");
+show tblproperties default.tmpfoo("bar");
alter table tmpfoo set tblproperties ("bar" = "bar value");
alter table tmpfoo set tblproperties ("tmp" = "true");
@@ -8,4 +9,26 @@ alter table tmpfoo set tblproperties ("t
show tblproperties tmpfoo;
show tblproperties tmpfoo("bar");
-drop table tmpfoo;
+show tblproperties default.tmpfoo;
+show tblproperties default.tmpfoo("bar");
+
+CREATE DATABASE db1;
+USE db1;
+
+CREATE TABLE tmpfoo (b STRING);
+alter table tmpfoo set tblproperties ("bar" = "bar value1");
+alter table tmpfoo set tblproperties ("tmp" = "true1");
+
+-- from db1 to default db
+show tblproperties default.tmpfoo;
+show tblproperties default.tmpfoo("bar");
+
+-- from db1 to db1
+show tblproperties tmpfoo;
+show tblproperties tmpfoo("bar");
+
+use default;
+-- from default to db1
+show tblproperties db1.tmpfoo;
+show tblproperties db1.tmpfoo("bar");
+
Modified: hive/trunk/ql/src/test/results/clientpositive/repair.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/repair.q.out?rev=1617864&r1=1617863&r2=1617864&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/repair.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/repair.q.out Thu Aug 14 02:16:09 2014
@@ -13,27 +13,27 @@ PREHOOK: query: MSCK TABLE repairtable
PREHOOK: type: MSCK
POSTHOOK: query: MSCK TABLE repairtable
POSTHOOK: type: MSCK
-PREHOOK: query: MSCK TABLE repairtable
+PREHOOK: query: MSCK TABLE default.repairtable
PREHOOK: type: MSCK
-POSTHOOK: query: MSCK TABLE repairtable
+POSTHOOK: query: MSCK TABLE default.repairtable
POSTHOOK: type: MSCK
Partitions not in metastore: repairtable:p1=a/p2=a repairtable:p1=b/p2=a
-PREHOOK: query: MSCK REPAIR TABLE repairtable
+PREHOOK: query: MSCK REPAIR TABLE default.repairtable
PREHOOK: type: MSCK
-POSTHOOK: query: MSCK REPAIR TABLE repairtable
+POSTHOOK: query: MSCK REPAIR TABLE default.repairtable
POSTHOOK: type: MSCK
Partitions not in metastore: repairtable:p1=a/p2=a repairtable:p1=b/p2=a
-Repair: Added partition to metastore repairtable:p1=a/p2=a
-Repair: Added partition to metastore repairtable:p1=b/p2=a
+Repair: Added partition to metastore default.repairtable:p1=a/p2=a
+Repair: Added partition to metastore default.repairtable:p1=b/p2=a
PREHOOK: query: MSCK TABLE repairtable
PREHOOK: type: MSCK
POSTHOOK: query: MSCK TABLE repairtable
POSTHOOK: type: MSCK
-PREHOOK: query: DROP TABLE repairtable
+PREHOOK: query: DROP TABLE default.repairtable
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@repairtable
PREHOOK: Output: default@repairtable
-POSTHOOK: query: DROP TABLE repairtable
+POSTHOOK: query: DROP TABLE default.repairtable
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@repairtable
POSTHOOK: Output: default@repairtable
Modified: hive/trunk/ql/src/test/results/clientpositive/show_partitions.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_partitions.q.out?rev=1617864&r1=1617863&r2=1617864&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_partitions.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_partitions.q.out Thu Aug 14 02:16:09 2014
@@ -41,3 +41,127 @@ POSTHOOK: query: SHOW PARTITIONS srcpart
POSTHOOK: type: SHOWPARTITIONS
POSTHOOK: Input: default@srcpart
ds=2008-04-08/hr=12
+PREHOOK: query: SHOW PARTITIONS default.srcpart
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=11
+ds=2008-04-08/hr=12
+ds=2008-04-09/hr=11
+ds=2008-04-09/hr=12
+PREHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(hr='11')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(hr='11')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=11
+ds=2008-04-09/hr=11
+PREHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=11
+ds=2008-04-08/hr=12
+PREHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=12
+PREHOOK: query: CREATE DATABASE db1
+PREHOOK: type: CREATEDATABASE
+POSTHOOK: query: CREATE DATABASE db1
+POSTHOOK: type: CREATEDATABASE
+PREHOOK: query: USE db1
+PREHOOK: type: SWITCHDATABASE
+POSTHOOK: query: USE db1
+POSTHOOK: type: SWITCHDATABASE
+PREHOOK: query: CREATE TABLE srcpart (key1 INT, value1 STRING) PARTITIONED BY (ds STRING, hr STRING)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:db1
+POSTHOOK: query: CREATE TABLE srcpart (key1 INT, value1 STRING) PARTITIONED BY (ds STRING, hr STRING)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:db1
+POSTHOOK: Output: db1@srcpart
+PREHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='3', hr='3')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+PREHOOK: Output: db1@srcpart
+POSTHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='3', hr='3')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: db1@srcpart
+POSTHOOK: Output: db1@srcpart@ds=3/hr=3
+PREHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='4', hr='4')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+PREHOOK: Output: db1@srcpart
+POSTHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='4', hr='4')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: db1@srcpart
+POSTHOOK: Output: db1@srcpart@ds=4/hr=4
+PREHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='4', hr='5')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+PREHOOK: Output: db1@srcpart
+POSTHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='4', hr='5')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: db1@srcpart
+POSTHOOK: Output: db1@srcpart@ds=4/hr=5
+PREHOOK: query: -- from db1 to default db
+SHOW PARTITIONS default.srcpart PARTITION(hr='11')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: -- from db1 to default db
+SHOW PARTITIONS default.srcpart PARTITION(hr='11')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=11
+ds=2008-04-09/hr=11
+PREHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=12
+PREHOOK: query: -- from db1 to db1
+SHOW PARTITIONS srcpart PARTITION(ds='4')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: db1@srcpart
+POSTHOOK: query: -- from db1 to db1
+SHOW PARTITIONS srcpart PARTITION(ds='4')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: db1@srcpart
+ds=4/hr=4
+ds=4/hr=5
+PREHOOK: query: SHOW PARTITIONS srcpart PARTITION(ds='3', hr='3')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: db1@srcpart
+POSTHOOK: query: SHOW PARTITIONS srcpart PARTITION(ds='3', hr='3')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: db1@srcpart
+ds=3/hr=3
+PREHOOK: query: use default
+PREHOOK: type: SWITCHDATABASE
+POSTHOOK: query: use default
+POSTHOOK: type: SWITCHDATABASE
+PREHOOK: query: -- from default to db1
+SHOW PARTITIONS db1.srcpart PARTITION(ds='4')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: db1@srcpart
+POSTHOOK: query: -- from default to db1
+SHOW PARTITIONS db1.srcpart PARTITION(ds='4')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: db1@srcpart
+ds=4/hr=4
+ds=4/hr=5
+PREHOOK: query: SHOW PARTITIONS db1.srcpart PARTITION(ds='3', hr='3')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: db1@srcpart
+POSTHOOK: query: SHOW PARTITIONS db1.srcpart PARTITION(ds='3', hr='3')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: db1@srcpart
+ds=3/hr=3
Modified: hive/trunk/ql/src/test/results/clientpositive/show_tblproperties.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_tblproperties.q.out?rev=1617864&r1=1617863&r2=1617864&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_tblproperties.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_tblproperties.q.out Thu Aug 14 02:16:09 2014
@@ -10,6 +10,11 @@ PREHOOK: type: SHOW_TBLPROPERTIES
POSTHOOK: query: show tblproperties tmpfoo("bar")
POSTHOOK: type: SHOW_TBLPROPERTIES
Table default.tmpfoo does not have property: bar
+PREHOOK: query: show tblproperties default.tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties default.tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+Table default.tmpfoo does not have property: bar
PREHOOK: query: alter table tmpfoo set tblproperties ("bar" = "bar value")
PREHOOK: type: ALTERTABLE_PROPERTIES
PREHOOK: Input: default@tmpfoo
@@ -44,11 +49,116 @@ PREHOOK: type: SHOW_TBLPROPERTIES
POSTHOOK: query: show tblproperties tmpfoo("bar")
POSTHOOK: type: SHOW_TBLPROPERTIES
bar value
-PREHOOK: query: drop table tmpfoo
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@tmpfoo
-PREHOOK: Output: default@tmpfoo
-POSTHOOK: query: drop table tmpfoo
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@tmpfoo
-POSTHOOK: Output: default@tmpfoo
+PREHOOK: query: show tblproperties default.tmpfoo
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties default.tmpfoo
+POSTHOOK: type: SHOW_TBLPROPERTIES
+COLUMN_STATS_ACCURATE false
+bar bar value
+#### A masked pattern was here ####
+numFiles 0
+numRows -1
+rawDataSize -1
+tmp true
+totalSize 0
+#### A masked pattern was here ####
+PREHOOK: query: show tblproperties default.tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties default.tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+bar value
+PREHOOK: query: CREATE DATABASE db1
+PREHOOK: type: CREATEDATABASE
+POSTHOOK: query: CREATE DATABASE db1
+POSTHOOK: type: CREATEDATABASE
+PREHOOK: query: USE db1
+PREHOOK: type: SWITCHDATABASE
+POSTHOOK: query: USE db1
+POSTHOOK: type: SWITCHDATABASE
+PREHOOK: query: CREATE TABLE tmpfoo (b STRING)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:db1
+POSTHOOK: query: CREATE TABLE tmpfoo (b STRING)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:db1
+POSTHOOK: Output: db1@tmpfoo
+PREHOOK: query: alter table tmpfoo set tblproperties ("bar" = "bar value1")
+PREHOOK: type: ALTERTABLE_PROPERTIES
+PREHOOK: Input: db1@tmpfoo
+PREHOOK: Output: db1@tmpfoo
+POSTHOOK: query: alter table tmpfoo set tblproperties ("bar" = "bar value1")
+POSTHOOK: type: ALTERTABLE_PROPERTIES
+POSTHOOK: Input: db1@tmpfoo
+POSTHOOK: Output: db1@tmpfoo
+PREHOOK: query: alter table tmpfoo set tblproperties ("tmp" = "true1")
+PREHOOK: type: ALTERTABLE_PROPERTIES
+PREHOOK: Input: db1@tmpfoo
+PREHOOK: Output: db1@tmpfoo
+POSTHOOK: query: alter table tmpfoo set tblproperties ("tmp" = "true1")
+POSTHOOK: type: ALTERTABLE_PROPERTIES
+POSTHOOK: Input: db1@tmpfoo
+POSTHOOK: Output: db1@tmpfoo
+PREHOOK: query: -- from db1 to default db
+show tblproperties default.tmpfoo
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: -- from db1 to default db
+show tblproperties default.tmpfoo
+POSTHOOK: type: SHOW_TBLPROPERTIES
+COLUMN_STATS_ACCURATE false
+bar bar value
+#### A masked pattern was here ####
+numFiles 0
+numRows -1
+rawDataSize -1
+tmp true
+totalSize 0
+#### A masked pattern was here ####
+PREHOOK: query: show tblproperties default.tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties default.tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+bar value
+PREHOOK: query: -- from db1 to db1
+show tblproperties tmpfoo
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: -- from db1 to db1
+show tblproperties tmpfoo
+POSTHOOK: type: SHOW_TBLPROPERTIES
+COLUMN_STATS_ACCURATE false
+bar bar value1
+#### A masked pattern was here ####
+numFiles 0
+numRows -1
+rawDataSize -1
+tmp true1
+totalSize 0
+#### A masked pattern was here ####
+PREHOOK: query: show tblproperties tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+bar value1
+PREHOOK: query: use default
+PREHOOK: type: SWITCHDATABASE
+POSTHOOK: query: use default
+POSTHOOK: type: SWITCHDATABASE
+PREHOOK: query: -- from default to db1
+show tblproperties db1.tmpfoo
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: -- from default to db1
+show tblproperties db1.tmpfoo
+POSTHOOK: type: SHOW_TBLPROPERTIES
+COLUMN_STATS_ACCURATE false
+bar bar value1
+#### A masked pattern was here ####
+numFiles 0
+numRows -1
+rawDataSize -1
+tmp true1
+totalSize 0
+#### A masked pattern was here ####
+PREHOOK: query: show tblproperties db1.tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties db1.tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+bar value1