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

svn commit: r1619936 [25/49] - in /hive/branches/cbo: ./ accumulo-handler/ ant/src/org/apache/hadoop/hive/ant/ bin/ common/src/java/org/apache/hadoop/hive/ant/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/java/org/apache/hadoop/hive/c...

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/database.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/database.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/database.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/database.q.out Fri Aug 22 21:36:47 2014
@@ -10,9 +10,11 @@ default
 PREHOOK: query: -- CREATE with comment
 CREATE DATABASE test_db COMMENT 'Hive test database'
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:test_db
 POSTHOOK: query: -- CREATE with comment
 CREATE DATABASE test_db COMMENT 'Hive test database'
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:test_db
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -22,9 +24,11 @@ test_db
 PREHOOK: query: -- CREATE INE already exists
 CREATE DATABASE IF NOT EXISTS test_db
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:test_db
 POSTHOOK: query: -- CREATE INE already exists
 CREATE DATABASE IF NOT EXISTS test_db
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:test_db
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -57,9 +61,11 @@ default
 PREHOOK: query: -- CREATE INE doesn't exist
 CREATE DATABASE IF NOT EXISTS test_db COMMENT 'Hive test database'
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:test_db
 POSTHOOK: query: -- CREATE INE doesn't exist
 CREATE DATABASE IF NOT EXISTS test_db COMMENT 'Hive test database'
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:test_db
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -90,9 +96,11 @@ POSTHOOK: type: DROPDATABASE
 PREHOOK: query: -- SHOW
 CREATE DATABASE test_db
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:test_db
 POSTHOOK: query: -- SHOW
 CREATE DATABASE test_db
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:test_db
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -115,8 +123,10 @@ POSTHOOK: type: SHOWDATABASES
 default
 PREHOOK: query: USE test_db
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:test_db
 POSTHOOK: query: USE test_db
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:test_db
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -127,6 +137,7 @@ PREHOOK: query: -- CREATE table in non-d
 CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test_db
+PREHOOK: Output: test_db@test_table
 POSTHOOK: query: -- CREATE table in non-default DB
 CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
@@ -161,6 +172,7 @@ PREHOOK: query: -- CREATE LIKE in non-de
 CREATE TABLE test_table_like LIKE test_table
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test_db
+PREHOOK: Output: test_db@test_table_like
 POSTHOOK: query: -- CREATE LIKE in non-default DB
 CREATE TABLE test_table_like LIKE test_table
 POSTHOOK: type: CREATETABLE
@@ -225,6 +237,7 @@ test_table_like
 PREHOOK: query: CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test_db
+PREHOOK: Output: test_db@test_table
 POSTHOOK: query: CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:test_db
