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

svn commit: r1620472 [2/3] - in /hive/trunk: hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/ hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/ ql/src/java/org/apache/hadoop/hive/ql/hooks/ ql/src/java/org/apache/hadoop...

Modified: hive/trunk/ql/src/test/queries/clientpositive/alter_partition_coltype.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/alter_partition_coltype.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/alter_partition_coltype.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/alter_partition_coltype.q Mon Aug 25 21:56:13 2014
@@ -51,18 +51,23 @@ desc alter_coltype partition (dt='100', 
 
 drop table alter_coltype;
 
-create table alterdynamic_part_table(intcol string) partitioned by (partcol1 string, partcol2 string);
+create database pt;
+
+create table pt.alterdynamic_part_table(intcol string) partitioned by (partcol1 string, partcol2 string);
 
 set hive.exec.dynamic.partition.mode=nonstrict;
 
-insert into table alterdynamic_part_table partition(partcol1, partcol2) select '1', '1', '1' from src where key=150 limit 5;
+insert into table pt.alterdynamic_part_table partition(partcol1, partcol2) select '1', '1', '1' from src where key=150 limit 5;
+
+insert into table pt.alterdynamic_part_table partition(partcol1, partcol2) select '1', '2', '1' from src where key=150 limit 5;
+insert into table pt.alterdynamic_part_table partition(partcol1, partcol2) select NULL, '1', '1' from src where key=150 limit 5;
 
-insert into table alterdynamic_part_table partition(partcol1, partcol2) select '1', '2', '1' from src where key=150 limit 5;
-insert into table alterdynamic_part_table partition(partcol1, partcol2) select NULL, '1', '1' from src where key=150 limit 5;
+alter table pt.alterdynamic_part_table partition column (partcol1 int);
 
-alter table alterdynamic_part_table partition column (partcol1 int);
+explain extended select intcol from pt.alterdynamic_part_table where partcol1='1' and partcol2='1';
 
-explain extended select intcol from alterdynamic_part_table where partcol1='1' and partcol2='1';
+explain extended select intcol from pt.alterdynamic_part_table where (partcol1='2' and partcol2='1')or (partcol1='1' and partcol2='__HIVE_DEFAULT_PARTITION__');
+select intcol from pt.alterdynamic_part_table where (partcol1='2' and partcol2='1')or (partcol1='1' and partcol2='__HIVE_DEFAULT_PARTITION__');
 
-explain extended select intcol from alterdynamic_part_table where (partcol1='2' and partcol2='1')or (partcol1='1' and partcol2='__HIVE_DEFAULT_PARTITION__');
-select intcol from alterdynamic_part_table where (partcol1='2' and partcol2='1')or (partcol1='1' and partcol2='__HIVE_DEFAULT_PARTITION__');
\ No newline at end of file
+drop table pt.alterdynamic_part_table;
+drop database pt;

Modified: hive/trunk/ql/src/test/queries/clientpositive/alter_skewed_table.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/alter_skewed_table.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/alter_skewed_table.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/alter_skewed_table.q Mon Aug 25 21:56:13 2014
@@ -1,6 +1,6 @@
 set hive.mapred.supports.subdirectories=true;
 
-create table original (key STRING, value STRING); 
+create table original (key STRING, value STRING);
 
 describe formatted original;
 
@@ -10,23 +10,27 @@ describe formatted original;
 
 drop table original;
 
-create table original2 (key STRING, value STRING) ; 
+create database skew_test;
 
-describe formatted original2;
+create table skew_test.original2 (key STRING, value STRING) ;
 
-alter table original2 SKEWED BY (key, value) ON ((1,1),(5,6));
+describe formatted skew_test.original2;
 
-describe formatted original2;
+alter table skew_test.original2 SKEWED BY (key, value) ON ((1,1),(5,6));
 
-drop table original2;
+describe formatted skew_test.original2;
 
-create table original3 (key STRING, value STRING) SKEWED BY (key, value) ON ((1,1),(5,6)); 
+drop table skew_test.original2;
 
-describe formatted original3;
+create table skew_test.original3 (key STRING, value STRING) SKEWED BY (key, value) ON ((1,1),(5,6));
 
-alter table original3 not skewed;
+describe formatted skew_test.original3;
 
-describe formatted original3;
+alter table skew_test.original3 not skewed;
 
-drop table original3;
+describe formatted skew_test.original3;
+
+drop table skew_test.original3;
+
+drop database skew_test;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/alter_varchar1.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/alter_varchar1.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/alter_varchar1.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/alter_varchar1.q Mon Aug 25 21:56:13 2014
@@ -1,34 +1,35 @@
 -- SORT_QUERY_RESULTS
 
-drop table alter_varchar_1;
+create database avc;
 
-create table alter_varchar_1 (key string, value string);
-insert overwrite table alter_varchar_1
+create table avc.alter_varchar_1 (key string, value string);
+insert overwrite table avc.alter_varchar_1
   select key, value from src order by key limit 5;
 
-select * from alter_varchar_1;
+select * from avc.alter_varchar_1;
 
 -- change column to varchar
-alter table alter_varchar_1 change column value value varchar(20);
+alter table avc.alter_varchar_1 change column value value varchar(20);
 -- contents should still look the same
-select * from alter_varchar_1;
+select * from avc.alter_varchar_1;
 
 -- change column to smaller varchar
-alter table alter_varchar_1 change column value value varchar(3);
+alter table avc.alter_varchar_1 change column value value varchar(3);
 -- value column should be truncated now
-select * from alter_varchar_1;
+select * from avc.alter_varchar_1;
 
 -- change back to bigger varchar
-alter table alter_varchar_1 change column value value varchar(20);
+alter table avc.alter_varchar_1 change column value value varchar(20);
 -- column values should be full size again
-select * from alter_varchar_1;
+select * from avc.alter_varchar_1;
 
 -- add varchar column
-alter table alter_varchar_1 add columns (key2 int, value2 varchar(10));
-select * from alter_varchar_1;
+alter table avc.alter_varchar_1 add columns (key2 int, value2 varchar(10));
+select * from avc.alter_varchar_1;
 
-insert overwrite table alter_varchar_1
+insert overwrite table avc.alter_varchar_1
   select key, value, key, value from src order by key limit 5;
-select * from alter_varchar_1;
+select * from avc.alter_varchar_1;
 
-drop table alter_varchar_1;
+drop table avc.alter_varchar_1;
+drop database avc;

Modified: hive/trunk/ql/src/test/queries/clientpositive/alter_view_as_select.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/alter_view_as_select.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/alter_view_as_select.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/alter_view_as_select.q Mon Aug 25 21:56:13 2014
@@ -1,13 +1,16 @@
-DROP VIEW testView;
-CREATE VIEW testView as SELECT * FROM srcpart;
-DESCRIBE FORMATTED testView;
+CREATE DATABASE tv;
+CREATE VIEW tv.testView as SELECT * FROM srcpart;
+DESCRIBE FORMATTED tv.testView;
 
-ALTER VIEW testView AS SELECT value FROM src WHERE key=86;
-DESCRIBE FORMATTED testView;
+ALTER VIEW tv.testView AS SELECT value FROM src WHERE key=86;
+DESCRIBE FORMATTED tv.testView;
 
-ALTER VIEW testView AS
+ALTER VIEW tv.testView AS
 SELECT * FROM src
 WHERE key > 80 AND key < 100
 ORDER BY key, value
 LIMIT 10;
-DESCRIBE FORMATTED testView;
+DESCRIBE FORMATTED tv.testView;
+
+DROP VIEW tv.testView;
+DROP DATABASE tv;
\ No newline at end of file

Modified: hive/trunk/ql/src/test/queries/clientpositive/alter_view_rename.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/alter_view_rename.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/alter_view_rename.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/alter_view_rename.q Mon Aug 25 21:56:13 2014
@@ -1,10 +1,16 @@
+CREATE DATABASE tv1;
+CREATE DATABASE tv2;
+
 CREATE TABLE invites (foo INT, bar STRING) PARTITIONED BY (ds STRING);
-CREATE VIEW view1 as SELECT * FROM invites;
-DESCRIBE EXTENDED view1;
+CREATE VIEW tv1.view1 as SELECT * FROM invites;
+DESCRIBE EXTENDED tv1.view1;
 
-ALTER VIEW view1 RENAME TO view2;
-DESCRIBE EXTENDED view2;
-SELECT * FROM view2;
+ALTER VIEW tv1.view1 RENAME TO tv2.view2;
+DESCRIBE EXTENDED tv2.view2;
+SELECT * FROM tv2.view2;
 
 DROP TABLE invites;
-DROP VIEW view2;
\ No newline at end of file
+DROP VIEW tv2.view2;
+
+DROP DATABASE tv1;
+DROP DATABASE tv2;

Modified: hive/trunk/ql/src/test/queries/clientpositive/archive_multi.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/archive_multi.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/archive_multi.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/archive_multi.q Mon Aug 25 21:56:13 2014
@@ -1,42 +1,41 @@
 set hive.archive.enabled = true;
 set hive.enforce.bucketing = true;
 
-drop table tstsrc;
-drop table tstsrcpart;
+create database ac_test;
 
-create table tstsrc like src;
-insert overwrite table tstsrc select key, value from src;
+create table ac_test.tstsrc like default.src;
+insert overwrite table ac_test.tstsrc select key, value from default.src;
 
-create table tstsrcpart like srcpart;
+create table ac_test.tstsrcpart like default.srcpart;
 
-insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='11')
-select key, value from srcpart where ds='2008-04-08' and hr='11';
+insert overwrite table ac_test.tstsrcpart partition (ds='2008-04-08', hr='11')
+select key, value from default.srcpart where ds='2008-04-08' and hr='11';
 
-insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='12')
-select key, value from srcpart where ds='2008-04-08' and hr='12';
+insert overwrite table ac_test.tstsrcpart partition (ds='2008-04-08', hr='12')
+select key, value from default.srcpart where ds='2008-04-08' and hr='12';
 
-insert overwrite table tstsrcpart partition (ds='2008-04-09', hr='11')
-select key, value from srcpart where ds='2008-04-09' and hr='11';
+insert overwrite table ac_test.tstsrcpart partition (ds='2008-04-09', hr='11')
+select key, value from default.srcpart where ds='2008-04-09' and hr='11';
 
-insert overwrite table tstsrcpart partition (ds='2008-04-09', hr='12')
-select key, value from srcpart where ds='2008-04-09' and hr='12';
+insert overwrite table ac_test.tstsrcpart partition (ds='2008-04-09', hr='12')
+select key, value from default.srcpart where ds='2008-04-09' and hr='12';
 
 -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
 
 SELECT SUM(hash(col)) FROM (SELECT transform(*) using 'tr "\t" "_"' AS col
-FROM (SELECT * FROM tstsrcpart WHERE ds='2008-04-08') subq1) subq2;
+FROM (SELECT * FROM ac_test.tstsrcpart WHERE ds='2008-04-08') subq1) subq2;
 
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
+ALTER TABLE ac_test.tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
 
 SELECT SUM(hash(col)) FROM (SELECT transform(*) using 'tr "\t" "_"' AS col
-FROM (SELECT * FROM tstsrcpart WHERE ds='2008-04-08') subq1) subq2;
+FROM (SELECT * FROM ac_test.tstsrcpart WHERE ds='2008-04-08') subq1) subq2;
 
-SELECT key, count(1) FROM tstsrcpart WHERE ds='2008-04-08' AND hr='12' AND key='0' GROUP BY key;
+SELECT key, count(1) FROM ac_test.tstsrcpart WHERE ds='2008-04-08' AND hr='12' AND key='0' GROUP BY key;
 
-SELECT * FROM tstsrcpart a JOIN tstsrc b ON a.key=b.key
+SELECT * FROM ac_test.tstsrcpart a JOIN ac_test.tstsrc b ON a.key=b.key
 WHERE a.ds='2008-04-08' AND a.hr='12' AND a.key='0';
 
-ALTER TABLE tstsrcpart UNARCHIVE PARTITION (ds='2008-04-08');
+ALTER TABLE ac_test.tstsrcpart UNARCHIVE PARTITION (ds='2008-04-08');
 
 SELECT SUM(hash(col)) FROM (SELECT transform(*) using 'tr "\t" "_"' AS col
-FROM (SELECT * FROM tstsrcpart WHERE ds='2008-04-08') subq1) subq2;
+FROM (SELECT * FROM ac_test.tstsrcpart WHERE ds='2008-04-08') subq1) subq2;

Modified: hive/trunk/ql/src/test/queries/clientpositive/create_or_replace_view.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/create_or_replace_view.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/create_or_replace_view.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/create_or_replace_view.q Mon Aug 25 21:56:13 2014
@@ -1,32 +1,39 @@
-drop view v;
-create view v as select * from srcpart;
-describe formatted v;
+create database vt;
+
+create view vt.v as select * from srcpart;
+describe formatted vt.v;
 
 -- modifying definition of unpartitioned view
-create or replace view v partitioned on (ds, hr) as select * from srcpart;
-alter view v add partition (ds='2008-04-08',hr='11');
-alter view v add partition (ds='2008-04-08',hr='12');
-select * from v where value='val_409' and ds='2008-04-08' and hr='11';
-describe formatted v;
-show partitions v;
+create or replace view vt.v partitioned on (ds, hr) as select * from srcpart;
+alter view vt.v add partition (ds='2008-04-08',hr='11');
+alter view vt.v add partition (ds='2008-04-08',hr='12');
+select * from vt.v where value='val_409' and ds='2008-04-08' and hr='11';
+describe formatted vt.v;
+show partitions vt.v;
+
+alter view vt.v drop partition (ds='2008-04-08',hr='11');
+alter view vt.v drop partition (ds='2008-04-08',hr='12');
+show partitions vt.v;
 
 -- altering partitioned view 1
-create or replace view v partitioned on (ds, hr) as select value, ds, hr from srcpart;
-select * from v where value='val_409' and ds='2008-04-08' and hr='11';
-describe formatted v;
-show partitions v;
+create or replace view vt.v partitioned on (ds, hr) as select value, ds, hr from srcpart;
+select * from vt.v where value='val_409' and ds='2008-04-08' and hr='11';
+describe formatted vt.v;
+show partitions vt.v;
 
 -- altering partitioned view 2
-create or replace view v partitioned on (ds, hr) as select key, value, ds, hr from srcpart;
-select * from v where value='val_409' and ds='2008-04-08' and hr='11';
-describe formatted v;
-show partitions v;
-drop view v;
+create or replace view vt.v partitioned on (ds, hr) as select key, value, ds, hr from srcpart;
+select * from vt.v where value='val_409' and ds='2008-04-08' and hr='11';
+describe formatted vt.v;
+show partitions vt.v;
+drop view vt.v;
 
 -- updating to fix view with invalid definition
 create table srcpart_temp like srcpart;
-create view v partitioned on (ds, hr) as select * from srcpart_temp;
-drop table srcpart_temp; -- v is now invalid
-create or replace view v partitioned on (ds, hr) as select * from srcpart;
-describe formatted v;
-drop view v;
\ No newline at end of file
+create view vt.v partitioned on (ds, hr) as select * from srcpart_temp;
+drop table srcpart_temp; -- vt.v is now invalid
+create or replace view vt.v partitioned on (ds, hr) as select * from srcpart;
+describe formatted vt.v;
+drop view vt.v;
+
+drop database vt;
\ No newline at end of file

Modified: hive/trunk/ql/src/test/queries/clientpositive/drop_multi_partitions.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/drop_multi_partitions.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/drop_multi_partitions.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/drop_multi_partitions.q Mon Aug 25 21:56:13 2014
@@ -1,17 +1,23 @@
-create table mp (a string) partitioned by (b string, c string);
+create database dmp;
 
-alter table mp add partition (b='1', c='1');
-alter table mp add partition (b='1', c='2');
-alter table mp add partition (b='2', c='2');
+create table dmp.mp (a string) partitioned by (b string, c string);
 
-show partitions mp;
+alter table dmp.mp add partition (b='1', c='1');
+alter table dmp.mp add partition (b='1', c='2');
+alter table dmp.mp add partition (b='2', c='2');
 
-explain extended alter table mp drop partition (b='1');
-alter table mp drop partition (b='1');
+show partitions dmp.mp;
 
-show partitions mp;
+explain extended alter table dmp.mp drop partition (b='1');
+alter table dmp.mp drop partition (b='1');
+
+show partitions dmp.mp;
 
 set hive.exec.drop.ignorenonexistent=false;
-alter table mp drop if exists partition (b='3');
+alter table dmp.mp drop if exists partition (b='3');
+
+show partitions dmp.mp;
+
+drop table dmp.mp;
 
-show partitions mp;
+drop database dmp;

Modified: hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q Mon Aug 25 21:56:13 2014
@@ -1,12 +1,15 @@
-CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING);
-CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING);
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
+create database ex1;
+create database ex2;
 
-ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05');
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
+CREATE TABLE ex1.exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING);
+CREATE TABLE ex2.exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING);
+SHOW PARTITIONS ex1.exchange_part_test1;
+SHOW PARTITIONS ex2.exchange_part_test2;
 
-ALTER TABLE exchange_part_test1 EXCHANGE PARTITION (ds='2013-04-05') WITH TABLE exchange_part_test2;
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
+ALTER TABLE ex2.exchange_part_test2 ADD PARTITION (ds='2013-04-05');
+SHOW PARTITIONS ex1.exchange_part_test1;
+SHOW PARTITIONS ex2.exchange_part_test2;
+
+ALTER TABLE ex1.exchange_part_test1 EXCHANGE PARTITION (ds='2013-04-05') WITH TABLE ex2.exchange_part_test2;
+SHOW PARTITIONS ex1.exchange_part_test1;
+SHOW PARTITIONS ex2.exchange_part_test2;

