You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2015/01/07 23:42:14 UTC

svn commit: r1650182 - /hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/

Author: brock
Date: Wed Jan  7 22:42:13 2015
New Revision: 1650182

URL: http://svn.apache.org/r1650182
Log:
HIVE-9261 - Update the output files for the encryption qtests since the output format changed (Dong Chen via Brock)

Modified:
    hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
    hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_static.q.out
    hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
    hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
    hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_load_data_to_encrypted_tables.q.out
    hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out
    hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_unencrypted_tbl.q.out

Modified: hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out?rev=1650182&r1=1650181&r2=1650182&view=diff
==============================================================================
--- hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out (original)
+++ hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out Wed Jan  7 22:42:13 2015
@@ -1,34 +1,52 @@
-PREHOOK: query: drop table IF EXISTS encryptedTable
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- init
+drop table IF EXISTS encryptedTable
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table IF EXISTS encryptedTable
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- init
+drop table IF EXISTS encryptedTable
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: drop table IF EXISTS unencryptedTable
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: drop table IF EXISTS unencryptedTable
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table encryptedTable(value string) partitioned by (key string) clustered by (value) into 2 buckets stored as orc location '/build/ql/test/data/warehouse/encryptedTable' TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: create table encryptedTable(value string)
+    partitioned by (key string) clustered by (value) into 2 buckets stored as orc
+    location '/build/ql/test/data/warehouse/encryptedTable' TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
 PREHOOK: Output: default@encryptedTable
-POSTHOOK: query: create table encryptedTable(value string) partitioned by (key string) clustered by (value) into 2 buckets stored as orc location '/build/ql/test/data/warehouse/encryptedTable' TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: create table encryptedTable(value string)
+    partitioned by (key string) clustered by (value) into 2 buckets stored as orc
+    location '/build/ql/test/data/warehouse/encryptedTable' TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@encryptedTable
 Encryption key created: 'key_1'
 Encryption zone created: '/build/ql/test/data/warehouse/encryptedTable' using key: 'key_1'
-PREHOOK: query: create table unencryptedTable(value string) partitioned by (key string) clustered by (value) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: create table unencryptedTable(value string)
+    partitioned by (key string) clustered by (value) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@unencryptedTable
-POSTHOOK: query: create table unencryptedTable(value string) partitioned by (key string) clustered by (value) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: create table unencryptedTable(value string)
+    partitioned by (key string) clustered by (value) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@unencryptedTable
-PREHOOK: query: explain extended insert into table encryptedTable partition (key) values ('val_501', '501'), ('val_502', '502')
+PREHOOK: query: -- insert encrypted table from values
+explain extended insert into table encryptedTable partition (key) values
+    ('val_501', '501'),
+    ('val_502', '502')
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended insert into table encryptedTable partition (key) values ('val_501', '501'), ('val_502', '502')
+POSTHOOK: query: -- insert encrypted table from values
+explain extended insert into table encryptedTable partition (key) values
+    ('val_501', '501'),
+    ('val_502', '502')
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   
@@ -178,11 +196,15 @@ STAGE PLANS:
     Stats-Aggr Operator
 #### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging
 
-PREHOOK: query: insert into table encryptedTable partition (key) values ('val_501', '501'), ('val_502', '502')
+PREHOOK: query: insert into table encryptedTable partition (key) values
+    ('val_501', '501'),
+    ('val_502', '502')
 PREHOOK: type: QUERY
 PREHOOK: Input: default@values__tmp__table__2
 PREHOOK: Output: default@encryptedtable
-POSTHOOK: query: insert into table encryptedTable partition (key) values ('val_501', '501'), ('val_502', '502')
+POSTHOOK: query: insert into table encryptedTable partition (key) values
+    ('val_501', '501'),
+    ('val_502', '502')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@values__tmp__table__2
 POSTHOOK: Output: default@encryptedtable@key=501
@@ -203,9 +225,15 @@ POSTHOOK: Input: default@encryptedtable@
 #### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging
 val_501	501
 val_502	502