@@ -246,12 +259,15 @@ POSTHOOK: Input: test_db@test_table
 PREHOOK: query: -- CREATE table that already exists in DEFAULT
 USE test_db
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:test_db
 POSTHOOK: query: -- CREATE table that already exists in DEFAULT
 USE test_db
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:test_db
 PREHOOK: query: CREATE TABLE src (col1 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test_db
+PREHOOK: Output: test_db@src
 POSTHOOK: query: CREATE TABLE src (col1 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:test_db
@@ -273,8 +289,10 @@ POSTHOOK: Input: test_db@src
 #### A masked pattern was here ####
 PREHOOK: query: USE default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: USE default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 PREHOOK: query: SELECT * FROM src LIMIT 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -296,9 +314,11 @@ POSTHOOK: Input: default@src
 PREHOOK: query: -- DROP DATABASE
 USE test_db
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:test_db
 POSTHOOK: query: -- DROP DATABASE
 USE test_db
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:test_db
 PREHOOK: query: DROP TABLE src
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: test_db@src
@@ -329,8 +349,10 @@ POSTHOOK: query: SHOW TABLES
 POSTHOOK: type: SHOWTABLES
 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 test_db
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:test_db
@@ -347,9 +369,11 @@ default
 PREHOOK: query: -- DROP EMPTY DATABASE CASCADE
 CREATE DATABASE to_drop_db1
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:to_drop_db1
 POSTHOOK: query: -- DROP EMPTY DATABASE CASCADE
 CREATE DATABASE to_drop_db1
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:to_drop_db1
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -358,8 +382,10 @@ default
 to_drop_db1
 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 to_drop_db1 CASCADE
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:to_drop_db1
@@ -376,9 +402,11 @@ default
 PREHOOK: query: -- DROP NON-EMPTY DATABASE CASCADE
 CREATE DATABASE to_drop_db2
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:to_drop_db2
 POSTHOOK: query: -- DROP NON-EMPTY DATABASE CASCADE
 CREATE DATABASE to_drop_db2
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:to_drop_db2
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -387,11 +415,14 @@ default
 to_drop_db2
 PREHOOK: query: USE to_drop_db2
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:to_drop_db2
 POSTHOOK: query: USE to_drop_db2
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:to_drop_db2
 PREHOOK: query: CREATE TABLE temp_tbl (c STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:to_drop_db2
+PREHOOK: Output: to_drop_db2@temp_tbl
 POSTHOOK: query: CREATE TABLE temp_tbl (c STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:to_drop_db2
@@ -399,6 +430,7 @@ POSTHOOK: Output: to_drop_db2@temp_tbl
 PREHOOK: query: CREATE TABLE temp_tbl2 LIKE temp_tbl
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:to_drop_db2
+PREHOOK: Output: to_drop_db2@temp_tbl2
 POSTHOOK: query: CREATE TABLE temp_tbl2 LIKE temp_tbl
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:to_drop_db2
@@ -414,8 +446,10 @@ POSTHOOK: Output: to_drop_db2@temp_tbl2
 POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ]
 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 to_drop_db2 CASCADE
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:to_drop_db2
@@ -436,9 +470,11 @@ default
 PREHOOK: query: -- DROP NON-EMPTY DATABASE CASCADE IF EXISTS
 CREATE DATABASE to_drop_db3
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:to_drop_db3
 POSTHOOK: query: -- DROP NON-EMPTY DATABASE CASCADE IF EXISTS
 CREATE DATABASE to_drop_db3
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:to_drop_db3
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -447,19 +483,24 @@ default
 to_drop_db3
 PREHOOK: query: USE to_drop_db3
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:to_drop_db3
 POSTHOOK: query: USE to_drop_db3
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:to_drop_db3
 PREHOOK: query: CREATE TABLE temp_tbl (c STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:to_drop_db3
+PREHOOK: Output: to_drop_db3@temp_tbl
 POSTHOOK: query: CREATE TABLE temp_tbl (c STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:to_drop_db3
 POSTHOOK: Output: to_drop_db3@temp_tbl
 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 IF EXISTS to_drop_db3 CASCADE
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:to_drop_db3
@@ -495,9 +536,11 @@ POSTHOOK: type: DROPDATABASE
 PREHOOK: query: -- DROP EMPTY DATABASE RESTRICT
 CREATE DATABASE to_drop_db4
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:to_drop_db4
 POSTHOOK: query: -- DROP EMPTY DATABASE RESTRICT
 CREATE DATABASE to_drop_db4
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:to_drop_db4
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -523,26 +566,32 @@ PREHOOK: query: --
 
 CREATE DATABASE db1
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db1
 POSTHOOK: query: --
 -- Canonical Name Tests
 --
 
 CREATE DATABASE db1
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db1
 PREHOOK: query: CREATE DATABASE db2
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db2
 POSTHOOK: query: CREATE DATABASE db2
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db2
 PREHOOK: query: -- CREATE foreign table
 CREATE TABLE db1.src(key STRING, value STRING)
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:db1
+PREHOOK: Output: db1@db1.src
 POSTHOOK: query: -- CREATE foreign table
 CREATE TABLE db1.src(key STRING, value STRING)
 STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:db1
+POSTHOOK: Output: db1@db1.src
 POSTHOOK: Output: db1@src
 PREHOOK: query: -- LOAD into foreign table
 LOAD DATA LOCAL INPATH '../../data/files/kv1.txt'
@@ -1072,12 +1121,14 @@ PARTITIONED BY (ds STRING, hr STRING)
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:db1
+PREHOOK: Output: db1@db1.srcpart
 POSTHOOK: query: -- CREATE Partitioned foreign table
 CREATE TABLE db1.srcpart(key STRING, value STRING)
 PARTITIONED BY (ds STRING, hr STRING)
 STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:db1
+POSTHOOK: Output: db1@db1.srcpart
 POSTHOOK: Output: db1@srcpart
 PREHOOK: query: -- LOAD data into Partitioned foreign table
 LOAD DATA LOCAL INPATH '../../data/files/kv1.txt'
@@ -1195,9 +1246,11 @@ POSTHOOK: Input: db1@srcpart@ds=2008-04-
 PREHOOK: query: -- SELECT JOINed product of two foreign tables
 USE db2
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:db2
 POSTHOOK: query: -- SELECT JOINed product of two foreign tables
 USE db2
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:db2
 PREHOOK: query: SELECT a.* FROM db1.src a JOIN default.src1 b
 ON (a.key = b.key)
 PREHOOK: type: QUERY
@@ -1293,8 +1346,10 @@ val_66
 val_8
 PREHOOK: query: USE default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: USE default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 PREHOOK: query: SELECT * FROM (
   SELECT value FROM db1.conflict_name
 UNION ALL
@@ -1320,6 +1375,7 @@ CREATE TABLE bucketized_src (key INT, va
 CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@bucketized_src
 POSTHOOK: query: -- TABLESAMPLES
 CREATE TABLE bucketized_src (key INT, value STRING)
 CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS
@@ -1351,15 +1407,19 @@ PREHOOK: query: -- CREATE TABLE LIKE
 CREATE TABLE db2.src1 LIKE default.src
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:db2
+PREHOOK: Output: db2@db2.src1
 POSTHOOK: query: -- CREATE TABLE LIKE
 CREATE TABLE db2.src1 LIKE default.src
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:db2
+POSTHOOK: Output: db2@db2.src1
 POSTHOOK: Output: db2@src1
 PREHOOK: query: USE db2
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:db2
 POSTHOOK: query: USE db2
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:db2
 PREHOOK: query: DESC EXTENDED src1
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: db2@src1
@@ -1401,5 +1461,7 @@ POSTHOOK: Input: default@src
 0
 PREHOOK: query: USE default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: USE default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/database_drop.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/database_drop.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/database_drop.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/database_drop.q.out Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ PREHOOK: query: -- create database with 
 
 CREATE DATABASE db5
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db5
 POSTHOOK: query: -- create database with multiple tables, indexes and views.
 -- Use both partitioned and non-partitioned tables, as well as
 -- tables and indexes with specific storage locations
@@ -14,6 +15,7 @@ POSTHOOK: query: -- create database with
 
 CREATE DATABASE db5
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db5
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -22,13 +24,16 @@ db5
 default
 PREHOOK: query: USE db5
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:db5
 POSTHOOK: query: USE db5
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:db5
 #### A masked pattern was here ####
 PREHOOK: query: -- add a table, index and view
 CREATE TABLE temp_tbl (id INT, name STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:db5
+PREHOOK: Output: db5@temp_tbl
 POSTHOOK: query: -- add a table, index and view
 CREATE TABLE temp_tbl (id INT, name STRING)
 POSTHOOK: type: CREATETABLE
@@ -51,8 +56,10 @@ POSTHOOK: Input: db5@temp_tbl
 POSTHOOK: Output: db5@temp_tbl_view
 PREHOOK: query: CREATE INDEX idx1 ON TABLE temp_tbl(id) AS 'COMPACT' with DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: db5@temp_tbl
 POSTHOOK: query: CREATE INDEX idx1 ON TABLE temp_tbl(id) AS 'COMPACT' with DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: db5@temp_tbl
 POSTHOOK: Output: db5@db5__temp_tbl_idx1__
 PREHOOK: query: ALTER INDEX idx1 ON temp_tbl REBUILD
 PREHOOK: type: ALTERINDEX_REBUILD
@@ -70,6 +77,7 @@ PREHOOK: query: -- add a table, index an
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:db5
+PREHOOK: Output: db5@temp_tbl2
 POSTHOOK: query: -- add a table, index and view with a different storage location
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
@@ -93,8 +101,10 @@ POSTHOOK: Input: db5@temp_tbl2
 POSTHOOK: Output: db5@temp_tbl2_view
 #### A masked pattern was here ####
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: db5@temp_tbl2
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: db5@temp_tbl2
 POSTHOOK: Output: db5@db5__temp_tbl2_idx2__
 #### A masked pattern was here ####
 PREHOOK: query: ALTER INDEX idx2 ON temp_tbl2 REBUILD
@@ -112,6 +122,7 @@ PREHOOK: query: -- add a partitioned tab
 CREATE TABLE part_tab (id INT, name STRING)  PARTITIONED BY (ds string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:db5
+PREHOOK: Output: db5@part_tab
 POSTHOOK: query: -- add a partitioned table, index and view
 CREATE TABLE part_tab (id INT, name STRING)  PARTITIONED BY (ds string)
 POSTHOOK: type: CREATETABLE
@@ -137,8 +148,10 @@ POSTHOOK: Output: db5@part_tab
 POSTHOOK: Output: db5@part_tab@ds=2009-04-09
 PREHOOK: query: CREATE INDEX idx3 ON TABLE part_tab(id) AS 'COMPACT' with DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: db5@part_tab
 POSTHOOK: query: CREATE INDEX idx3 ON TABLE part_tab(id) AS 'COMPACT' with DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: db5@part_tab
 POSTHOOK: Output: db5@db5__part_tab_idx3__
 PREHOOK: query: ALTER INDEX idx3 ON part_tab PARTITION (ds='2008-04-09') REBUILD
 PREHOOK: type: ALTERINDEX_REBUILD
@@ -172,6 +185,7 @@ CREATE TABLE part_tab2 (id INT, name STR
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:db5
+PREHOOK: Output: db5@part_tab2
 POSTHOOK: query: -- add a partitioned table, index and view with a different storage location
 CREATE TABLE part_tab2 (id INT, name STRING)  PARTITIONED BY (ds string)
 #### A masked pattern was here ####
@@ -200,10 +214,12 @@ POSTHOOK: Output: db5@part_tab2@ds=2009-
 PREHOOK: query: CREATE INDEX idx4 ON TABLE part_tab2(id) AS 'COMPACT' with DEFERRED REBUILD
 #### A masked pattern was here ####
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: db5@part_tab2
 #### A masked pattern was here ####
 POSTHOOK: query: CREATE INDEX idx4 ON TABLE part_tab2(id) AS 'COMPACT' with DEFERRED REBUILD
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: db5@part_tab2
 POSTHOOK: Output: db5@db5__part_tab2_idx4__
 #### A masked pattern was here ####
 PREHOOK: query: ALTER INDEX idx4 ON part_tab2 PARTITION (ds='2008-04-09') REBUILD
@@ -238,6 +254,7 @@ CREATE TABLE part_tab3 (id INT, name STR
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:db5
+PREHOOK: Output: db5@part_tab3
 POSTHOOK: query: -- add a partitioned table, index and view with a different storage location
 CREATE TABLE part_tab3 (id INT, name STRING)  PARTITIONED BY (ds string)
 #### A masked pattern was here ####
@@ -275,10 +292,12 @@ POSTHOOK: Output: db5@part_tab3@ds=2009-
 PREHOOK: query: CREATE INDEX idx5 ON TABLE part_tab3(id) AS 'COMPACT' with DEFERRED REBUILD
 #### A masked pattern was here ####
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: db5@part_tab3
 #### A masked pattern was here ####
 POSTHOOK: query: CREATE INDEX idx5 ON TABLE part_tab3(id) AS 'COMPACT' with DEFERRED REBUILD
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: db5@part_tab3
 POSTHOOK: Output: db5@db5__part_tab3_idx5__
 #### A masked pattern was here ####
 PREHOOK: query: ALTER INDEX idx5 ON part_tab3 PARTITION (ds='2008-04-09') REBUILD
@@ -316,6 +335,7 @@ CREATE EXTERNAL TABLE extab1(id INT, nam
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:db5
+PREHOOK: Output: db5@extab1
 POSTHOOK: query: -- add an external table
 CREATE EXTERNAL TABLE extab1(id INT, name STRING) ROW FORMAT
               DELIMITED FIELDS TERMINATED BY ''

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/database_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/database_location.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/database_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/database_location.q.out Fri Aug 22 21:36:47 2014
@@ -1,7 +1,9 @@
 PREHOOK: query: CREATE DATABASE db1
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db1
 POSTHOOK: query: CREATE DATABASE db1
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db1
 PREHOOK: query: DESCRIBE DATABASE EXTENDED db1
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: DESCRIBE DATABASE EXTENDED db1
@@ -9,11 +11,14 @@ POSTHOOK: type: DESCDATABASE
 db1		location/in/test	hive_test_user	USER	
 PREHOOK: query: USE db1
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:db1
 POSTHOOK: query: USE db1
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:db1
 PREHOOK: query: CREATE TABLE table_db1 (name STRING, value INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:db1
+PREHOOK: Output: db1@table_db1
 POSTHOOK: query: CREATE TABLE table_db1 (name STRING, value INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:db1
@@ -58,11 +63,13 @@ PREHOOK: query: CREATE DATABASE db2
 COMMENT 'database 2'
 #### A masked pattern was here ####
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db2
 #### A masked pattern was here ####
 POSTHOOK: query: CREATE DATABASE db2
 COMMENT 'database 2'
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db2
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE DATABASE EXTENDED db2
 PREHOOK: type: DESCDATABASE
@@ -71,11 +78,14 @@ POSTHOOK: type: DESCDATABASE
 db2	database 2	location/in/test	hive_test_user	USER	
 PREHOOK: query: USE db2
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:db2
 POSTHOOK: query: USE db2
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:db2
 PREHOOK: query: CREATE TABLE table_db2 (name STRING, value INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:db2
+PREHOOK: Output: db2@table_db2
 POSTHOOK: query: CREATE TABLE table_db2 (name STRING, value INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:db2

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/database_properties.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/database_properties.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/database_properties.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/database_properties.q.out Fri Aug 22 21:36:47 2014
@@ -1,7 +1,9 @@
 PREHOOK: query: create database db1
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db1
 POSTHOOK: query: create database db1
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db1
 PREHOOK: query: show databases
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: show databases
@@ -13,11 +15,13 @@ PREHOOK: query: create database db2 with
   'hive.warehouse.dir' = '/user/hive/warehouse',
 #### A masked pattern was here ####
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db2
 POSTHOOK: query: create database db2 with dbproperties (
   'mapred.jobtracker.url'='http://my.jobtracker.com:53000',
   'hive.warehouse.dir' = '/user/hive/warehouse',
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db2
 PREHOOK: query: describe database db2
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: describe database db2

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/date_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/date_1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/date_1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/date_1.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table date_1 (d date)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_1
 POSTHOOK: query: create table date_1 (d date)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/date_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/date_2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/date_2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/date_2.q.out Fri Aug 22 21:36:47 2014
@@ -11,6 +11,7 @@ PREHOOK: query: create table date_2 (
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_2
 POSTHOOK: query: create table date_2 (
   ORIGIN_CITY_NAME string,
   DEST_CITY_NAME string,

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/date_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/date_3.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/date_3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/date_3.q.out Fri Aug 22 21:36:47 2014
@@ -7,6 +7,7 @@ PREHOOK: query: create table date_3 (
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_3
 POSTHOOK: query: create table date_3 (
   c1 int
 )

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/date_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/date_4.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/date_4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/date_4.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table date_4 (d date)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_4
 POSTHOOK: query: create table date_4 (d date)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/date_join1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/date_join1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/date_join1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/date_join1.q.out Fri Aug 22 21:36:47 2014
@@ -11,6 +11,7 @@ PREHOOK: query: create table date_join1 
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_join1
 POSTHOOK: query: create table date_join1 (
   ORIGIN_CITY_NAME string,
   DEST_CITY_NAME string,

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/date_serde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/date_serde.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/date_serde.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/date_serde.q.out Fri Aug 22 21:36:47 2014
@@ -39,6 +39,7 @@ with serdeproperties (
 stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_serde_regex
 POSTHOOK: query: --
 -- RegexSerDe
 --
@@ -239,6 +240,7 @@ create table date_serde_lb (
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_serde_lb
 POSTHOOK: query: --
 -- LazyBinary
 --
@@ -296,6 +298,7 @@ create table date_serde_ls (
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_serde_ls
 POSTHOOK: query: --
 -- LazySimple
 --
@@ -353,6 +356,7 @@ create table date_serde_c (
 ) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_serde_c
 POSTHOOK: query: --
 -- Columnar
 --
@@ -410,6 +414,7 @@ create table date_serde_lbc (
 ) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_serde_lbc
 POSTHOOK: query: --
 -- LazyBinaryColumnar
 --
@@ -467,6 +472,7 @@ create table date_serde_orc (
 ) stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_serde_orc
 POSTHOOK: query: --
 -- ORC
 --

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/date_udf.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/date_udf.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/date_udf.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/date_udf.q.out Fri Aug 22 21:36:47 2014
@@ -13,6 +13,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table date_udf (d date)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_udf
 POSTHOOK: query: create table date_udf (d date)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -20,6 +21,7 @@ POSTHOOK: Output: default@date_udf
 PREHOOK: query: create table date_udf_string (d string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_udf_string
 POSTHOOK: query: create table date_udf_string (d string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -53,6 +55,7 @@ PREHOOK: query: create table date_udf_fl
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@date_udf_flight
 POSTHOOK: query: create table date_udf_flight (
   ORIGIN_CITY_NAME string,
   DEST_CITY_NAME string,

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact1.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table T1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: create table T1(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact2.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table T1(key string, val string) partitioned by (ds string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: create table T1(key string, val string) partitioned by (ds string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact3.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_compact3.q.out Fri Aug 22 21:36:47 2014
@@ -1,13 +1,18 @@
 PREHOOK: query: create database D1
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:D1
 POSTHOOK: query: create database D1
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:D1
 PREHOOK: query: use D1
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:d1
 POSTHOOK: query: use D1
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:d1
 PREHOOK: query: create table T1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: D1@T1
 PREHOOK: Output: database:d1
 POSTHOOK: query: create table T1(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_ddl1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_ddl1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_ddl1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_ddl1.q.out Fri Aug 22 21:36:47 2014
@@ -1,7 +1,9 @@
 PREHOOK: query: create database D1
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:D1
 POSTHOOK: query: create database D1
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:D1
 PREHOOK: query: alter database D1 set dbproperties('test'='yesthisis')
 PREHOOK: type: ALTERDATABASE
 PREHOOK: Output: database:d1
@@ -19,6 +21,7 @@ POSTHOOK: Output: database:d1
 PREHOOK: query: create table T1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: create table T1(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -26,6 +29,7 @@ POSTHOOK: Output: default@T1
 PREHOOK: query: create table T2 like T1
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: create table T2 like T1
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -65,6 +69,7 @@ PREHOOK: query: create table T4 (key cha
     stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T4
 POSTHOOK: query: create table T4 (key char(10), val decimal(5,2), b int)
     partitioned by (ds string)
     clustered by (b) into 10 buckets
@@ -148,6 +153,7 @@ POSTHOOK: Output: default@t4@ds=tomorrow
 PREHOOK: query: create table T5 (a string, b int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T5
 POSTHOOK: query: create table T5 (a string, b int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -172,6 +178,7 @@ POSTHOOK: Output: default@t4@ds=tomorrow
 PREHOOK: query: create table T7 (a string, b int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T7
 POSTHOOK: query: create table T7 (a string, b int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query1.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table T1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: create table T1(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -30,6 +31,7 @@ POSTHOOK: Input: default@t1
 PREHOOK: query: create table T2(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: create table T2(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query2.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table T1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: create table T1(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -30,6 +31,7 @@ POSTHOOK: Input: default@t1
 PREHOOK: query: create table T2(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: create table T2(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query3.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query3.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table T1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: create table T1(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -30,6 +31,7 @@ POSTHOOK: Input: default@t1
 PREHOOK: query: create table T2(key string, val string) partitioned by (pval string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: create table T2(key string, val string) partitioned by (pval string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query4.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query4.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table T1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: create table T1(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -30,6 +31,7 @@ POSTHOOK: Input: default@t1
 PREHOOK: query: create table T2(key string) partitioned by (val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: create table T2(key string) partitioned by (val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out Fri Aug 22 21:36:47 2014
@@ -1,14 +1,19 @@
 PREHOOK: query: create database foo
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:foo
 POSTHOOK: query: create database foo
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:foo
 PREHOOK: query: use foo
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:foo
 POSTHOOK: query: use foo
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:foo
 PREHOOK: query: create table T1(key string, val string) partitioned by (ds string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:foo
+PREHOOK: Output: foo@T1
 POSTHOOK: query: create table T1(key string, val string) partitioned by (ds string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:foo

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/ddltime.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/ddltime.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/ddltime.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/ddltime.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table T1 like src
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: create table T1 like src
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -78,6 +79,7 @@ value               	string             
 PREHOOK: query: create table if not exists T2 like srcpart
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: create table if not exists T2 like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_1.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table decimal_1 (t decimal(4,2), u decimal(5), v decimal)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@decimal_1
 POSTHOOK: query: create table decimal_1 (t decimal(4,2), u decimal(5), v decimal)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_10_0.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_10_0.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_10_0.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_10_0.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: CREATE TABLE DECIMAL (dec decimal)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL
 POSTHOOK: query: CREATE TABLE DECIMAL (dec decimal)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_2.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table decimal_2 (t decimal(18,9))
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@decimal_2
 POSTHOOK: query: create table decimal_2 (t decimal(18,9))
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -263,7 +264,7 @@ POSTHOOK: query: select cast(0.999999999
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_2
 #### A masked pattern was here ####
-1
+1.0
 PREHOOK: query: select cast('0.99999999999999999999' as decimal(20,20)) from decimal_2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_2

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_3.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_3.q.out Fri Aug 22 21:36:47 2014
@@ -8,6 +8,7 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL_3
 POSTHOOK: query: CREATE TABLE DECIMAL_3(key decimal(38,18), value int)
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
@@ -32,7 +33,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_3
 #### A masked pattern was here ####
 NULL	0
--1234567890.123456789	-1234567890
+-1234567890.1234567890	-1234567890
 -4400	4400
 -1255.49	-1255
 -1.122	-11
@@ -41,7 +42,7 @@ NULL	0
 -0.333	0
 -0.33	0
 -0.3	0
-0	0
+0.000000000000000000	0
 0	0
 0	0
 0.01	0
@@ -52,8 +53,8 @@ NULL	0
 0.33	0
 0.333	0
 1	1
-1	1
-1	1
+1.0	1
+1.000000000000000000	1
 1.12	1
 1.122	1
 2	2
@@ -61,14 +62,14 @@ NULL	0
 3.14	3
 3.14	3
 3.14	3
-3.14	4
+3.140	4
 10	10
 20	20
 100	100
-124	124
+124.00	124
 125.2	125
 200	200
-1234567890.12345678	1234567890
+1234567890.1234567800	1234567890
 PREHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key DESC, value DESC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_3
@@ -77,14 +78,14 @@ POSTHOOK: query: SELECT * FROM DECIMAL_3
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_3
 #### A masked pattern was here ####
-1234567890.12345678	1234567890
+1234567890.1234567800	1234567890
 200	200
 125.2	125
-124	124
+124.00	124
 100	100
 20	20
 10	10
-3.14	4
+3.140	4
 3.14	3
 3.14	3
 3.14	3
@@ -92,8 +93,8 @@ POSTHOOK: Input: default@decimal_3
 2	2
 1.122	1
 1.12	1
-1	1
-1	1
+1.000000000000000000	1
+1.0	1
 1	1
 0.333	0
 0.33	0
@@ -104,7 +105,7 @@ POSTHOOK: Input: default@decimal_3
 0.01	0
 0	0
 0	0
-0	0
+0.000000000000000000	0
 -0.3	0
 -0.33	0
 -0.333	0
@@ -113,7 +114,7 @@ POSTHOOK: Input: default@decimal_3
 -1.122	-11
 -1255.49	-1255
 -4400	4400
--1234567890.123456789	-1234567890
+-1234567890.1234567890	-1234567890
 NULL	0
 PREHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key, value
 PREHOOK: type: QUERY
@@ -124,7 +125,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_3
 #### A masked pattern was here ####
 NULL	0
--1234567890.123456789	-1234567890
+-1234567890.1234567890	-1234567890
 -4400	4400
 -1255.49	-1255
 -1.122	-11
@@ -133,7 +134,7 @@ NULL	0
 -0.333	0
 -0.33	0
 -0.3	0
-0	0
+0.000000000000000000	0
 0	0
 0	0
 0.01	0
@@ -144,8 +145,8 @@ NULL	0
 0.33	0
 0.333	0
 1	1
-1	1
-1	1
+1.0	1
+1.000000000000000000	1
 1.12	1
 1.122	1
 2	2
@@ -153,14 +154,14 @@ NULL	0
 3.14	3
 3.14	3
 3.14	3
-3.14	4
+3.140	4
 10	10
 20	20
 100	100
-124	124
+124.00	124
 125.2	125
 200	200
-1234567890.12345678	1234567890
+1234567890.1234567800	1234567890
 PREHOOK: query: SELECT DISTINCT key FROM DECIMAL_3 ORDER BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_3
@@ -170,7 +171,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_3
 #### A masked pattern was here ####
 NULL
--1234567890.123456789
+-1234567890.1234567890
 -4400
 -1255.49
 -1.122
@@ -178,7 +179,7 @@ NULL
 -0.333
 -0.33
 -0.3
-0
+0.000000000000000000
 0.01
 0.02
 0.1
@@ -194,10 +195,10 @@ NULL
 10
 20
 100
-124
+124.00
 125.2
 200
-1234567890.12345678
+1234567890.1234567800
 PREHOOK: query: SELECT key, sum(value) FROM DECIMAL_3 GROUP BY key ORDER BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_3
@@ -207,7 +208,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_3
 #### A masked pattern was here ####
 NULL	0
--1234567890.123456789	-1234567890
+-1234567890.1234567890	-1234567890
 -4400	4400
 -1255.49	-1255
 -1.122	-11
@@ -215,7 +216,7 @@ NULL	0
 -0.333	0
 -0.33	0
 -0.3	0
-0	0
+0.000000000000000000	0
 0.01	0
 0.02	0
 0.1	0
@@ -231,10 +232,10 @@ NULL	0
 10	10
 20	20
 100	100
-124	124
+124.00	124
 125.2	125
 200	200
-1234567890.12345678	1234567890
+1234567890.1234567800	1234567890
 PREHOOK: query: SELECT value, sum(key) FROM DECIMAL_3 GROUP BY value ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_3
@@ -243,23 +244,23 @@ POSTHOOK: query: SELECT value, sum(key) 
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_3
 #### A masked pattern was here ####
--1234567890	-1234567890.123456789
+-1234567890	-1234567890.1234567890
 -1255	-1255.49
 -11	-1.122
 -1	-2.24
-0	0.33
-1	5.242
+0	0.330000000000000000
+1	5.242000000000000000
 2	4
 3	9.42
-4	3.14
+4	3.140
 10	10
 20	20
 100	100
-124	124
+124	124.00
 125	125.2
 200	200
 4400	-4400
-1234567890	1234567890.12345678
+1234567890	1234567890.1234567800
 PREHOOK: query: SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) ORDER BY a.key, a.value, b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_3
@@ -268,7 +269,7 @@ POSTHOOK: query: SELECT * FROM DECIMAL_3
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_3
 #### A masked pattern was here ####
--1234567890.123456789	-1234567890	-1234567890.123456789	-1234567890
+-1234567890.1234567890	-1234567890	-1234567890.1234567890	-1234567890
 -4400	4400	-4400	4400
 -1255.49	-1255	-1255.49	-1255
 -1.122	-11	-1.122	-11
@@ -279,11 +280,7 @@ POSTHOOK: Input: default@decimal_3
 -0.333	0	-0.333	0
 -0.33	0	-0.33	0
 -0.3	0	-0.3	0
-0	0	0	0
-0	0	0	0
-0	0	0	0
-0	0	0	0
-0	0	0	0
+0.000000000000000000	0	0.000000000000000000	0
 0	0	0	0
 0	0	0	0
 0	0	0	0
@@ -296,14 +293,8 @@ POSTHOOK: Input: default@decimal_3
 0.33	0	0.33	0
 0.333	0	0.333	0
 1	1	1	1
-1	1	1	1
-1	1	1	1
-1	1	1	1
-1	1	1	1
-1	1	1	1
-1	1	1	1
-1	1	1	1
-1	1	1	1
+1.0	1	1.0	1
+1.000000000000000000	1	1.000000000000000000	1
 1.12	1	1.12	1
 1.122	1	1.122	1
 2	2	2	2
@@ -319,20 +310,14 @@ POSTHOOK: Input: default@decimal_3
 3.14	3	3.14	3
 3.14	3	3.14	3
 3.14	3	3.14	3
-3.14	3	3.14	4
-3.14	3	3.14	4
-3.14	3	3.14	4
-3.14	4	3.14	3
-3.14	4	3.14	3
-3.14	4	3.14	3
-3.14	4	3.14	4
+3.140	4	3.140	4
 10	10	10	10
 20	20	20	20
 100	100	100	100
-124	124	124	124
+124.00	124	124.00	124
 125.2	125	125.2	125
 200	200	200	200
-1234567890.12345678	1234567890	1234567890.12345678	1234567890
+1234567890.1234567800	1234567890	1234567890.1234567800	1234567890
 PREHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.14 ORDER BY key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_3
@@ -344,7 +329,7 @@ POSTHOOK: Input: default@decimal_3
 3.14	3
 3.14	3
 3.14	3
-3.14	4
+3.140	4
 PREHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.140 ORDER BY key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_3
@@ -356,7 +341,7 @@ POSTHOOK: Input: default@decimal_3
 3.14	3
 3.14	3
 3.14	3
-3.14	4
+3.140	4
 PREHOOK: query: DROP TABLE DECIMAL_3
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@decimal_3

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_4.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_4.q.out Fri Aug 22 21:36:47 2014
@@ -12,6 +12,7 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL_4_1
 POSTHOOK: query: CREATE TABLE DECIMAL_4_1(key decimal(35,25), value int) 
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
@@ -23,6 +24,7 @@ PREHOOK: query: CREATE TABLE DECIMAL_4_2
 STORED AS ORC
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL_4_2
 POSTHOOK: query: CREATE TABLE DECIMAL_4_2(key decimal(35,25), value decimal(35,25)) 
 STORED AS ORC
 POSTHOOK: type: CREATETABLE
@@ -55,7 +57,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_4_1
 #### A masked pattern was here ####
 NULL	0
--1234567890.123456789	-1234567890
+-1234567890.1234567890	-1234567890
 -4400	4400
 -1255.49	-1255
 -1.122	-11
@@ -64,7 +66,7 @@ NULL	0
 -0.333	0
 -0.33	0
 -0.3	0
-0	0
+0.0000000000000000000000000	0
 0	0
 0	0
 0.01	0
@@ -76,7 +78,7 @@ NULL	0
 0.333	0
 0.9999999999999999999999999	1
 1	1
-1	1
+1.0	1
 1.12	1
 1.122	1
 2	2
@@ -84,14 +86,14 @@ NULL	0
 3.14	3
 3.14	3
 3.14	3
-3.14	4
+3.140	4
 10	10
 20	20
 100	100
-124	124
+124.00	124
 125.2	125
 200	200
-1234567890.12345678	1234567890
+1234567890.1234567800	1234567890
 PREHOOK: query: SELECT * FROM DECIMAL_4_2 ORDER BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_4_2
@@ -101,7 +103,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_4_2
 #### A masked pattern was here ####
 NULL	NULL
--1234567890.123456789	-3703703670.370370367
+-1234567890.1234567890	-3703703670.3703703670
 -4400	-13200
 -1255.49	-3766.47
 -1.122	-3.366
@@ -110,7 +112,7 @@ NULL	NULL
 -0.333	-0.999
 -0.33	-0.99
 -0.3	-0.9
-0	0
+0.0000000000000000000000000	0.0000000000000000000000000
 0	0
 0	0
 0.01	0.03
@@ -122,7 +124,7 @@ NULL	NULL
 0.333	0.999
 0.9999999999999999999999999	2.9999999999999999999999997
 1	3
-1	3
+1.0	3.0
 1.12	3.36
 1.122	3.366
 2	6
@@ -130,14 +132,14 @@ NULL	NULL
 3.14	9.42
 3.14	9.42
 3.14	9.42
-3.14	9.42
+3.140	9.420
 10	30
 20	60
 100	300
-124	372
+124.00	372.00
 125.2	375.6
 200	600
-1234567890.12345678	3703703670.37037034
+1234567890.1234567800	3703703670.3703703400
 PREHOOK: query: DROP TABLE DECIMAL_4_1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@decimal_4_1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_5.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_5.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_5.q.out Fri Aug 22 21:36:47 2014
@@ -8,6 +8,7 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL_5
 POSTHOOK: query: CREATE TABLE DECIMAL_5(key decimal(10,5), value int)
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
@@ -42,7 +43,7 @@ NULL
 -0.333
 -0.33
 -0.3
-0
+0.00000
 0
 0
 0.01
@@ -53,8 +54,8 @@ NULL
 0.33
 0.333
 1
-1
-1
+1.0
+1.00000
 1.12
 1.122
 2
@@ -62,11 +63,11 @@ NULL
 3.14
 3.14
 3.14
-3.14
+3.140
 10
 20
 100
-124
+124.00
 125.2
 200
 PREHOOK: query: SELECT DISTINCT key FROM DECIMAL_5 ORDER BY key
@@ -85,7 +86,7 @@ NULL
 -0.333
 -0.33
 -0.3
-0
+0.00000
 0.01
 0.02
 0.1
@@ -101,7 +102,7 @@ NULL
 10
 20
 100
-124
+124.00
 125.2
 200
 PREHOOK: query: SELECT cast(key as decimal) FROM DECIMAL_5
@@ -160,7 +161,7 @@ POSTHOOK: Input: default@decimal_5
 #### A masked pattern was here ####
 NULL
 NULL
-0
+0.000
 0
 100
 10
@@ -179,7 +180,7 @@ NULL
 -0.3
 -0.33
 -0.333
-1
+1.0
 2
 3.14
 -1.12
@@ -187,13 +188,13 @@ NULL
 -1.122
 1.12
 1.122
-124
+124.00
 125.2
 NULL
 3.14
 3.14
-3.14
-1
+3.140
+1.000
 NULL
 NULL
 PREHOOK: query: DROP TABLE DECIMAL_5

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_6.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_6.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_6.q.out Fri Aug 22 21:36:47 2014
@@ -16,6 +16,7 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL_6_1
 POSTHOOK: query: CREATE TABLE DECIMAL_6_1(key decimal(10,5), value int)
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
@@ -29,6 +30,7 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL_6_2
 POSTHOOK: query: CREATE TABLE DECIMAL_6_2(key decimal(17,4), value int)
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
@@ -89,16 +91,16 @@ NULL
 -0.333
 -0.3
 -0.3
-0
-0
+0.00000
+0.0000
 0
 0
 0.333
 0.333
-1
-1
-1
-1
+1.0
+1.0
+1.0000
+1.00000
 1.12
 1.12
 1.122
@@ -109,14 +111,14 @@ NULL
 3.14
 3.14
 3.14
-3.14
-3.14
+3.140
+3.140
 10
 10
 10.7343
 10.73433
-124
-124
+124.00
+124.00
 125.2
 125.2
 23232.23435

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_join.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_join.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_join.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_join.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- HIVE-5292 Join on dec
 create table src_dec (key decimal(3,0), value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src_dec
 POSTHOOK: query: -- HIVE-5292 Join on decimal columns fails
 
 create table src_dec (key decimal(3,0), value string)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_precision.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_precision.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_precision.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_precision.q.out Fri Aug 22 21:36:47 2014
@@ -8,6 +8,7 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL_PRECISION
 POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal(20,10))
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
@@ -75,13 +76,13 @@ NULL
 NULL
 NULL
 NULL
+0.0000000000
+0.0000000000
+0.0000000000
+0.0000000000
 0
-0
-0
-0
-0
-0.123456789
-0.123456789
+0.1234567890
+0.1234567890
 1.2345678901
 1.2345678901
 1.2345678901
@@ -105,7 +106,7 @@ NULL
 123456789.0123456
 123456789.0123456789
 1234567890.123456
-1234567890.123456789
+1234567890.1234567890
 PREHOOK: query: SELECT dec, dec + 1, dec - 1 FROM DECIMAL_PRECISION ORDER BY dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_precision
@@ -158,13 +159,13 @@ NULL	NULL	NULL
 NULL	NULL	NULL
 NULL	NULL	NULL
 NULL	NULL	NULL
+0.0000000000	1.0000000000	-1.0000000000
+0.0000000000	1.0000000000	-1.0000000000
+0.0000000000	1.0000000000	-1.0000000000
+0.0000000000	1.0000000000	-1.0000000000
 0	1	-1
-0	1	-1
-0	1	-1
-0	1	-1
-0	1	-1
-0.123456789	1.123456789	-0.876543211
-0.123456789	1.123456789	-0.876543211
+0.1234567890	1.1234567890	-0.8765432110
+0.1234567890	1.1234567890	-0.8765432110
 1.2345678901	2.2345678901	0.2345678901
 1.2345678901	2.2345678901	0.2345678901
 1.2345678901	2.2345678901	0.2345678901
@@ -188,7 +189,7 @@ NULL	NULL	NULL
 123456789.0123456	123456790.0123456	123456788.0123456
 123456789.0123456789	123456790.0123456789	123456788.0123456789
 1234567890.123456	1234567891.123456	1234567889.123456
-1234567890.123456789	1234567891.123456789	1234567889.123456789
+1234567890.1234567890	1234567891.1234567890	1234567889.1234567890
 PREHOOK: query: SELECT dec, dec * 2, dec / 3  FROM DECIMAL_PRECISION ORDER BY dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_precision
@@ -241,13 +242,13 @@ NULL	NULL	NULL
 NULL	NULL	NULL
 NULL	NULL	NULL
 NULL	NULL	NULL
+0.0000000000	0.0000000000	0
+0.0000000000	0.0000000000	0
+0.0000000000	0.0000000000	0
+0.0000000000	0.0000000000	0
 0	0	0
-0	0	0
-0	0	0
-0	0	0
-0	0	0
-0.123456789	0.246913578	0.041152263
-0.123456789	0.246913578	0.041152263
+0.1234567890	0.2469135780	0.041152263
+0.1234567890	0.2469135780	0.041152263
 1.2345678901	2.4691357802	0.411522630033
 1.2345678901	2.4691357802	0.411522630033
 1.2345678901	2.4691357802	0.411522630033
@@ -257,9 +258,9 @@ NULL	NULL	NULL
 123.4567890123	246.9135780246	41.1522630041
 123.4567890123	246.9135780246	41.1522630041
 123.4567890123	246.9135780246	41.1522630041
-1234.5678901235	2469.135780247	411.522630041167
-1234.5678901235	2469.135780247	411.522630041167
-1234.5678901235	2469.135780247	411.522630041167
+1234.5678901235	2469.1357802470	411.522630041167
+1234.5678901235	2469.1357802470	411.522630041167
+1234.5678901235	2469.1357802470	411.522630041167
 12345.6789012346	24691.3578024692	4115.226300411533
 12345.6789012346	24691.3578024692	4115.226300411533
 123456.7890123456	246913.5780246912	41152.2630041152
@@ -271,7 +272,7 @@ NULL	NULL	NULL
 123456789.0123456	246913578.0246912	41152263.0041152
 123456789.0123456789	246913578.0246913578	41152263.0041152263
 1234567890.123456	2469135780.246912	411522630.041152
-1234567890.123456789	2469135780.246913578	411522630.041152263
+1234567890.1234567890	2469135780.2469135780	411522630.041152263
 PREHOOK: query: SELECT dec, dec / 9 FROM DECIMAL_PRECISION ORDER BY dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_precision
@@ -324,13 +325,13 @@ NULL	NULL
 NULL	NULL
 NULL	NULL
 NULL	NULL
+0.0000000000	0
+0.0000000000	0
+0.0000000000	0
+0.0000000000	0
 0	0
-0	0
-0	0
-0	0
-0	0
-0.123456789	0.013717421
-0.123456789	0.013717421
+0.1234567890	0.013717421
+0.1234567890	0.013717421
 1.2345678901	0.137174210011
 1.2345678901	0.137174210011
 1.2345678901	0.137174210011
@@ -354,7 +355,7 @@ NULL	NULL
 123456789.0123456	13717421.001371733333
 123456789.0123456789	13717421.0013717421
 1234567890.123456	137174210.013717333333
-1234567890.123456789	137174210.013717421
+1234567890.1234567890	137174210.013717421
 PREHOOK: query: SELECT dec, dec / 27 FROM DECIMAL_PRECISION ORDER BY dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_precision
@@ -407,13 +408,13 @@ NULL	NULL
 NULL	NULL
 NULL	NULL
 NULL	NULL
+0.0000000000	0
+0.0000000000	0
+0.0000000000	0
+0.0000000000	0
 0	0
-0	0
-0	0
-0	0
-0	0
-0.123456789	0.0045724736667
-0.123456789	0.0045724736667
+0.1234567890	0.0045724736667
+0.1234567890	0.0045724736667
 1.2345678901	0.0457247366704
 1.2345678901	0.0457247366704
 1.2345678901	0.0457247366704
@@ -437,7 +438,7 @@ NULL	NULL
 123456789.0123456	4572473.6671239111111
 123456789.0123456789	4572473.6671239140333
 1234567890.123456	45724736.6712391111111
-1234567890.123456789	45724736.6712391403333
+1234567890.1234567890	45724736.6712391403333
 PREHOOK: query: SELECT dec, dec * dec FROM DECIMAL_PRECISION ORDER BY dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_precision
@@ -490,13 +491,13 @@ NULL	NULL
 NULL	NULL
 NULL	NULL
 NULL	NULL
+0.0000000000	0.00000000000000000000
+0.0000000000	0.00000000000000000000
+0.0000000000	0.00000000000000000000
+0.0000000000	0.00000000000000000000
 0	0
-0	0
-0	0
-0	0
-0	0
-0.123456789	0.015241578750190521
-0.123456789	0.015241578750190521
+0.1234567890	0.01524157875019052100
+0.1234567890	0.01524157875019052100
 1.2345678901	1.52415787526596567801
 1.2345678901	1.52415787526596567801
 1.2345678901	1.52415787526596567801
@@ -520,7 +521,7 @@ NULL	NULL
 123456789.0123456	15241578753238817.26870921383936
 123456789.0123456789	15241578753238836.75019051998750190521
 1234567890.123456	NULL
-1234567890.123456789	NULL
+1234567890.1234567890	NULL
 PREHOOK: query: EXPLAIN SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_serde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_serde.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_serde.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_serde.q.out Fri Aug 22 21:36:47 2014
@@ -20,6 +20,7 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL_TEXT
 POSTHOOK: query: CREATE TABLE DECIMAL_TEXT (key decimal, value int) 
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/decimal_udf.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/decimal_udf.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/decimal_udf.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/decimal_udf.q.out Fri Aug 22 21:36:47 2014
@@ -8,6 +8,7 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DECIMAL_UDF
 POSTHOOK: query: CREATE TABLE DECIMAL_UDF (key decimal(20,10), value int)
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
@@ -56,7 +57,7 @@ POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
 -8800
 NULL
-0
+0.0000000000
 0
 200
 20
@@ -75,7 +76,7 @@ NULL
 -0.6
 -0.66
 -0.666
-2
+2.0
 4
 6.28
 -2.24
@@ -83,15 +84,15 @@ NULL
 -2.244
 2.24
 2.244
-248
+248.00
 250.4
 -2510.98
 6.28
 6.28
-6.28
-2
--2469135780.246913578
-2469135780.24691356
+6.280
+2.0000000000
+-2469135780.2469135780
+2469135780.2469135600
 PREHOOK: query: EXPLAIN SELECT key + value FROM DECIMAL_UDF
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN SELECT key + value FROM DECIMAL_UDF
@@ -123,7 +124,7 @@ POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
 0
 NULL
-0
+0.0000000000
 0
 200
 20
@@ -142,7 +143,7 @@ NULL
 -0.3
 -0.33
 -0.333
-2
+2.0
 4
 6.14
 -2.12
@@ -150,15 +151,15 @@ NULL
 -12.122
 2.12
 2.122
-248
+248.00
 250.2
 -2510.49
 6.14
 6.14
-7.14
-2
--2469135780.123456789
-2469135780.12345678
+7.140
+2.0000000000
+-2469135780.1234567890
+2469135780.1234567800
 PREHOOK: query: EXPLAIN SELECT key + (value/2) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN SELECT key + (value/2) FROM DECIMAL_UDF
@@ -326,42 +327,42 @@ POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
 0
 NULL
+0.0000000000
 0
 0
 0
 0
+0.0
+0.00
 0
 0
 0
 0
+0.0
+0.00
+0.0
+0.00
+0.000
+0.0
+0.00
+0.000
+0.0
 0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+0.00
+0.00
+0.00
+0.000
+0.00
+0.000
+0.00
+0.0
+0.00
+0.00
+0.00
+0.000
+0.0000000000
+0.0000000000
+0.0000000000
 PREHOOK: query: EXPLAIN SELECT key - value FROM DECIMAL_UDF
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN SELECT key - value FROM DECIMAL_UDF
@@ -393,7 +394,7 @@ POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
 -8800
 NULL
-0
+0.0000000000
 0
 0
 0
@@ -412,7 +413,7 @@ NULL
 -0.3
 -0.33
 -0.333
-0
+0.0
 0
 0.14
 -0.12
@@ -420,15 +421,15 @@ NULL
 9.878
 0.12
 0.122
-0
+0.00
 0.2
 -0.49
 0.14
 0.14
--0.86
-0
--0.123456789
-0.12345678
+-0.860
+0.0000000000
+-0.1234567890
+0.1234567800
 PREHOOK: query: EXPLAIN SELECT key - (value/2) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN SELECT key - (value/2) FROM DECIMAL_UDF
@@ -596,7 +597,7 @@ POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
 19360000
 NULL
-0
+0.00000000000000000000
 0
 10000
 100
@@ -615,7 +616,7 @@ NULL
 0.09
 0.1089
 0.110889
-1
+1.00
 4
 9.8596
 1.2544
@@ -623,13 +624,13 @@ NULL
 1.258884
 1.2544
 1.258884
-15376
+15376.0000
 15675.04
 1576255.1401
 9.8596
 9.8596
-9.8596
-1
+9.859600
+1.00000000000000000000
 NULL
 NULL
 PREHOOK: query: EXPLAIN SELECT key * value FROM DECIMAL_UDF
@@ -663,26 +664,26 @@ POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
 -19360000
 NULL
-0
+0.0000000000
 0
 10000
 100
 1
-0
-0
+0.0
+0.00
 40000
 400
 4
 0
-0
-0
-0
-0
-0
-0
-0
-0
-1
+0.0
+0.00
+0.0
+0.00
+0.000
+0.0
+0.00
+0.000
+1.0
 4
 9.42
 1.12
@@ -690,15 +691,15 @@ NULL
 12.342
 1.12
 1.122
-15376
-15650
+15376.00
+15650.0
 1575639.95
 9.42
 9.42
-12.56
-1
-1524157875171467887.50190521
-1524157875171467876.3907942
+12.560
+1.0000000000
+1524157875171467887.5019052100
+1524157875171467876.3907942000
 PREHOOK: query: EXPLAIN SELECT key * (value/2) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN SELECT key * (value/2) FROM DECIMAL_UDF
@@ -1022,7 +1023,7 @@ POSTHOOK: Input: default@decimal_udf
 0.785
 1
 1.0000000001
-1.00000000009999999271
+1.000000000099999992710
 PREHOOK: query: EXPLAIN SELECT key / (value/2) FROM DECIMAL_UDF  WHERE value is not null and value <> 0
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN SELECT key / (value/2) FROM DECIMAL_UDF  WHERE value is not null and value <> 0
@@ -1179,7 +1180,7 @@ POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
 4400
 NULL
-0
+0.0000000000
 0
 100
 10
@@ -1198,7 +1199,7 @@ NULL
 0.3
 0.33
 0.333
-1
+1.0
 2
 3.14
 1.12
@@ -1206,15 +1207,15 @@ NULL
 1.122
 1.12
 1.122
-124
+124.00
 125.2
 1255.49
 3.14
 3.14
-3.14
-1
-1234567890.123456789
-1234567890.12345678
+3.140
+1.0000000000
+1234567890.1234567890
+1234567890.1234567800
 PREHOOK: query: -- avg
 EXPLAIN SELECT value, sum(key) / count(key), avg(key), sum(key) FROM DECIMAL_UDF GROUP BY value ORDER BY value
 PREHOOK: type: QUERY
@@ -1303,23 +1304,23 @@ POSTHOOK: query: SELECT value, sum(key) 
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
--1234567890	-1234567890.123456789	-1234567890.123456789	-1234567890.123456789
+-1234567890	-1234567890.123456789	-1234567890.123456789	-1234567890.1234567890
 -1255	-1255.49	-1255.49	-1255.49
 -11	-1.122	-1.122	-1.122
 -1	-1.12	-1.12	-2.24
-0	0.02538461538461538461538	0.02538461538462	0.33
-1	1.0484	1.0484	5.242
+0	0.02538461538461538461538	0.02538461538462	0.3300000000
+1	1.0484	1.0484	5.2420000000
 2	2	2	4
 3	3.14	3.14	9.42
-4	3.14	3.14	3.14
+4	3.14	3.14	3.140
 10	10	10	10
 20	20	20	20
 100	100	100	100
-124	124	124	124
+124	124	124	124.00
 125	125.2	125.2	125.2
 200	200	200	200
 4400	-4400	-4400	-4400
-1234567890	1234567890.12345678	1234567890.12345678	1234567890.12345678
+1234567890	1234567890.12345678	1234567890.12345678	1234567890.1234567800
 PREHOOK: query: -- negative
 EXPLAIN SELECT -key FROM DECIMAL_UDF
 PREHOOK: type: QUERY
@@ -1353,7 +1354,7 @@ POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
 4400
 NULL
-0
+0.0000000000
 0
 -100
 -10
@@ -1372,7 +1373,7 @@ NULL
 0.3
 0.33
 0.333
--1
+-1.0
 -2
 -3.14
 1.12
@@ -1380,15 +1381,15 @@ NULL
 1.122
 -1.12
 -1.122
--124
+-124.00
 -125.2
 1255.49
 -3.14
 -3.14
--3.14
--1
-1234567890.123456789
--1234567890.12345678
+-3.140
+-1.0000000000
+1234567890.1234567890
+-1234567890.1234567800
 PREHOOK: query: -- positive
 EXPLAIN SELECT +key FROM DECIMAL_UDF
 PREHOOK: type: QUERY
@@ -1422,7 +1423,7 @@ POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
 -4400
 NULL
-0
+0.0000000000
 0
 100
 10
@@ -1441,7 +1442,7 @@ NULL
 -0.3
 -0.33
 -0.333
-1
+1.0
 2
 3.14
 -1.12
@@ -1449,15 +1450,15 @@ NULL
 -1.122
 1.12
 1.122
-124
+124.00
 125.2
 -1255.49
 3.14
 3.14
-3.14
-1
--1234567890.123456789
-1234567890.12345678
+3.140
+1.0000000000
+-1234567890.1234567890
+1234567890.1234567800
 PREHOOK: query: -- ceiling
 EXPlAIN SELECT CEIL(key) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
@@ -1627,42 +1628,42 @@ POSTHOOK: query: SELECT ROUND(key, 2) FR
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
--4400
+-4400.00
 NULL
-0
-0
-100
-10
-1
-0.1
+0.00
+0.00
+100.00
+10.00
+1.00
+0.10
 0.01
-200
-20
-2
-0
-0.2
+200.00
+20.00
+2.00
+0.00
+0.20
 0.02
-0.3
+0.30
 0.33
 0.33
--0.3
+-0.30
 -0.33
 -0.33
-1
-2
+1.00
+2.00
 3.14
 -1.12
 -1.12
 -1.12
 1.12
 1.12
-124
-125.2
+124.00
+125.20
 -1255.49
 3.14
 3.14
 3.14
-1
+1.00
 -1234567890.12
 1234567890.12
 PREHOOK: query: -- power
@@ -1771,38 +1772,38 @@ NULL
 NULL
 1
 1
-0
-0
-0
+0.0
+0.00
+0.000
 1
 1
 0
 NULL
+0.0
+0.00
+0.10
+0.010
+0.0010
+0.10
+0.010
+0.0010
+0.0
 0
-0
-0.1
-0.01
-0.001
-0.1
-0.01
-0.001
-0
-0
-1
+1.00
 -0.12
 -0.12
 -0.122
 0.44
 0.439
-1
-1
+1.00
+1.0
 -626.745
-1
-1
-1
-0
+1.00
+1.00
+1.000
+0.0000000000
 -617283944.0617283945
-1
+1.0000000000
 PREHOOK: query: -- stddev, var
 EXPLAIN SELECT value, stddev(key), variance(key) FROM DECIMAL_UDF GROUP BY value
 PREHOOK: type: QUERY
@@ -2094,7 +2095,7 @@ POSTHOOK: query: SELECT MIN(key) FROM DE
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
--1234567890.123456789
+-1234567890.1234567890
 PREHOOK: query: -- max
 EXPLAIN SELECT MAX(key) FROM DECIMAL_UDF
 PREHOOK: type: QUERY
@@ -2157,7 +2158,7 @@ POSTHOOK: query: SELECT MAX(key) FROM DE
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_udf
 #### A masked pattern was here ####
-1234567890.12345678
+1234567890.1234567800
 PREHOOK: query: -- count
 EXPLAIN SELECT COUNT(key) FROM DECIMAL_UDF
 PREHOOK: type: QUERY

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/default_partition_name.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/default_partition_name.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/default_partition_name.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/default_partition_name.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table default_partition_name (key int, value string) partitioned by (ds string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@default_partition_name
 POSTHOOK: query: create table default_partition_name (key int, value string) partitioned by (ds string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/delimiter.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/delimiter.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/delimiter.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/delimiter.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ lines terminated by '\n'
 stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@impressions
 POSTHOOK: query: create table impressions (imp string, msg string)
 row format delimited
 fields terminated by '\t'

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table t1 (a int, b string) partitioned by (c int, d string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
 POSTHOOK: query: create table t1 (a int, b string) partitioned by (c int, d string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/describe_comment_indent.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/describe_comment_indent.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/describe_comment_indent.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/describe_comment_indent.q.out Fri Aug 22 21:36:47 2014
@@ -11,6 +11,7 @@ COMMENT 'table comment
 two lines'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table
 POSTHOOK: query: -- test comment indent processing for multi-line comments
 
 CREATE TABLE test_table(

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- HIVE-2905 showing non
 create table dummy (col1 string, col2 string, col3 string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dummy
 POSTHOOK: query: -- HIVE-2905 showing non-ascii comments
 
 create table dummy (col1 string, col2 string, col3 string)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/describe_database.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/describe_database.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/describe_database.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/describe_database.q.out Fri Aug 22 21:36:47 2014
@@ -1,7 +1,9 @@
 PREHOOK: query: create database test_db with dbproperties ('key1' = 'value1', 'key2' = 'value2')
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:test_db
 POSTHOOK: query: create database test_db with dbproperties ('key1' = 'value1', 'key2' = 'value2')
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:test_db
 PREHOOK: query: desc database extended test_db
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: desc database extended test_db

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/describe_database_json.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/describe_database_json.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/describe_database_json.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/describe_database_json.q.out Fri Aug 22 21:36:47 2014
@@ -1,7 +1,9 @@
 #### A masked pattern was here ####
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:jsondb1
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:jsondb1
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE DATABASE jsondb1
 PREHOOK: type: DESCDATABASE
@@ -33,8 +35,10 @@ POSTHOOK: Input: database:jsondb1
 POSTHOOK: Output: database:jsondb1
 PREHOOK: query: CREATE DATABASE jsondb1
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:jsondb1
 POSTHOOK: query: CREATE DATABASE jsondb1
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:jsondb1
 PREHOOK: query: DESCRIBE DATABASE jsondb1
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: DESCRIBE DATABASE jsondb1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/describe_pretty.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/describe_pretty.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/describe_pretty.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/describe_pretty.q.out Fri Aug 22 21:36:47 2014
@@ -17,6 +17,7 @@ COMMENT 'table comment
 two lines'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table
 POSTHOOK: query: -- test comment indent processing for multi-line comments
 
 CREATE TABLE test_table(
@@ -211,6 +212,7 @@ comment',
     col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table_very_long_column_name
 POSTHOOK: query: CREATE TABLE test_table_very_long_column_name(
     col1 INT COMMENT 'col1 one line comment',
     col2_abcdefghiklmnopqrstuvxyz STRING COMMENT 'col2
@@ -288,6 +290,7 @@ two lines'
 PARTITIONED BY (ds STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table_partitioned
 POSTHOOK: query: CREATE TABLE test_table_partitioned(
     col1 INT COMMENT 'col1 one line comment',
     col2 STRING COMMENT 'col2

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/describe_syntax.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/describe_syntax.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/describe_syntax.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/describe_syntax.q.out Fri Aug 22 21:36:47 2014
@@ -1,18 +1,24 @@
 PREHOOK: query: CREATE DATABASE db1
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db1
 POSTHOOK: query: CREATE DATABASE db1
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db1
 PREHOOK: query: CREATE TABLE db1.t1(key1 INT, value1 STRING) PARTITIONED BY (ds STRING, part STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:db1
+PREHOOK: Output: db1@db1.t1
 POSTHOOK: query: CREATE TABLE db1.t1(key1 INT, value1 STRING) PARTITIONED BY (ds STRING, part STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:db1
+POSTHOOK: Output: db1@db1.t1
 POSTHOOK: Output: db1@t1
 PREHOOK: query: use db1
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:db1
 POSTHOOK: query: use db1
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:db1
 PREHOOK: query: ALTER TABLE t1 ADD PARTITION (ds='3', part='3')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Output: db1@t1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/describe_table.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/describe_table.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/describe_table.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/describe_table.q.out Fri Aug 22 21:36:47 2014
@@ -341,6 +341,7 @@ Storage Desc Params:	 	 
 PREHOOK: query: create table srcpart_serdeprops like srcpart
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@srcpart_serdeprops
 POSTHOOK: query: create table srcpart_serdeprops like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/describe_table_json.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/describe_table_json.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/describe_table_json.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/describe_table_json.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE IF NOT EXISTS jsontable (key INT, value STRING) COMMENT 'json table' STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@jsontable
 POSTHOOK: query: CREATE TABLE IF NOT EXISTS jsontable (key INT, value STRING) COMMENT 'json table' STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/diff_part_input_formats.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/diff_part_input_formats.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/diff_part_input_formats.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/diff_part_input_formats.q.out Fri Aug 22 21:36:47 2014
@@ -4,6 +4,7 @@ PREHOOK: query: -- Tests the case where 
 CREATE TABLE part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@part_test
 POSTHOOK: query: -- Tests the case where a table is changed from sequence file to a RC file,
 -- resulting in partitions in both file formats. If no valid partitions are
 -- selected, then it should still use RC file for reading the dummy partition.

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/disable_file_format_check.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/disable_file_format_check.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/disable_file_format_check.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/disable_file_format_check.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table kv_fileformat_check_txt (key string, value string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@kv_fileformat_check_txt
 POSTHOOK: query: create table kv_fileformat_check_txt (key string, value string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -16,6 +17,7 @@ POSTHOOK: Output: default@kv_fileformat_
 PREHOOK: query: create table kv_fileformat_check_seq (key string, value string) stored as sequencefile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@kv_fileformat_check_seq
 POSTHOOK: query: create table kv_fileformat_check_seq (key string, value string) stored as sequencefile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out Fri Aug 22 21:36:47 2014 differ