Modified: hive/trunk/ql/src/test/queries/clientpositive/index_auto_empty.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/index_auto_empty.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/index_auto_empty.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/index_auto_empty.q Mon Aug 25 21:56:13 2014
@@ -1,22 +1,25 @@
 -- Test to ensure that an empty index result is propagated correctly
 
+CREATE DATABASE it;
 -- Create temp, and populate it with some values in src.
-CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE;
+CREATE TABLE it.temp(key STRING, val STRING) STORED AS TEXTFILE;
 
 set hive.stats.dbclass=fs;
--- Build an index on temp.
-CREATE INDEX temp_index ON TABLE temp(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX temp_index ON temp REBUILD;
+-- Build an index on it.temp.
+CREATE INDEX temp_index ON TABLE it.temp(key) as 'COMPACT' WITH DEFERRED REBUILD;
+ALTER INDEX temp_index ON it.temp REBUILD;
 
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.index.filter=true;
 SET hive.optimize.index.filter.compact.minsize=0;
 
 -- query should not return any values
-SELECT * FROM default__temp_temp_index__ WHERE key = 86;
-EXPLAIN SELECT * FROM temp WHERE key  = 86;
-SELECT * FROM temp WHERE key  = 86;
+SELECT * FROM it.it__temp_temp_index__ WHERE key = 86;
+EXPLAIN SELECT * FROM it.temp WHERE key  = 86;
+SELECT * FROM it.temp WHERE key  = 86;
 
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.index.filter=false;
-DROP table temp;
+DROP table it.temp;
+
+DROP DATABASE it;

Modified: hive/trunk/ql/src/test/queries/clientpositive/touch.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/touch.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/touch.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/touch.q Mon Aug 25 21:56:13 2014
@@ -1,17 +1,17 @@
-drop table tstsrc;
-drop table tstsrcpart;
+create database tc;
 
-create table tstsrc like src;
-insert overwrite table tstsrc select key, value from src;
+create table tc.tstsrc like default.src;
+insert overwrite table tc.tstsrc select key, value from default.src;
 
-create table tstsrcpart like srcpart;
-insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='12')
-select key, value from srcpart where ds='2008-04-08' and hr='12';
+create table tc.tstsrcpart like default.srcpart;
+insert overwrite table tc.tstsrcpart partition (ds='2008-04-08', hr='12')
+select key, value from default.srcpart where ds='2008-04-08' and hr='12';
 
+ALTER TABLE tc.tstsrc TOUCH;
+ALTER TABLE tc.tstsrcpart TOUCH;
+ALTER TABLE tc.tstsrcpart TOUCH PARTITION (ds='2008-04-08', hr='12');
 
-ALTER TABLE tstsrc TOUCH;
-ALTER TABLE tstsrcpart TOUCH;
-ALTER TABLE tstsrcpart TOUCH PARTITION (ds='2008-04-08', hr='12');
+drop table tc.tstsrc;
+drop table tc.tstsrcpart;
 
-drop table tstsrc;
-drop table tstsrcpart;
+drop database tc;

Modified: hive/trunk/ql/src/test/queries/clientpositive/unset_table_view_property.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/unset_table_view_property.q?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/unset_table_view_property.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/unset_table_view_property.q Mon Aug 25 21:56:13 2014
@@ -1,64 +1,71 @@
-CREATE TABLE testTable(col1 INT, col2 INT);
-SHOW TBLPROPERTIES testTable;
+CREATE DATABASE vt;
+
+CREATE TABLE vt.testTable(col1 INT, col2 INT);
+SHOW TBLPROPERTIES vt.testTable;
 
 -- UNSET TABLE PROPERTIES
-ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3');
-SHOW TBLPROPERTIES testTable;
+ALTER TABLE vt.testTable SET TBLPROPERTIES ('a'='1', 'c'='3');
+SHOW TBLPROPERTIES vt.testTable;
 
 -- UNSET all the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'c');
-SHOW TBLPROPERTIES testTable;
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES ('a', 'c');
+SHOW TBLPROPERTIES vt.testTable;
 
-ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3', 'd'='4');
-SHOW TBLPROPERTIES testTable;
+ALTER TABLE vt.testTable SET TBLPROPERTIES ('a'='1', 'c'='3', 'd'='4');
+SHOW TBLPROPERTIES vt.testTable;
 
 -- UNSET a subset of the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'd');
-SHOW TBLPROPERTIES testTable;
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES ('a', 'd');
+SHOW TBLPROPERTIES vt.testTable;
 
 -- the same property being UNSET multiple times
-ALTER TABLE testTable UNSET TBLPROPERTIES ('c', 'c', 'c');
-SHOW TBLPROPERTIES testTable;
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES ('c', 'c', 'c');
+SHOW TBLPROPERTIES vt.testTable;
 
-ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'b' = '2', 'c'='3', 'd'='4');
-SHOW TBLPROPERTIES testTable;
+ALTER TABLE vt.testTable SET TBLPROPERTIES ('a'='1', 'b' = '2', 'c'='3', 'd'='4');
+SHOW TBLPROPERTIES vt.testTable;
 
 -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f');
-SHOW TBLPROPERTIES testTable;
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f');
+SHOW TBLPROPERTIES vt.testTable;
 
 -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z');
-SHOW TBLPROPERTIES testTable;
+ALTER TABLE vt.testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z');
+SHOW TBLPROPERTIES vt.testTable;
+
+DROP TABLE vt.testTable;
 
 -- UNSET VIEW PROPERTIES
-CREATE VIEW testView AS SELECT value FROM src WHERE key=86;
-ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB'='200');
-SHOW TBLPROPERTIES testView;
+CREATE VIEW vt.testView AS SELECT value FROM src WHERE key=86;
+ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propB'='200');
+SHOW TBLPROPERTIES vt.testView;
 
 -- UNSET all the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propB');
-SHOW TBLPROPERTIES testView;
+ALTER VIEW vt.testView UNSET TBLPROPERTIES ('propA', 'propB');
+SHOW TBLPROPERTIES vt.testView;
 
-ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propC'='300', 'propD'='400');
-SHOW TBLPROPERTIES testView;
+ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propC'='300', 'propD'='400');
+SHOW TBLPROPERTIES vt.testView;
 
 -- UNSET a subset of the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propC');
-SHOW TBLPROPERTIES testView;
+ALTER VIEW vt.testView UNSET TBLPROPERTIES ('propA', 'propC');
+SHOW TBLPROPERTIES vt.testView;
 
 -- the same property being UNSET multiple times
-ALTER VIEW testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD');
-SHOW TBLPROPERTIES testView;
+ALTER VIEW vt.testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD');
+SHOW TBLPROPERTIES vt.testView;
 
-ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB' = '200', 'propC'='300', 'propD'='400');
-SHOW TBLPROPERTIES testView;
+ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propB' = '200', 'propC'='300', 'propD'='400');
+SHOW TBLPROPERTIES vt.testView;
 
 -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ');
-SHOW TBLPROPERTIES testView;
+ALTER VIEW vt.testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ');
+SHOW TBLPROPERTIES vt.testView;
 
 -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF');
-SHOW TBLPROPERTIES testView;
+ALTER VIEW vt.testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF');
+SHOW TBLPROPERTIES vt.testView;
+
+DROP VIEW vt.testView;
 
+DROP DATABASE vt;
\ No newline at end of file

Modified: hive/trunk/ql/src/test/results/clientpositive/add_part_exist.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/add_part_exist.q.out?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/add_part_exist.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/add_part_exist.q.out Mon Aug 25 21:56:13 2014
@@ -99,85 +99,92 @@ POSTHOOK: query: -- Test ALTER TABLE ADD
 CREATE DATABASE add_part_test_db
 POSTHOOK: type: CREATEDATABASE
 POSTHOOK: Output: database:add_part_test_db
-PREHOOK: query: USE add_part_test_db
-PREHOOK: type: SWITCHDATABASE
-PREHOOK: Input: database:add_part_test_db
-POSTHOOK: query: USE add_part_test_db
-POSTHOOK: type: SWITCHDATABASE
-POSTHOOK: Input: database:add_part_test_db
-PREHOOK: query: SHOW TABLES
-PREHOOK: type: SHOWTABLES
-POSTHOOK: query: SHOW TABLES
-POSTHOOK: type: SHOWTABLES
-PREHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
+PREHOOK: query: CREATE TABLE add_part_test_db.add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
 PREHOOK: type: CREATETABLE
-PREHOOK: Output: add_part_test_db@add_part_test
+PREHOOK: Output: add_part_test_db@add_part_test_db.add_part_test
 PREHOOK: Output: database:add_part_test_db
-POSTHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
+POSTHOOK: query: CREATE TABLE add_part_test_db.add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: add_part_test_db@add_part_test
+POSTHOOK: Output: add_part_test_db@add_part_test_db.add_part_test
 POSTHOOK: Output: database:add_part_test_db
-PREHOOK: query: SHOW PARTITIONS add_part_test
+PREHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: add_part_test_db@add_part_test
-POSTHOOK: query: SHOW PARTITIONS add_part_test
+POSTHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 POSTHOOK: type: SHOWPARTITIONS
 POSTHOOK: Input: add_part_test_db@add_part_test