-PREHOOK: query: explain extended from src insert into table encryptedTable partition (key) select value, key limit 2
+PREHOOK: query: -- insert encrypted table from unencrypted source
+explain extended from src
+insert into table encryptedTable partition (key)
+    select value, key limit 2
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended from src insert into table encryptedTable partition (key) select value, key limit 2
+POSTHOOK: query: -- insert encrypted table from unencrypted source
+explain extended from src
+insert into table encryptedTable partition (key)
+    select value, key limit 2
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   
@@ -440,11 +468,15 @@ STAGE PLANS:
     Stats-Aggr Operator
 #### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging
 
-PREHOOK: query: from src insert into table encryptedTable partition (key) select value, key limit 2
+PREHOOK: query: from src
+insert into table encryptedTable partition (key)
+    select value, key limit 2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@encryptedtable
-POSTHOOK: query: from src insert into table encryptedTable partition (key) select value, key limit 2
+POSTHOOK: query: from src
+insert into table encryptedTable partition (key)
+    select value, key limit 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@encryptedtable@key=238
@@ -471,9 +503,15 @@ val_238	238
 val_501	501
 val_502	502
 val_86	86
-PREHOOK: query: explain extended from encryptedTable insert into table unencryptedTable partition (key) select value, key
+PREHOOK: query: -- insert unencrypted table from encrypted source
+explain extended from encryptedTable
+insert into table unencryptedTable partition (key)
+    select value, key
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended from encryptedTable insert into table unencryptedTable partition (key) select value, key
+POSTHOOK: query: -- insert unencrypted table from encrypted source
+explain extended from encryptedTable
+insert into table unencryptedTable partition (key)
+    select value, key
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   
@@ -790,7 +828,9 @@ STAGE PLANS:
     Stats-Aggr Operator
 #### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/.hive-staging
 
-PREHOOK: query: from encryptedTable insert into table unencryptedTable partition (key) select value, key
+PREHOOK: query: from encryptedTable
+insert into table unencryptedTable partition (key)
+    select value, key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@encryptedtable
 PREHOOK: Input: default@encryptedtable@key=238
@@ -798,7 +838,9 @@ PREHOOK: Input: default@encryptedtable@k
 PREHOOK: Input: default@encryptedtable@key=502
 PREHOOK: Input: default@encryptedtable@key=86
 PREHOOK: Output: default@unencryptedtable
-POSTHOOK: query: from encryptedTable insert into table unencryptedTable partition (key) select value, key
+POSTHOOK: query: from encryptedTable
+insert into table unencryptedTable partition (key)
+    select value, key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@encryptedtable
 POSTHOOK: Input: default@encryptedtable@key=238
@@ -820,7 +862,7 @@ PREHOOK: Input: default@unencryptedtable
 PREHOOK: Input: default@unencryptedtable@key=501
 PREHOOK: Input: default@unencryptedtable@key=502
 PREHOOK: Input: default@unencryptedtable@key=86
-#### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/.hive-staging
+#### A masked pattern was here ####
 POSTHOOK: query: select * from unencryptedTable order by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@unencryptedtable
@@ -828,16 +870,18 @@ POSTHOOK: Input: default@unencryptedtabl
 POSTHOOK: Input: default@unencryptedtable@key=501
 POSTHOOK: Input: default@unencryptedtable@key=502
 POSTHOOK: Input: default@unencryptedtable@key=86
-#### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/.hive-staging
+#### A masked pattern was here ####
 val_238	238
 val_501	501
 val_502	502
 val_86	86
-PREHOOK: query: drop table encryptedTable
+PREHOOK: query: -- clean up
+drop table encryptedTable
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@encryptedtable
 PREHOOK: Output: default@encryptedtable
-POSTHOOK: query: drop table encryptedTable
+POSTHOOK: query: -- clean up
+drop table encryptedTable
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@encryptedtable
 POSTHOOK: Output: default@encryptedtable

Modified: hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_static.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_static.q.out?rev=1650182&r1=1650181&r2=1650182&view=diff
==============================================================================
--- hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_static.q.out (original)
+++ hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_static.q.out Wed Jan  7 22:42:13 2015
@@ -1,34 +1,54 @@
-PREHOOK: query: drop table IF EXISTS encryptedTable
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- init
+drop table IF EXISTS encryptedTable
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table IF EXISTS encryptedTable
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- init
+drop table IF EXISTS encryptedTable
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: drop table IF EXISTS unencryptedTable
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: drop table IF EXISTS unencryptedTable
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table encryptedTable(key string, value string) partitioned by (ds string) clustered by (key) into 2 buckets stored as orc location '/build/ql/test/data/warehouse/encryptedTable' TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: create table encryptedTable(key string,
+    value string) partitioned by (ds string) clustered by (key) into 2 buckets stored as orc
+    location '/build/ql/test/data/warehouse/encryptedTable' TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
 PREHOOK: Output: default@encryptedTable