-PREHOOK: query: ALTER TABLE add_part_test ADD PARTITION (ds='2010-01-01')
+PREHOOK: query: ALTER TABLE add_part_test_db.add_part_test ADD PARTITION (ds='2010-01-01')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Output: add_part_test_db@add_part_test
-POSTHOOK: query: ALTER TABLE add_part_test ADD PARTITION (ds='2010-01-01')
+POSTHOOK: query: ALTER TABLE add_part_test_db.add_part_test ADD PARTITION (ds='2010-01-01')
 POSTHOOK: type: ALTERTABLE_ADDPARTS
 POSTHOOK: Output: add_part_test_db@add_part_test
 POSTHOOK: Output: add_part_test_db@add_part_test@ds=2010-01-01
-PREHOOK: query: SHOW PARTITIONS add_part_test
+PREHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: add_part_test_db@add_part_test
-POSTHOOK: query: SHOW PARTITIONS add_part_test
+POSTHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 POSTHOOK: type: SHOWPARTITIONS
 POSTHOOK: Input: add_part_test_db@add_part_test
 ds=2010-01-01
-PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01')
+PREHOOK: query: ALTER TABLE add_part_test_db.add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Output: add_part_test_db@add_part_test
-POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01')
+POSTHOOK: query: ALTER TABLE add_part_test_db.add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01')
 POSTHOOK: type: ALTERTABLE_ADDPARTS
 POSTHOOK: Output: add_part_test_db@add_part_test
-PREHOOK: query: SHOW PARTITIONS add_part_test
+PREHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: add_part_test_db@add_part_test
-POSTHOOK: query: SHOW PARTITIONS add_part_test
+POSTHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 POSTHOOK: type: SHOWPARTITIONS
 POSTHOOK: Input: add_part_test_db@add_part_test
 ds=2010-01-01
-PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02')
+PREHOOK: query: ALTER TABLE add_part_test_db.add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Output: add_part_test_db@add_part_test
-POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02')
+POSTHOOK: query: ALTER TABLE add_part_test_db.add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02')
 POSTHOOK: type: ALTERTABLE_ADDPARTS
 POSTHOOK: Output: add_part_test_db@add_part_test
 POSTHOOK: Output: add_part_test_db@add_part_test@ds=2010-01-02
-PREHOOK: query: SHOW PARTITIONS add_part_test
+PREHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: add_part_test_db@add_part_test
-POSTHOOK: query: SHOW PARTITIONS add_part_test
+POSTHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 POSTHOOK: type: SHOWPARTITIONS
 POSTHOOK: Input: add_part_test_db@add_part_test
 ds=2010-01-01
 ds=2010-01-02
-PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITION (ds='2010-01-02') PARTITION (ds='2010-01-03')
+PREHOOK: query: ALTER TABLE add_part_test_db.add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITION (ds='2010-01-02') PARTITION (ds='2010-01-03')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Output: add_part_test_db@add_part_test
-POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITION (ds='2010-01-02') PARTITION (ds='2010-01-03')
+POSTHOOK: query: ALTER TABLE add_part_test_db.add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITION (ds='2010-01-02') PARTITION (ds='2010-01-03')
 POSTHOOK: type: ALTERTABLE_ADDPARTS
 POSTHOOK: Output: add_part_test_db@add_part_test
 POSTHOOK: Output: add_part_test_db@add_part_test@ds=2010-01-03
-PREHOOK: query: SHOW PARTITIONS add_part_test
+PREHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: add_part_test_db@add_part_test
-POSTHOOK: query: SHOW PARTITIONS add_part_test
+POSTHOOK: query: SHOW PARTITIONS add_part_test_db.add_part_test
 POSTHOOK: type: SHOWPARTITIONS
 POSTHOOK: Input: add_part_test_db@add_part_test
 ds=2010-01-01
 ds=2010-01-02
 ds=2010-01-03
+PREHOOK: query: DROP TABLE add_part_test_db.add_part_test
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: add_part_test_db@add_part_test
+PREHOOK: Output: add_part_test_db@add_part_test
+POSTHOOK: query: DROP TABLE add_part_test_db.add_part_test
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: add_part_test_db@add_part_test
+POSTHOOK: Output: add_part_test_db@add_part_test
+PREHOOK: query: DROP DATABASE add_part_test_db
+PREHOOK: type: DROPDATABASE
+PREHOOK: Input: database:add_part_test_db
+PREHOOK: Output: database:add_part_test_db
+POSTHOOK: query: DROP DATABASE add_part_test_db
+POSTHOOK: type: DROPDATABASE
+POSTHOOK: Input: database:add_part_test_db
+POSTHOOK: Output: database:add_part_test_db

Modified: hive/trunk/ql/src/test/results/clientpositive/alter1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter1.q.out?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter1.q.out Mon Aug 25 21:56:13 2014
@@ -210,209 +210,198 @@ POSTHOOK: query: -- With non-default Dat
 CREATE DATABASE alter1_db
 POSTHOOK: type: CREATEDATABASE
 POSTHOOK: Output: database:alter1_db
-PREHOOK: query: USE alter1_db
-PREHOOK: type: SWITCHDATABASE
-PREHOOK: Input: database:alter1_db
-POSTHOOK: query: USE alter1_db
-POSTHOOK: type: SWITCHDATABASE
-POSTHOOK: Input: database:alter1_db
-PREHOOK: query: SHOW TABLES
+PREHOOK: query: SHOW TABLES alter1_db
 PREHOOK: type: SHOWTABLES
-POSTHOOK: query: SHOW TABLES
+POSTHOOK: query: SHOW TABLES alter1_db
 POSTHOOK: type: SHOWTABLES
-PREHOOK: query: CREATE TABLE alter1(a INT, b INT)
+PREHOOK: query: CREATE TABLE alter1_db.alter1(a INT, b INT)
 PREHOOK: type: CREATETABLE
-PREHOOK: Output: alter1_db@alter1
+PREHOOK: Output: alter1_db@alter1_db.alter1
 PREHOOK: Output: database:alter1_db
-POSTHOOK: query: CREATE TABLE alter1(a INT, b INT)
+POSTHOOK: query: CREATE TABLE alter1_db.alter1(a INT, b INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: alter1_db@alter1
+POSTHOOK: Output: alter1_db@alter1_db.alter1
 POSTHOOK: Output: database:alter1_db
-PREHOOK: query: DESCRIBE EXTENDED alter1
+PREHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE EXTENDED alter1
+POSTHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	int                 	                    
 b                   	int                 	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='3')
+PREHOOK: query: ALTER TABLE alter1_db.alter1 SET TBLPROPERTIES ('a'='1', 'c'='3')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='3')
+POSTHOOK: query: ALTER TABLE alter1_db.alter1 SET TBLPROPERTIES ('a'='1', 'c'='3')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: DESCRIBE EXTENDED alter1
+PREHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE EXTENDED alter1
+POSTHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	int                 	                    
 b                   	int                 	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='4', 'd'='3')
+PREHOOK: query: ALTER TABLE alter1_db.alter1 SET TBLPROPERTIES ('a'='1', 'c'='4', 'd'='3')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='4', 'd'='3')
+POSTHOOK: query: ALTER TABLE alter1_db.alter1 SET TBLPROPERTIES ('a'='1', 'c'='4', 'd'='3')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: DESCRIBE EXTENDED alter1
+PREHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE EXTENDED alter1
+POSTHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	int                 	                    
 b                   	int                 	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='TRUE')
+PREHOOK: query: ALTER TABLE alter1_db.alter1 SET TBLPROPERTIES ('EXTERNAL'='TRUE')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='TRUE')
+POSTHOOK: query: ALTER TABLE alter1_db.alter1 SET TBLPROPERTIES ('EXTERNAL'='TRUE')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: DESCRIBE EXTENDED alter1
+PREHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE EXTENDED alter1
+POSTHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	int                 	                    
 b                   	int                 	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='FALSE')
+PREHOOK: query: ALTER TABLE alter1_db.alter1 SET TBLPROPERTIES ('EXTERNAL'='FALSE')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='FALSE')
+POSTHOOK: query: ALTER TABLE alter1_db.alter1 SET TBLPROPERTIES ('EXTERNAL'='FALSE')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: DESCRIBE EXTENDED alter1
+PREHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE EXTENDED alter1
+POSTHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	int                 	                    
 b                   	int                 	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='9')
+PREHOOK: query: ALTER TABLE alter1_db.alter1 SET SERDEPROPERTIES('s1'='9')
 PREHOOK: type: ALTERTABLE_SERDEPROPERTIES
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='9')
+POSTHOOK: query: ALTER TABLE alter1_db.alter1 SET SERDEPROPERTIES('s1'='9')
 POSTHOOK: type: ALTERTABLE_SERDEPROPERTIES
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: DESCRIBE EXTENDED alter1
+PREHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE EXTENDED alter1
+POSTHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	int                 	                    
 b                   	int                 	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20')