-POSTHOOK: query: create table encryptedTable(key string, value string) partitioned by (ds string) clustered by (key) into 2 buckets stored as orc location '/build/ql/test/data/warehouse/encryptedTable' TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: create table encryptedTable(key string,
+    value string) partitioned by (ds string) clustered by (key) into 2 buckets stored as orc
+    location '/build/ql/test/data/warehouse/encryptedTable' TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@encryptedTable
 Encryption key created: 'key_1'
 Encryption zone created: '/build/ql/test/data/warehouse/encryptedTable' using key: 'key_1'
-PREHOOK: query: create table unencryptedTable(key string, value string) partitioned by (ds string) clustered by (key) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: create table unencryptedTable(key string,
+    value string) partitioned by (ds string) clustered by (key) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@unencryptedTable
-POSTHOOK: query: create table unencryptedTable(key string, value string) partitioned by (ds string) clustered by (key) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: create table unencryptedTable(key string,
+    value string) partitioned by (ds string) clustered by (key) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@unencryptedTable
-PREHOOK: query: explain extended insert into table encryptedTable partition (ds='today') values ('501', 'val_501'), ('502', 'val_502')
+PREHOOK: query: -- insert encrypted table from values
+explain extended insert into table encryptedTable partition
+    (ds='today') values
+    ('501', 'val_501'),
+    ('502', 'val_502')
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended insert into table encryptedTable partition (ds='today') values ('501', 'val_501'), ('502', 'val_502')
+POSTHOOK: query: -- insert encrypted table from values
+explain extended insert into table encryptedTable partition
+    (ds='today') values
+    ('501', 'val_501'),
+    ('502', 'val_502')
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   
@@ -180,11 +200,17 @@ STAGE PLANS:
     Stats-Aggr Operator
 #### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/ds=today/.hive-staging
 
-PREHOOK: query: insert into table encryptedTable partition (ds='today') values ('501', 'val_501'), ('502', 'val_502')
+PREHOOK: query: insert into table encryptedTable partition
+    (ds='today') values
+    ('501', 'val_501'),
+    ('502', 'val_502')
 PREHOOK: type: QUERY
 PREHOOK: Input: default@values__tmp__table__2
 PREHOOK: Output: default@encryptedtable@ds=today
-POSTHOOK: query: insert into table encryptedTable partition (ds='today') values ('501', 'val_501'), ('502', 'val_502')
+POSTHOOK: query: insert into table encryptedTable partition
+    (ds='today') values
+    ('501', 'val_501'),
+    ('502', 'val_502')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@values__tmp__table__2
 POSTHOOK: Output: default@encryptedtable@ds=today
@@ -202,9 +228,17 @@ POSTHOOK: Input: default@encryptedtable@
 #### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging
 501	val_501	today
 502	val_502	today
-PREHOOK: query: explain extended from src insert into table encryptedTable partition (ds='yesterday') select * limit 2
+PREHOOK: query: -- insert encrypted table from unencrypted source
+explain extended from src
+insert into table encryptedTable partition
+    (ds='yesterday')
+    select * limit 2
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended from src insert into table encryptedTable partition (ds='yesterday') select * limit 2
+POSTHOOK: query: -- insert encrypted table from unencrypted source
+explain extended from src
+insert into table encryptedTable partition
+    (ds='yesterday')
+    select * limit 2
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   
@@ -437,11 +471,17 @@ STAGE PLANS:
     Stats-Aggr Operator
 #### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/ds=yesterday/.hive-staging
 
-PREHOOK: query: from src insert into table encryptedTable partition (ds='yesterday') select * limit 2
+PREHOOK: query: from src
+insert into table encryptedTable partition
+    (ds='yesterday')
+    select * limit 2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@encryptedtable@ds=yesterday
-POSTHOOK: query: from src insert into table encryptedTable partition (ds='yesterday') select * limit 2
+POSTHOOK: query: from src
+insert into table encryptedTable partition
+    (ds='yesterday')
+    select * limit 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@encryptedtable@ds=yesterday
@@ -463,9 +503,17 @@ POSTHOOK: Input: default@encryptedtable@
 501	val_501	today
 502	val_502	today
 86	val_86	yesterday