+PREHOOK: query: ALTER TABLE alter1_db.alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20')
 PREHOOK: type: ALTERTABLE_SERDEPROPERTIES
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20')
+POSTHOOK: query: ALTER TABLE alter1_db.alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20')
 POSTHOOK: type: ALTERTABLE_SERDEPROPERTIES
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: DESCRIBE EXTENDED alter1
+PREHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE EXTENDED alter1
+POSTHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	int                 	                    
 b                   	int                 	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9')
+PREHOOK: query: ALTER TABLE alter1_db.alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9')
 PREHOOK: type: ALTERTABLE_SERIALIZER
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9')
+POSTHOOK: query: ALTER TABLE alter1_db.alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9')
 POSTHOOK: type: ALTERTABLE_SERIALIZER
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: DESCRIBE EXTENDED alter1
+PREHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE EXTENDED alter1
+POSTHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	string              	                    
 b                   	string              	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe'
+PREHOOK: query: ALTER TABLE alter1_db.alter1 SET SERDE 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe'
 PREHOOK: type: ALTERTABLE_SERIALIZER
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe'
+POSTHOOK: query: ALTER TABLE alter1_db.alter1 SET SERDE 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe'
 POSTHOOK: type: ALTERTABLE_SERIALIZER
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: DESCRIBE EXTENDED alter1
+PREHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE EXTENDED alter1
+POSTHOOK: query: DESCRIBE EXTENDED alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	string              	                    
 b                   	string              	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE alter1 REPLACE COLUMNS (a int, b int, c string)
+PREHOOK: query: ALTER TABLE alter1_db.alter1 REPLACE COLUMNS (a int, b int, c string)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: ALTER TABLE alter1 REPLACE COLUMNS (a int, b int, c string)
+POSTHOOK: query: ALTER TABLE alter1_db.alter1 REPLACE COLUMNS (a int, b int, c string)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: DESCRIBE alter1
+PREHOOK: query: DESCRIBE alter1_db.alter1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: alter1_db@alter1
-POSTHOOK: query: DESCRIBE alter1
+POSTHOOK: query: DESCRIBE alter1_db.alter1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: alter1_db@alter1
 a                   	int                 	                    
 b                   	int                 	                    
 c                   	string              	                    
-PREHOOK: query: DROP TABLE alter1
+PREHOOK: query: DROP TABLE alter1_db.alter1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: alter1_db@alter1
 PREHOOK: Output: alter1_db@alter1
-POSTHOOK: query: DROP TABLE alter1
+POSTHOOK: query: DROP TABLE alter1_db.alter1
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: alter1_db@alter1
 POSTHOOK: Output: alter1_db@alter1
-PREHOOK: query: USE default
-PREHOOK: type: SWITCHDATABASE
-PREHOOK: Input: database:default
-POSTHOOK: query: USE default
-POSTHOOK: type: SWITCHDATABASE
-POSTHOOK: Input: database:default
 PREHOOK: query: DROP DATABASE alter1_db
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:alter1_db

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_char1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_char1.q.out?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_char1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_char1.q.out Mon Aug 25 21:56:13 2014
@@ -1,38 +1,41 @@
 PREHOOK: query: -- SORT_QUERY_RESULTS
 
-drop table alter_char_1
-PREHOOK: type: DROPTABLE
+create database ac
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:ac
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
-drop table alter_char_1
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table alter_char_1 (key string, value string)
+create database ac
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:ac
+PREHOOK: query: create table ac.alter_char_1 (key string, value string)
 PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@alter_char_1
-POSTHOOK: query: create table alter_char_1 (key string, value string)
+PREHOOK: Output: ac@ac.alter_char_1
+PREHOOK: Output: database:ac
+POSTHOOK: query: create table ac.alter_char_1 (key string, value string)
 POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@alter_char_1
-PREHOOK: query: insert overwrite table alter_char_1
+POSTHOOK: Output: ac@ac.alter_char_1
+POSTHOOK: Output: ac@alter_char_1
+POSTHOOK: Output: database:ac
+PREHOOK: query: insert overwrite table ac.alter_char_1
   select key, value from src order by key limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: default@alter_char_1
-POSTHOOK: query: insert overwrite table alter_char_1
+PREHOOK: Output: ac@alter_char_1
+POSTHOOK: query: insert overwrite table ac.alter_char_1
   select key, value from src order by key limit 5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@alter_char_1
+POSTHOOK: Output: ac@alter_char_1
 POSTHOOK: Lineage: alter_char_1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_char_1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select * from alter_char_1
+PREHOOK: query: select * from ac.alter_char_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from alter_char_1
+POSTHOOK: query: select * from ac.alter_char_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
 0	val_0
 0	val_0
@@ -40,24 +43,24 @@ POSTHOOK: Input: default@alter_char_1
 10	val_10
 100	val_100
 PREHOOK: query: -- change column to char
-alter table alter_char_1 change column value value char(20)
+alter table ac.alter_char_1 change column value value char(20)
 PREHOOK: type: ALTERTABLE_RENAMECOL
-PREHOOK: Input: default@alter_char_1
-PREHOOK: Output: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
+PREHOOK: Output: ac@alter_char_1
 POSTHOOK: query: -- change column to char
-alter table alter_char_1 change column value value char(20)
+alter table ac.alter_char_1 change column value value char(20)
 POSTHOOK: type: ALTERTABLE_RENAMECOL
-POSTHOOK: Input: default@alter_char_1
-POSTHOOK: Output: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
+POSTHOOK: Output: ac@alter_char_1
 PREHOOK: query: -- contents should still look the same
-select * from alter_char_1
+select * from ac.alter_char_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
 POSTHOOK: query: -- contents should still look the same
-select * from alter_char_1
+select * from ac.alter_char_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
 0	val_0               
 0	val_0               
@@ -65,24 +68,24 @@ POSTHOOK: Input: default@alter_char_1
 10	val_10              
 100	val_100             
 PREHOOK: query: -- change column to smaller char
-alter table alter_char_1 change column value value char(3)
+alter table ac.alter_char_1 change column value value char(3)
 PREHOOK: type: ALTERTABLE_RENAMECOL
-PREHOOK: Input: default@alter_char_1
-PREHOOK: Output: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
+PREHOOK: Output: ac@alter_char_1
 POSTHOOK: query: -- change column to smaller char
-alter table alter_char_1 change column value value char(3)
+alter table ac.alter_char_1 change column value value char(3)
 POSTHOOK: type: ALTERTABLE_RENAMECOL
-POSTHOOK: Input: default@alter_char_1
-POSTHOOK: Output: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
+POSTHOOK: Output: ac@alter_char_1
 PREHOOK: query: -- value column should be truncated now
-select * from alter_char_1
+select * from ac.alter_char_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
 POSTHOOK: query: -- value column should be truncated now
-select * from alter_char_1
+select * from ac.alter_char_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
 0	val
 0	val
@@ -90,24 +93,24 @@ POSTHOOK: Input: default@alter_char_1
 10	val
 100	val
 PREHOOK: query: -- change back to bigger char
-alter table alter_char_1 change column value value char(20)
+alter table ac.alter_char_1 change column value value char(20)
 PREHOOK: type: ALTERTABLE_RENAMECOL
-PREHOOK: Input: default@alter_char_1
-PREHOOK: Output: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
+PREHOOK: Output: ac@alter_char_1
 POSTHOOK: query: -- change back to bigger char
-alter table alter_char_1 change column value value char(20)
+alter table ac.alter_char_1 change column value value char(20)
 POSTHOOK: type: ALTERTABLE_RENAMECOL
-POSTHOOK: Input: default@alter_char_1
-POSTHOOK: Output: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
+POSTHOOK: Output: ac@alter_char_1
 PREHOOK: query: -- column values should be full size again
-select * from alter_char_1
+select * from ac.alter_char_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
 POSTHOOK: query: -- column values should be full size again
-select * from alter_char_1
+select * from ac.alter_char_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
 0	val_0               
 0	val_0               
@@ -115,60 +118,68 @@ POSTHOOK: Input: default@alter_char_1
 10	val_10              
 100	val_100             
 PREHOOK: query: -- add char column
-alter table alter_char_1 add columns (key2 int, value2 char(10))
+alter table ac.alter_char_1 add columns (key2 int, value2 char(10))
 PREHOOK: type: ALTERTABLE_ADDCOLS
-PREHOOK: Input: default@alter_char_1
-PREHOOK: Output: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
+PREHOOK: Output: ac@alter_char_1
 POSTHOOK: query: -- add char column
-alter table alter_char_1 add columns (key2 int, value2 char(10))
+alter table ac.alter_char_1 add columns (key2 int, value2 char(10))
 POSTHOOK: type: ALTERTABLE_ADDCOLS