-PREHOOK: query: explain extended from encryptedTable insert into table unencryptedTable partition (ds='today') select key, value
+PREHOOK: query: -- insert unencrypted table from encrypted source
+explain extended from encryptedTable
+insert into table unencryptedTable partition
+    (ds='today')
+    select key, value
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended from encryptedTable insert into table unencryptedTable partition (ds='today') select key, value
+POSTHOOK: query: -- insert unencrypted table from encrypted source
+explain extended from encryptedTable
+insert into table unencryptedTable partition
+    (ds='today')
+    select key, value
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   
@@ -503,16 +551,16 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: encryptedtable
-            Statistics: Num rows: 12 Data size: 2575 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 12 Data size: 2583 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Select Operator
               expressions: key (type: string), value (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 12 Data size: 2575 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 12 Data size: 2583 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 sort order: 
                 Map-reduce partition columns: _col0 (type: string)
-                Statistics: Num rows: 12 Data size: 2575 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 12 Data size: 2583 Basic stats: COMPLETE Column stats: NONE
                 tag: -1
                 value expressions: _col0 (type: string), _col1 (type: string)
                 auto parallelism: false
@@ -543,7 +591,7 @@ STAGE PLANS:
               serialization.ddl struct encryptedtable { string key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 1287
+              totalSize 1295
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -621,14 +669,14 @@ STAGE PLANS:
       Needs Tagging: false
       Reduce Operator Tree:
         Extract
-          Statistics: Num rows: 12 Data size: 2575 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 12 Data size: 2583 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 1
 #### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/ds=today/.hive-staging
             NumFilesPerFileSink: 1
             Static Partition Specification: ds=today/
-            Statistics: Num rows: 12 Data size: 2575 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 12 Data size: 2583 Basic stats: COMPLETE Column stats: NONE
 #### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/ds=today/.hive-staging
             table:
                 input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
@@ -686,13 +734,19 @@ STAGE PLANS:
     Stats-Aggr Operator
 #### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/ds=today/.hive-staging
 
-PREHOOK: query: from encryptedTable insert into table unencryptedTable partition (ds='today') select key, value
+PREHOOK: query: from encryptedTable
+insert into table unencryptedTable partition
+    (ds='today')
+    select key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@encryptedtable
 PREHOOK: Input: default@encryptedtable@ds=today
 PREHOOK: Input: default@encryptedtable@ds=yesterday
 PREHOOK: Output: default@unencryptedtable@ds=today
-POSTHOOK: query: from encryptedTable insert into table unencryptedTable partition (ds='today') select key, value
+POSTHOOK: query: from encryptedTable
+insert into table unencryptedTable partition
+    (ds='today')
+    select key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@encryptedtable
 POSTHOOK: Input: default@encryptedtable@ds=today
@@ -704,21 +758,23 @@ PREHOOK: query: select * from unencrypte
 PREHOOK: type: QUERY
 PREHOOK: Input: default@unencryptedtable
 PREHOOK: Input: default@unencryptedtable@ds=today
-#### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/.hive-staging
+#### A masked pattern was here ####
 POSTHOOK: query: select * from unencryptedTable order by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@unencryptedtable
 POSTHOOK: Input: default@unencryptedtable@ds=today
-#### A PARTIAL masked pattern was here #### data/warehouse/unencryptedtable/.hive-staging
+#### A masked pattern was here ####
 238	val_238	today
 501	val_501	today
 502	val_502	today
 86	val_86	today
-PREHOOK: query: drop table encryptedTable
+PREHOOK: query: -- clean up
+drop table encryptedTable
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@encryptedtable
 PREHOOK: Output: default@encryptedtable
-POSTHOOK: query: drop table encryptedTable
+POSTHOOK: query: -- clean up
+drop table encryptedTable
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@encryptedtable
 POSTHOOK: Output: default@encryptedtable

Modified: hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out?rev=1650182&r1=1650181&r2=1650182&view=diff
==============================================================================
--- hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out (original)
+++ hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out Wed Jan  7 22:42:13 2015
@@ -1,19 +1,23 @@
-PREHOOK: query: DROP TABLE IF EXISTS encrypted_table
+PREHOOK: query: --SORT_QUERY_RESULTS
+
+DROP TABLE IF EXISTS encrypted_table
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table
+POSTHOOK: query: --SORT_QUERY_RESULTS
+
+DROP TABLE IF EXISTS encrypted_table
 POSTHOOK: type: DROPTABLE
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
-PREHOOK: Input: /user/hive/warehouse/default/encrypted_table
+#### A masked pattern was here ####
 PREHOOK: Output: database:default
 PREHOOK: Output: default@encrypted_table
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
-POSTHOOK: Input: /user/hive/warehouse/default/encrypted_table
+#### A masked pattern was here ####
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@encrypted_table
 Encryption key created: 'key_128'
-Encryption zone created: '/user/hive/warehouse/default/encrypted_table' using key: 'key_128'
+Encryption zone created: '/build/ql/test/data/warehouse/default/encrypted_table' using key: 'key_128'
 PREHOOK: query: INSERT OVERWRITE TABLE encrypted_table SELECT * FROM src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -27,11 +31,11 @@ POSTHOOK: Lineage: encrypted_table.value
 PREHOOK: query: SELECT * FROM encrypted_table
 PREHOOK: type: QUERY
 PREHOOK: Input: default@encrypted_table
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/default/encrypted_table/.hive-staging
 POSTHOOK: query: SELECT * FROM encrypted_table
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@encrypted_table
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/default/encrypted_table/.hive-staging
 238	val_238
 86	val_86
 311	val_311
@@ -531,7 +535,7 @@ POSTHOOK: Input: default@encrypted_table
 403	val_403
 400	val_400
 200	val_200
-97	val
+97	val_97
 PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM src t1 JOIN encrypted_table t2 WHERE t1.key = t2.key
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN EXTENDED SELECT * FROM src t1 JOIN encrypted_table t2 WHERE t1.key = t2.key
@@ -577,60 +581,60 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: t2
-            Statistics: Num rows: 55 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            alias: t1
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: UDFToDouble(key) is not null (type: boolean)
-              Statistics: Num rows: 28 Data size: 2958 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: UDFToDouble(key) (type: double)
                 sort order: +
                 Map-reduce partition columns: UDFToDouble(key) (type: double)
-                Statistics: Num rows: 28 Data size: 2958 Basic stats: COMPLETE Column stats: NONE
-                tag: 1
-                value expressions: key (type: int), value (type: string)
+                Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE
+                tag: 0
+                value expressions: key (type: string), value (type: string)
                 auto parallelism: false
           TableScan
-            alias: t1
-            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            alias: t2
+            Statistics: Num rows: 55 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: UDFToDouble(key) is not null (type: boolean)
-              Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 28 Data size: 2958 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: UDFToDouble(key) (type: double)
                 sort order: +
                 Map-reduce partition columns: UDFToDouble(key) (type: double)
-                Statistics: Num rows: 15 Data size: 3006 Basic stats: COMPLETE Column stats: NONE
-                tag: 0
-                value expressions: key (type: string), value (type: string)
+                Statistics: Num rows: 28 Data size: 2958 Basic stats: COMPLETE Column stats: NONE
+                tag: 1
+                value expressions: key (type: int), value (type: string)
                 auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
       Path -> Partition:
 #### A masked pattern was here ####
           Partition
-            base file name: src
+            base file name: encrypted_table
             input format: org.apache.hadoop.mapred.TextInputFormat
             output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
             properties:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments defaultdefault
-              columns.types string:string
+              columns.comments 
+              columns.types int:string
 #### A masked pattern was here ####
-              name default.src
-              numFiles 1
+              name default.encrypted_table
+              numFiles 0
               numRows 0
               rawDataSize 0
-              serialization.ddl struct src { string key, string value}
+              serialization.ddl struct encrypted_table { i32 key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              totalSize 5812
+              totalSize 0
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
@@ -640,41 +644,41 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE true
                 bucket_count -1
                 columns key,value
-                columns.comments defaultdefault
-                columns.types string:string
+                columns.comments 
+                columns.types int:string
 #### A masked pattern was here ####
-                name default.src
-                numFiles 1
+                name default.encrypted_table
+                numFiles 0
                 numRows 0
                 rawDataSize 0
-                serialization.ddl struct src { string key, string value}
+                serialization.ddl struct encrypted_table { i32 key, string value}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                totalSize 5812
+                totalSize 0
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              name: default.src
-            name: default.src
+              name: default.encrypted_table
+            name: default.encrypted_table
 #### A masked pattern was here ####
           Partition
-            base file name: encrypted_table
+            base file name: src
             input format: org.apache.hadoop.mapred.TextInputFormat
             output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
             properties:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments 
-              columns.types int:string
+              columns.comments 'default','default'
+              columns.types string:string
 #### A masked pattern was here ####
-              name default.encrypted_table
-              numFiles 0
+              name default.src
+              numFiles 1
               numRows 0
               rawDataSize 0
-              serialization.ddl struct encrypted_table { i32 key, string value}
+              serialization.ddl struct src { string key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              totalSize 0
+              totalSize 5812
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
@@ -684,32 +688,32 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE true
                 bucket_count -1
                 columns key,value
-                columns.comments 
-                columns.types int:string
+                columns.comments 'default','default'
+                columns.types string:string
 #### A masked pattern was here ####
-                name default.encrypted_table
-                numFiles 0
+                name default.src
+                numFiles 1
                 numRows 0
                 rawDataSize 0
-                serialization.ddl struct encrypted_table { i32 key, string value}
+                serialization.ddl struct src { string key, string value}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                totalSize 0
+                totalSize 5812
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              name: default.encrypted_table
-            name: default.encrypted_table
+              name: default.src
+            name: default.src
       Truncated Path -> Alias:
+        /default/encrypted_table [t2]
         /src [t1]
-#### A masked pattern was here ####
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
+          keys:
+            0 UDFToDouble(key) (type: double)
+            1 UDFToDouble(key) (type: double)
           outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 30 Data size: 3253 Basic stats: COMPLETE Column stats: NONE
           Filter Operator
@@ -723,10 +727,10 @@ STAGE PLANS:
               File Output Operator
                 compressed: false
                 GlobalTableId: 0
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/default/encrypted_table/.hive-staging
                 NumFilesPerFileSink: 1
                 Statistics: Num rows: 15 Data size: 1626 Basic stats: COMPLETE Column stats: NONE
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/default/encrypted_table/.hive-staging
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -748,3 +752,12 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
+PREHOOK: query: drop table encrypted_table
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@encrypted_table
+PREHOOK: Output: default@encrypted_table
+POSTHOOK: query: drop table encrypted_table
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@encrypted_table
+POSTHOOK: Output: default@encrypted_table
+Encryption key deleted: 'key_128'

Modified: hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out?rev=1650182&r1=1650181&r2=1650182&view=diff
==============================================================================
--- hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out (original)
+++ hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out Wed Jan  7 22:42:13 2015
@@ -1,35 +1,41 @@
-PREHOOK: query: DROP TABLE IF EXISTS table_key_1
+PREHOOK: query: --SORT_QUERY_RESULTS
+
+-- Java JCE must be installed in order to hava a key length of 256 bits
+DROP TABLE IF EXISTS table_key_1
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE IF EXISTS table_key_1
+POSTHOOK: query: --SORT_QUERY_RESULTS
+
+-- Java JCE must be installed in order to hava a key length of 256 bits
+DROP TABLE IF EXISTS table_key_1
 POSTHOOK: type: DROPTABLE
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
-PREHOOK: Input: /user/hive/warehouse/table_key_1
+#### A masked pattern was here ####
 PREHOOK: Output: database:default
 PREHOOK: Output: default@table_key_1
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
-POSTHOOK: Input: /user/hive/warehouse/table_key_1
+#### A masked pattern was here ####
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_key_1
 Encryption key created: 'key_1'
-Encryption zone created: '/user/hive/warehouse/table_key_1' using key: 'key_1'
+Encryption zone created: '/build/ql/test/data/warehouse/table_key_1' using key: 'key_1'
 PREHOOK: query: DROP TABLE IF EXISTS table_key_2
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE IF EXISTS table_key_2
 POSTHOOK: type: DROPTABLE
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
-PREHOOK: Input: /user/hive/warehouse/table_key_2
+#### A masked pattern was here ####
 PREHOOK: Output: database:default
 PREHOOK: Output: default@table_key_2
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
-POSTHOOK: Input: /user/hive/warehouse/table_key_2
+#### A masked pattern was here ####
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_key_2
 Encryption key created: 'key_2'
-Encryption zone created: '/user/hive/warehouse/table_key_2' using key: 'key_2'
+Encryption zone created: '/build/ql/test/data/warehouse/table_key_2' using key: 'key_2'
 PREHOOK: query: INSERT OVERWRITE TABLE table_key_1 SELECT * FROM src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -95,7 +101,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: t2
+            alias: t1
             Statistics: Num rows: 55 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -107,11 +113,11 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: int)
                 Statistics: Num rows: 28 Data size: 2958 Basic stats: COMPLETE Column stats: NONE
-                tag: 1
+                tag: 0
                 value expressions: value (type: string)
                 auto parallelism: false
           TableScan
-            alias: t1
+            alias: t2
             Statistics: Num rows: 55 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -123,7 +129,7 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: int)
                 Statistics: Num rows: 28 Data size: 2958 Basic stats: COMPLETE Column stats: NONE
-                tag: 0
+                tag: 1
                 value expressions: value (type: string)
                 auto parallelism: false
       Path -> Alias:
@@ -138,17 +144,17 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types int:string
 #### A masked pattern was here ####
               name default.table_key_1
-              numFiles 0
+              numFiles 1
               numRows 0
               rawDataSize 0
               serialization.ddl struct table_key_1 { i32 key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              totalSize 0
+              totalSize 5812
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
@@ -158,17 +164,17 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE true
                 bucket_count -1
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types int:string
 #### A masked pattern was here ####
                 name default.table_key_1
-                numFiles 0
+                numFiles 1
                 numRows 0
                 rawDataSize 0
                 serialization.ddl struct table_key_1 { i32 key, string value}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                totalSize 0
+                totalSize 5812
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.table_key_1
@@ -182,17 +188,17 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns key,value
-              columns.comments 
+              columns.comments 
               columns.types int:string
 #### A masked pattern was here ####
               name default.table_key_2
-              numFiles 0
+              numFiles 1
               numRows 0
               rawDataSize 0
               serialization.ddl struct table_key_2 { i32 key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              totalSize 0
+              totalSize 5812
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
@@ -202,31 +208,32 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE true
                 bucket_count -1
                 columns key,value
-                columns.comments 
+                columns.comments 
                 columns.types int:string
 #### A masked pattern was here ####
                 name default.table_key_2
-                numFiles 0
+                numFiles 1
                 numRows 0
                 rawDataSize 0
                 serialization.ddl struct table_key_2 { i32 key, string value}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                totalSize 0
+                totalSize 5812
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.table_key_2
             name: default.table_key_2
       Truncated Path -> Alias:
-#### A masked pattern was here ####
+        /table_key_1 [t1]
+        /table_key_2 [t2]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0} {VALUE._col0}
-            1 {KEY.reducesinkkey0} {VALUE._col0}
+          keys:
+            0 key (type: int)
+            1 key (type: int)
           outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 30 Data size: 3253 Basic stats: COMPLETE Column stats: NONE
           Filter Operator
@@ -240,10 +247,10 @@ STAGE PLANS:
               File Output Operator
                 compressed: false
                 GlobalTableId: 0
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/table_key_2/.hive-staging
                 NumFilesPerFileSink: 1
                 Statistics: Num rows: 15 Data size: 1626 Basic stats: COMPLETE Column stats: NONE
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/table_key_2/.hive-staging
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -269,12 +276,12 @@ PREHOOK: query: SELECT * FROM table_key_
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_key_1
 PREHOOK: Input: default@table_key_2
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/table_key_2/.hive-staging
 POSTHOOK: query: SELECT * FROM table_key_1 t1 JOIN table_key_2 t2 WHERE (t1.key = t2.key)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table_key_1
 POSTHOOK: Input: default@table_key_2
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/table_key_2/.hive-staging
 0	val_0	0	val_0
 0	val_0	0	val_0
 0	val_0	0	val_0
@@ -415,9 +422,9 @@ POSTHOOK: Input: default@table_key_2
 95	val_95	95	val_95
 95	val_95	95	val_95
 96	val_96	96	val_96
-97	val	97	val
-97	val	97	val_97
-97	val_97	97	val
+97	val_97	97	val_97
+97	val_97	97	val_97
+97	val_97	97	val_97
 97	val_97	97	val_97
 98	val_98	98	val_98
 98	val_98	98	val_98
@@ -1302,7 +1309,7 @@ POSTHOOK: Input: default@table_key_2
 498	val_498	498	val_498
 498	val_498	498	val_498
 498	val_498	498	val_498
-498	val_498	NULL	NULL
+498	val_498	498	val_498
 PREHOOK: query: DROP TABLE table_key_1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@table_key_1

Modified: hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_load_data_to_encrypted_tables.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_load_data_to_encrypted_tables.q.out?rev=1650182&r1=1650181&r2=1650182&view=diff
==============================================================================
--- hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_load_data_to_encrypted_tables.q.out (original)
+++ hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_load_data_to_encrypted_tables.q.out Wed Jan  7 22:42:13 2015
@@ -4,16 +4,16 @@ POSTHOOK: query: DROP TABLE IF EXISTS en
 POSTHOOK: type: DROPTABLE
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
-PREHOOK: Input: /user/hive/warehouse/encrypted_table
+#### A masked pattern was here ####
 PREHOOK: Output: database:default
 PREHOOK: Output: default@encrypted_table
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
-POSTHOOK: Input: /user/hive/warehouse/encrypted_table
+#### A masked pattern was here ####
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@encrypted_table
 Encryption key created: 'key1'
-Encryption zone created: '/user/hive/warehouse/encrypted_table' using key: 'key1'
+Encryption zone created: '/build/ql/test/data/warehouse/encrypted_table' using key: 'key1'
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE encrypted_table
 PREHOOK: type: LOAD
 #### A masked pattern was here ####
@@ -25,11 +25,11 @@ POSTHOOK: Output: default@encrypted_tabl
 PREHOOK: query: SELECT * FROM encrypted_table
 PREHOOK: type: QUERY
 PREHOOK: Input: default@encrypted_table
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/encrypted_table/.hive-staging
 POSTHOOK: query: SELECT * FROM encrypted_table
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@encrypted_table
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/encrypted_table/.hive-staging
 238	val_238
 86	val_86
 311	val_311
@@ -541,11 +541,11 @@ POSTHOOK: Output: default@encrypted_tabl
 PREHOOK: query: SELECT * FROM encrypted_table
 PREHOOK: type: QUERY
 PREHOOK: Input: default@encrypted_table
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/encrypted_table/.hive-staging
 POSTHOOK: query: SELECT * FROM encrypted_table
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@encrypted_table
-#### A masked pattern was here ####
+#### A PARTIAL masked pattern was here #### data/warehouse/encrypted_table/.hive-staging
 238	val_238
 86	val_86
 311	val_311

Modified: hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out?rev=1650182&r1=1650181&r2=1650182&view=diff
==============================================================================
--- hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out (original)
+++ hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out Wed Jan  7 22:42:13 2015
@@ -17,7 +17,7 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@encrypted_table
 Encryption key created: 'key_128'
-Encryption zone created: '/user/hive/warehouse/default/encrypted_table' using key: 'key_128'
+Encryption zone created: '/build/ql/test/data/warehouse/default/encrypted_table' using key: 'key_128'
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE encrypted_table
 PREHOOK: type: LOAD
 #### A masked pattern was here ####
@@ -35,3 +35,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@encrypted_table
 #### A masked pattern was here ####
 500
+PREHOOK: query: drop table encrypted_table
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@encrypted_table
+PREHOOK: Output: default@encrypted_table
+POSTHOOK: query: drop table encrypted_table
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@encrypted_table
+POSTHOOK: Output: default@encrypted_table

Modified: hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_unencrypted_tbl.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_unencrypted_tbl.q.out?rev=1650182&r1=1650181&r2=1650182&view=diff
==============================================================================
--- hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_unencrypted_tbl.q.out (original)
+++ hive/branches/HIVE-8065/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_unencrypted_tbl.q.out Wed Jan  7 22:42:13 2015
@@ -33,3 +33,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@unencrypted_table
 #### A masked pattern was here ####
 500
+PREHOOK: query: drop table unencrypted_table
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@unencrypted_table
+PREHOOK: Output: default@unencrypted_table
+POSTHOOK: query: drop table unencrypted_table
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@unencrypted_table
+POSTHOOK: Output: default@unencrypted_table