-POSTHOOK: Input: default@alter_char_1
-POSTHOOK: Output: default@alter_char_1
-PREHOOK: query: select * from alter_char_1
+POSTHOOK: Input: ac@alter_char_1
+POSTHOOK: Output: ac@alter_char_1
+PREHOOK: query: select * from ac.alter_char_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from alter_char_1
+POSTHOOK: query: select * from ac.alter_char_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
 0	val_0               	NULL	NULL
 0	val_0               	NULL	NULL
 0	val_0               	NULL	NULL
 10	val_10              	NULL	NULL
 100	val_100             	NULL	NULL
-PREHOOK: query: insert overwrite table alter_char_1
+PREHOOK: query: insert overwrite table ac.alter_char_1
   select key, value, key, value from src order by key limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: default@alter_char_1
-POSTHOOK: query: insert overwrite table alter_char_1
+PREHOOK: Output: ac@alter_char_1
+POSTHOOK: query: insert overwrite table ac.alter_char_1
   select key, value, key, value from src order by key limit 5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@alter_char_1
+POSTHOOK: Output: ac@alter_char_1
 POSTHOOK: Lineage: alter_char_1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_char_1.key2 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_char_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_char_1.value2 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select * from alter_char_1
+PREHOOK: query: select * from ac.alter_char_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_char_1
+PREHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from alter_char_1
+POSTHOOK: query: select * from ac.alter_char_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
 #### A masked pattern was here ####
 0	val_0               	0	val_0     
 0	val_0               	0	val_0     
 0	val_0               	0	val_0     
 10	val_10              	10	val_10    
 100	val_100             	100	val_100   
-PREHOOK: query: drop table alter_char_1
+PREHOOK: query: drop table ac.alter_char_1
 PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@alter_char_1
-PREHOOK: Output: default@alter_char_1
-POSTHOOK: query: drop table alter_char_1
+PREHOOK: Input: ac@alter_char_1
+PREHOOK: Output: ac@alter_char_1
+POSTHOOK: query: drop table ac.alter_char_1
 POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@alter_char_1
-POSTHOOK: Output: default@alter_char_1
+POSTHOOK: Input: ac@alter_char_1
+POSTHOOK: Output: ac@alter_char_1
+PREHOOK: query: drop database ac
+PREHOOK: type: DROPDATABASE
+PREHOOK: Input: database:ac
+PREHOOK: Output: database:ac
+POSTHOOK: query: drop database ac
+POSTHOOK: type: DROPDATABASE
+POSTHOOK: Input: database:ac
+POSTHOOK: Output: database:ac

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_index.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_index.q.out?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_index.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_index.q.out Mon Aug 25 21:56:13 2014
@@ -4,10 +4,10 @@ PREHOOK: Input: default@src
 POSTHOOK: query: drop index src_index_8 on src
 POSTHOOK: type: DROPINDEX
 POSTHOOK: Input: default@src
-PREHOOK: query: create index src_index_8 on table src(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2")
+PREHOOK: query: create index src_index_8 on table default.src(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2")
 PREHOOK: type: CREATEINDEX
 PREHOOK: Input: default@src
-POSTHOOK: query: create index src_index_8 on table src(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2")
+POSTHOOK: query: create index src_index_8 on table default.src(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2")
 POSTHOOK: type: CREATEINDEX
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@default__src_src_index_8__
@@ -22,9 +22,9 @@ _bucketname         	string             
 _offsets            	array<bigint>       	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: alter index src_index_8 on src set IDXPROPERTIES ("prop1"="val1_new", "prop3"="val3")
+PREHOOK: query: alter index src_index_8 on default.src set IDXPROPERTIES ("prop1"="val1_new", "prop3"="val3")
 PREHOOK: type: ALTERINDEX_PROPS
-POSTHOOK: query: alter index src_index_8 on src set IDXPROPERTIES ("prop1"="val1_new", "prop3"="val3")
+POSTHOOK: query: alter index src_index_8 on default.src set IDXPROPERTIES ("prop1"="val1_new", "prop3"="val3")
 POSTHOOK: type: ALTERINDEX_PROPS
 PREHOOK: query: desc extended default__src_src_index_8__
 PREHOOK: type: DESCTABLE
@@ -37,10 +37,10 @@ _bucketname         	string             
 _offsets            	array<bigint>       	                    
 	 	 
 #### A masked pattern was here ####
-PREHOOK: query: drop index src_index_8 on src
+PREHOOK: query: drop index src_index_8 on default.src
 PREHOOK: type: DROPINDEX
 PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_8 on src
+POSTHOOK: query: drop index src_index_8 on default.src
 POSTHOOK: type: DROPINDEX
 POSTHOOK: Input: default@src
 PREHOOK: query: show tables

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out Mon Aug 25 21:56:13 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_skewed_table.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_skewed_table.q.out?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_skewed_table.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_skewed_table.q.out Mon Aug 25 21:56:13 2014
@@ -92,27 +92,34 @@ POSTHOOK: query: drop table original
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@original
 POSTHOOK: Output: default@original
-PREHOOK: query: create table original2 (key STRING, value STRING)
+PREHOOK: query: create database skew_test
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:skew_test
+POSTHOOK: query: create database skew_test
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:skew_test
+PREHOOK: query: create table skew_test.original2 (key STRING, value STRING)
 PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@original2
-POSTHOOK: query: create table original2 (key STRING, value STRING)
+PREHOOK: Output: database:skew_test
+PREHOOK: Output: skew_test@skew_test.original2
+POSTHOOK: query: create table skew_test.original2 (key STRING, value STRING)
 POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@original2
-PREHOOK: query: describe formatted original2
+POSTHOOK: Output: database:skew_test
+POSTHOOK: Output: skew_test@original2
+POSTHOOK: Output: skew_test@skew_test.original2
+PREHOOK: query: describe formatted skew_test.original2
 PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@original2
-POSTHOOK: query: describe formatted original2
+PREHOOK: Input: skew_test@original2
+POSTHOOK: query: describe formatted skew_test.original2
 POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@original2
+POSTHOOK: Input: skew_test@original2
 # col_name            	data_type           	comment             
 	 	 
 key                 	string              	                    
 value               	string              	                    
 	 	 
 # Detailed Table Information	 	 
-Database:           	default             	 
+Database:           	skew_test           	 
 #### A masked pattern was here ####
 Protect Mode:       	None                	 
 Retention:          	0                   	 
@@ -131,27 +138,27 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: alter table original2 SKEWED BY (key, value) ON ((1,1),(5,6))
+PREHOOK: query: alter table skew_test.original2 SKEWED BY (key, value) ON ((1,1),(5,6))
 PREHOOK: type: ALTERTABLE_SKEWED
-PREHOOK: Input: default@original2
-PREHOOK: Output: default@original2
-POSTHOOK: query: alter table original2 SKEWED BY (key, value) ON ((1,1),(5,6))
+PREHOOK: Input: skew_test@original2
+PREHOOK: Output: skew_test@original2
+POSTHOOK: query: alter table skew_test.original2 SKEWED BY (key, value) ON ((1,1),(5,6))
 POSTHOOK: type: ALTERTABLE_SKEWED
-POSTHOOK: Input: default@original2
-POSTHOOK: Output: default@original2
-PREHOOK: query: describe formatted original2
+POSTHOOK: Input: skew_test@original2
+POSTHOOK: Output: skew_test@original2
+PREHOOK: query: describe formatted skew_test.original2
 PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@original2
-POSTHOOK: query: describe formatted original2
+PREHOOK: Input: skew_test@original2
+POSTHOOK: query: describe formatted skew_test.original2
 POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@original2
+POSTHOOK: Input: skew_test@original2
 # col_name            	data_type           	comment             
 	 	 
 key                 	string              	                    
 value               	string              	                    
 	 	 
 # Detailed Table Information	 	 
-Database:           	default             	 
+Database:           	skew_test           	 
 #### A masked pattern was here ####
 Protect Mode:       	None                	 
 Retention:          	0                   	 
@@ -178,35 +185,36 @@ Skewed Columns:     	[key, value]       
 Skewed Values:      	[[1, 1], [5, 6]]    	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: drop table original2
+PREHOOK: query: drop table skew_test.original2
 PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@original2
-PREHOOK: Output: default@original2
-POSTHOOK: query: drop table original2
+PREHOOK: Input: skew_test@original2
+PREHOOK: Output: skew_test@original2
+POSTHOOK: query: drop table skew_test.original2
 POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@original2
-POSTHOOK: Output: default@original2
-PREHOOK: query: create table original3 (key STRING, value STRING) SKEWED BY (key, value) ON ((1,1),(5,6))
+POSTHOOK: Input: skew_test@original2
+POSTHOOK: Output: skew_test@original2
+PREHOOK: query: create table skew_test.original3 (key STRING, value STRING) SKEWED BY (key, value) ON ((1,1),(5,6))
 PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@original3
-POSTHOOK: query: create table original3 (key STRING, value STRING) SKEWED BY (key, value) ON ((1,1),(5,6))
+PREHOOK: Output: database:skew_test
+PREHOOK: Output: skew_test@skew_test.original3
+POSTHOOK: query: create table skew_test.original3 (key STRING, value STRING) SKEWED BY (key, value) ON ((1,1),(5,6))
 POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@original3
-PREHOOK: query: describe formatted original3
+POSTHOOK: Output: database:skew_test
+POSTHOOK: Output: skew_test@original3
+POSTHOOK: Output: skew_test@skew_test.original3
+PREHOOK: query: describe formatted skew_test.original3
 PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@original3
-POSTHOOK: query: describe formatted original3
+PREHOOK: Input: skew_test@original3
+POSTHOOK: query: describe formatted skew_test.original3
 POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@original3
+POSTHOOK: Input: skew_test@original3
 # col_name            	data_type           	comment             
 	 	 
 key                 	string              	                    
 value               	string              	                    
 	 	 
 # Detailed Table Information	 	 
-Database:           	default             	 
+Database:           	skew_test           	 
 #### A masked pattern was here ####
 Protect Mode:       	None                	 
 Retention:          	0                   	 
@@ -227,27 +235,27 @@ Skewed Columns:     	[key, value]       
 Skewed Values:      	[[1, 1], [5, 6]]    	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: alter table original3 not skewed
+PREHOOK: query: alter table skew_test.original3 not skewed
 PREHOOK: type: ALTERTABLE_SKEWED
-PREHOOK: Input: default@original3
-PREHOOK: Output: default@original3
-POSTHOOK: query: alter table original3 not skewed
+PREHOOK: Input: skew_test@original3
+PREHOOK: Output: skew_test@original3
+POSTHOOK: query: alter table skew_test.original3 not skewed
 POSTHOOK: type: ALTERTABLE_SKEWED
-POSTHOOK: Input: default@original3
-POSTHOOK: Output: default@original3
-PREHOOK: query: describe formatted original3
+POSTHOOK: Input: skew_test@original3
+POSTHOOK: Output: skew_test@original3
+PREHOOK: query: describe formatted skew_test.original3
 PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@original3
-POSTHOOK: query: describe formatted original3
+PREHOOK: Input: skew_test@original3
+POSTHOOK: query: describe formatted skew_test.original3
 POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@original3
+POSTHOOK: Input: skew_test@original3
 # col_name            	data_type           	comment             
 	 	 
 key                 	string              	                    
 value               	string              	                    
 	 	 
 # Detailed Table Information	 	 
-Database:           	default             	 
+Database:           	skew_test           	 
 #### A masked pattern was here ####
 Protect Mode:       	None                	 
 Retention:          	0                   	 
@@ -272,11 +280,19 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: drop table original3
+PREHOOK: query: drop table skew_test.original3
 PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@original3
-PREHOOK: Output: default@original3
-POSTHOOK: query: drop table original3
+PREHOOK: Input: skew_test@original3
+PREHOOK: Output: skew_test@original3
+POSTHOOK: query: drop table skew_test.original3
 POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@original3
-POSTHOOK: Output: default@original3
+POSTHOOK: Input: skew_test@original3
+POSTHOOK: Output: skew_test@original3
+PREHOOK: query: drop database skew_test
+PREHOOK: type: DROPDATABASE
+PREHOOK: Input: database:skew_test
+PREHOOK: Output: database:skew_test
+POSTHOOK: query: drop database skew_test
+POSTHOOK: type: DROPDATABASE
+POSTHOOK: Input: database:skew_test
+POSTHOOK: Output: database:skew_test

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_varchar1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_varchar1.q.out?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_varchar1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_varchar1.q.out Mon Aug 25 21:56:13 2014
@@ -1,38 +1,41 @@
 PREHOOK: query: -- SORT_QUERY_RESULTS
 
-drop table alter_varchar_1
-PREHOOK: type: DROPTABLE
+create database avc
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:avc
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
-drop table alter_varchar_1
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table alter_varchar_1 (key string, value string)
+create database avc
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:avc
+PREHOOK: query: create table avc.alter_varchar_1 (key string, value string)
 PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@alter_varchar_1
-POSTHOOK: query: create table alter_varchar_1 (key string, value string)
+PREHOOK: Output: avc@avc.alter_varchar_1
+PREHOOK: Output: database:avc
+POSTHOOK: query: create table avc.alter_varchar_1 (key string, value string)
 POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@alter_varchar_1
-PREHOOK: query: insert overwrite table alter_varchar_1
+POSTHOOK: Output: avc@alter_varchar_1
+POSTHOOK: Output: avc@avc.alter_varchar_1
+POSTHOOK: Output: database:avc
+PREHOOK: query: insert overwrite table avc.alter_varchar_1
   select key, value from src order by key limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: default@alter_varchar_1
-POSTHOOK: query: insert overwrite table alter_varchar_1
+PREHOOK: Output: avc@alter_varchar_1
+POSTHOOK: query: insert overwrite table avc.alter_varchar_1
   select key, value from src order by key limit 5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@alter_varchar_1
+POSTHOOK: Output: avc@alter_varchar_1
 POSTHOOK: Lineage: alter_varchar_1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_varchar_1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select * from alter_varchar_1
+PREHOOK: query: select * from avc.alter_varchar_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from alter_varchar_1
+POSTHOOK: query: select * from avc.alter_varchar_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
 0	val_0
 0	val_0
@@ -40,24 +43,24 @@ POSTHOOK: Input: default@alter_varchar_1
 10	val_10
 100	val_100
 PREHOOK: query: -- change column to varchar
-alter table alter_varchar_1 change column value value varchar(20)
+alter table avc.alter_varchar_1 change column value value varchar(20)
 PREHOOK: type: ALTERTABLE_RENAMECOL
-PREHOOK: Input: default@alter_varchar_1
-PREHOOK: Output: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
+PREHOOK: Output: avc@alter_varchar_1
 POSTHOOK: query: -- change column to varchar
-alter table alter_varchar_1 change column value value varchar(20)
+alter table avc.alter_varchar_1 change column value value varchar(20)
 POSTHOOK: type: ALTERTABLE_RENAMECOL
-POSTHOOK: Input: default@alter_varchar_1
-POSTHOOK: Output: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
+POSTHOOK: Output: avc@alter_varchar_1
 PREHOOK: query: -- contents should still look the same
-select * from alter_varchar_1
+select * from avc.alter_varchar_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
 POSTHOOK: query: -- contents should still look the same
-select * from alter_varchar_1
+select * from avc.alter_varchar_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
 0	val_0
 0	val_0
@@ -65,24 +68,24 @@ POSTHOOK: Input: default@alter_varchar_1
 10	val_10
 100	val_100
 PREHOOK: query: -- change column to smaller varchar
-alter table alter_varchar_1 change column value value varchar(3)
+alter table avc.alter_varchar_1 change column value value varchar(3)
 PREHOOK: type: ALTERTABLE_RENAMECOL
-PREHOOK: Input: default@alter_varchar_1
-PREHOOK: Output: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
+PREHOOK: Output: avc@alter_varchar_1
 POSTHOOK: query: -- change column to smaller varchar
-alter table alter_varchar_1 change column value value varchar(3)
+alter table avc.alter_varchar_1 change column value value varchar(3)
 POSTHOOK: type: ALTERTABLE_RENAMECOL
-POSTHOOK: Input: default@alter_varchar_1
-POSTHOOK: Output: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
+POSTHOOK: Output: avc@alter_varchar_1
 PREHOOK: query: -- value column should be truncated now
-select * from alter_varchar_1
+select * from avc.alter_varchar_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
 POSTHOOK: query: -- value column should be truncated now
-select * from alter_varchar_1
+select * from avc.alter_varchar_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
 0	val
 0	val
@@ -90,24 +93,24 @@ POSTHOOK: Input: default@alter_varchar_1
 10	val
 100	val
 PREHOOK: query: -- change back to bigger varchar
-alter table alter_varchar_1 change column value value varchar(20)
+alter table avc.alter_varchar_1 change column value value varchar(20)
 PREHOOK: type: ALTERTABLE_RENAMECOL
-PREHOOK: Input: default@alter_varchar_1
-PREHOOK: Output: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
+PREHOOK: Output: avc@alter_varchar_1
 POSTHOOK: query: -- change back to bigger varchar
-alter table alter_varchar_1 change column value value varchar(20)
+alter table avc.alter_varchar_1 change column value value varchar(20)
 POSTHOOK: type: ALTERTABLE_RENAMECOL
-POSTHOOK: Input: default@alter_varchar_1
-POSTHOOK: Output: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
+POSTHOOK: Output: avc@alter_varchar_1
 PREHOOK: query: -- column values should be full size again
-select * from alter_varchar_1
+select * from avc.alter_varchar_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
 POSTHOOK: query: -- column values should be full size again
-select * from alter_varchar_1
+select * from avc.alter_varchar_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
 0	val_0
 0	val_0
@@ -115,60 +118,68 @@ POSTHOOK: Input: default@alter_varchar_1
 10	val_10
 100	val_100
 PREHOOK: query: -- add varchar column
-alter table alter_varchar_1 add columns (key2 int, value2 varchar(10))
+alter table avc.alter_varchar_1 add columns (key2 int, value2 varchar(10))
 PREHOOK: type: ALTERTABLE_ADDCOLS
-PREHOOK: Input: default@alter_varchar_1
-PREHOOK: Output: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
+PREHOOK: Output: avc@alter_varchar_1
 POSTHOOK: query: -- add varchar column
-alter table alter_varchar_1 add columns (key2 int, value2 varchar(10))
+alter table avc.alter_varchar_1 add columns (key2 int, value2 varchar(10))
 POSTHOOK: type: ALTERTABLE_ADDCOLS
-POSTHOOK: Input: default@alter_varchar_1
-POSTHOOK: Output: default@alter_varchar_1
-PREHOOK: query: select * from alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
+POSTHOOK: Output: avc@alter_varchar_1
+PREHOOK: query: select * from avc.alter_varchar_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from alter_varchar_1
+POSTHOOK: query: select * from avc.alter_varchar_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
 0	val_0	NULL	NULL
 0	val_0	NULL	NULL
 0	val_0	NULL	NULL
 10	val_10	NULL	NULL
 100	val_100	NULL	NULL
-PREHOOK: query: insert overwrite table alter_varchar_1
+PREHOOK: query: insert overwrite table avc.alter_varchar_1
   select key, value, key, value from src order by key limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: default@alter_varchar_1
-POSTHOOK: query: insert overwrite table alter_varchar_1
+PREHOOK: Output: avc@alter_varchar_1
+POSTHOOK: query: insert overwrite table avc.alter_varchar_1
   select key, value, key, value from src order by key limit 5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@alter_varchar_1
+POSTHOOK: Output: avc@alter_varchar_1
 POSTHOOK: Lineage: alter_varchar_1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_varchar_1.key2 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_varchar_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_varchar_1.value2 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select * from alter_varchar_1
+PREHOOK: query: select * from avc.alter_varchar_1
 PREHOOK: type: QUERY
-PREHOOK: Input: default@alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from alter_varchar_1
+POSTHOOK: query: select * from avc.alter_varchar_1
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
 #### A masked pattern was here ####
 0	val_0	0	val_0
 0	val_0	0	val_0
 0	val_0	0	val_0
 10	val_10	10	val_10
 100	val_100	100	val_100
-PREHOOK: query: drop table alter_varchar_1
+PREHOOK: query: drop table avc.alter_varchar_1
 PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@alter_varchar_1
-PREHOOK: Output: default@alter_varchar_1
-POSTHOOK: query: drop table alter_varchar_1
+PREHOOK: Input: avc@alter_varchar_1
+PREHOOK: Output: avc@alter_varchar_1
+POSTHOOK: query: drop table avc.alter_varchar_1
 POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@alter_varchar_1
-POSTHOOK: Output: default@alter_varchar_1
+POSTHOOK: Input: avc@alter_varchar_1
+POSTHOOK: Output: avc@alter_varchar_1
+PREHOOK: query: drop database avc
+PREHOOK: type: DROPDATABASE
+PREHOOK: Input: database:avc
+PREHOOK: Output: database:avc
+POSTHOOK: query: drop database avc
+POSTHOOK: type: DROPDATABASE
+POSTHOOK: Input: database:avc
+POSTHOOK: Output: database:avc

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_view_as_select.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_view_as_select.q.out?rev=1620472&r1=1620471&r2=1620472&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_view_as_select.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_view_as_select.q.out Mon Aug 25 21:56:13 2014
@@ -1,20 +1,22 @@
-PREHOOK: query: DROP VIEW testView
-PREHOOK: type: DROPVIEW
-POSTHOOK: query: DROP VIEW testView
-POSTHOOK: type: DROPVIEW
-PREHOOK: query: CREATE VIEW testView as SELECT * FROM srcpart
+PREHOOK: query: CREATE DATABASE tv
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:tv
+POSTHOOK: query: CREATE DATABASE tv
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:tv
+PREHOOK: query: CREATE VIEW tv.testView as SELECT * FROM srcpart
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@srcpart
-POSTHOOK: query: CREATE VIEW testView as SELECT * FROM srcpart
+POSTHOOK: query: CREATE VIEW tv.testView as SELECT * FROM srcpart
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@srcpart
-POSTHOOK: Output: default@testView
-PREHOOK: query: DESCRIBE FORMATTED testView
+POSTHOOK: Output: tv@testView
+PREHOOK: query: DESCRIBE FORMATTED tv.testView
 PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@testview
-POSTHOOK: query: DESCRIBE FORMATTED testView
+PREHOOK: Input: tv@testview
+POSTHOOK: query: DESCRIBE FORMATTED tv.testView
 POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@testview
+POSTHOOK: Input: tv@testview
 # col_name            	data_type           	comment             
 	 	 
 key                 	string              	                    
@@ -23,7 +25,7 @@ ds                  	string             
 hr                  	string              	                    
 	 	 
 # Detailed Table Information	 	 
-Database:           	default             	 
+Database:           	tv                  	 
 #### A masked pattern was here ####
 Protect Mode:       	None                	 
 Retention:          	0                   	 
@@ -43,25 +45,25 @@ Sort Columns:       	[]                 
 # View Information	 	 
 View Original Text: 	SELECT * FROM srcpart	 
 View Expanded Text: 	SELECT `srcpart`.`key`, `srcpart`.`value`, `srcpart`.`ds`, `srcpart`.`hr` FROM `default`.`srcpart`	 
-PREHOOK: query: ALTER VIEW testView AS SELECT value FROM src WHERE key=86
+PREHOOK: query: ALTER VIEW tv.testView AS SELECT value FROM src WHERE key=86
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@src
-POSTHOOK: query: ALTER VIEW testView AS SELECT value FROM src WHERE key=86
+POSTHOOK: query: ALTER VIEW tv.testView AS SELECT value FROM src WHERE key=86
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@testview
-PREHOOK: query: DESCRIBE FORMATTED testView
+POSTHOOK: Output: tv@testview
+PREHOOK: query: DESCRIBE FORMATTED tv.testView
 PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@testview
-POSTHOOK: query: DESCRIBE FORMATTED testView
+PREHOOK: Input: tv@testview
+POSTHOOK: query: DESCRIBE FORMATTED tv.testView
 POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@testview
+POSTHOOK: Input: tv@testview
 # col_name            	data_type           	comment             
 	 	 
 value               	string              	                    
 	 	 
 # Detailed Table Information	 	 
-Database:           	default             	 
+Database:           	tv                  	 
 #### A masked pattern was here ####
 Protect Mode:       	None                	 
 Retention:          	0                   	 
@@ -81,34 +83,34 @@ Sort Columns:       	[]                 
 # View Information	 	 
 View Original Text: 	SELECT value FROM src WHERE key=86	 
 View Expanded Text: 	SELECT `src`.`value` FROM `default`.`src` WHERE `src`.`key`=86	 
-PREHOOK: query: ALTER VIEW testView AS
+PREHOOK: query: ALTER VIEW tv.testView AS
 SELECT * FROM src
 WHERE key > 80 AND key < 100
 ORDER BY key, value
 LIMIT 10
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@src
-POSTHOOK: query: ALTER VIEW testView AS
+POSTHOOK: query: ALTER VIEW tv.testView AS
 SELECT * FROM src
 WHERE key > 80 AND key < 100
 ORDER BY key, value
 LIMIT 10
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@testview
-PREHOOK: query: DESCRIBE FORMATTED testView
+POSTHOOK: Output: tv@testview
+PREHOOK: query: DESCRIBE FORMATTED tv.testView
 PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@testview
-POSTHOOK: query: DESCRIBE FORMATTED testView
+PREHOOK: Input: tv@testview
+POSTHOOK: query: DESCRIBE FORMATTED tv.testView
 POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@testview
+POSTHOOK: Input: tv@testview
 # col_name            	data_type           	comment             
 	 	 
 key                 	string              	                    
 value               	string              	                    
 	 	 
 # Detailed Table Information	 	 
-Database:           	default             	 
+Database:           	tv                  	 
 #### A masked pattern was here ####
 Protect Mode:       	None                	 
 Retention:          	0                   	 
@@ -134,3 +136,19 @@ View Expanded Text: 	SELECT `src`.`key`,
 WHERE `src`.`key` > 80 AND `src`.`key` < 100	 	 
 ORDER BY `src`.`key`, `src`.`value`	 	 
 LIMIT 10	 	 
+PREHOOK: query: DROP VIEW tv.testView
+PREHOOK: type: DROPVIEW
+PREHOOK: Input: tv@testview
+PREHOOK: Output: tv@testview
+POSTHOOK: query: DROP VIEW tv.testView
+POSTHOOK: type: DROPVIEW
+POSTHOOK: Input: tv@testview
+POSTHOOK: Output: tv@testview
+PREHOOK: query: DROP DATABASE tv
+PREHOOK: type: DROPDATABASE
+PREHOOK: Input: database:tv
+PREHOOK: Output: database:tv
+POSTHOOK: query: DROP DATABASE tv
+POSTHOOK: type: DROPDATABASE
+POSTHOOK: Input: database:tv
+POSTHOOK: Output: database:tv