Repository: hive Updated Branches: refs/heads/branch-1 a3951ff8a -> a5c5ec3c3
HIVE-12909: Some encryption q-tests fail because trash is disabled in encryption_with_trash.q (Sergio Pena, reviewed by Chaoyu Tang) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/a5c5ec3c Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/a5c5ec3c Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/a5c5ec3c Branch: refs/heads/branch-1 Commit: a5c5ec3c3c9b09349e4aa659d624af69e21d1001 Parents: a3951ff Author: Sergio Pena <sergio.p...@cloudera.com> Authored: Sun Jan 24 17:06:23 2016 -0600 Committer: Sergio Pena <sergio.p...@cloudera.com> Committed: Sun Jan 24 17:06:23 2016 -0600 ---------------------------------------------------------------------- .../clientpositive/encryption_with_trash.q | 33 ----- .../encrypted/encryption_with_trash.q.out | 122 ------------------- 2 files changed, 155 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a5c5ec3c/ql/src/test/queries/clientpositive/encryption_with_trash.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/encryption_with_trash.q b/ql/src/test/queries/clientpositive/encryption_with_trash.q deleted file mode 100644 index 8f8789a..0000000 --- a/ql/src/test/queries/clientpositive/encryption_with_trash.q +++ /dev/null @@ -1,33 +0,0 @@ -set fs.trash.interval=5 - --- SORT_QUERY_RESULTS - --- init -drop table IF EXISTS encryptedTableSrc PURGE; -drop table IF EXISTS unencryptedTable PURGE; - -create table encryptedTableSrc(key string, value string) -LOCATION '${hiveconf:hive.metastore.warehouse.dir}/encryptedTableSrc'; - -create table encryptedTable(key string, value string) partitioned by (ds string) - LOCATION '${hiveconf:hive.metastore.warehouse.dir}/encryptedTable'; -CRYPTO CREATE_KEY --keyName key_1 --bitLength 128; -CRYPTO CREATE_ZONE --keyName key_1 --path ${hiveconf:hive.metastore.warehouse.dir}/encryptedTableSrc; -CRYPTO CREATE_ZONE --keyName key_1 --path ${hiveconf:hive.metastore.warehouse.dir}/encryptedTable; - --- insert src table from values -insert into table encryptedTableSrc values ('501', 'val_501'), ('502', 'val_502'); - -insert into table encryptedTable partition (ds='today') select key, value from encryptedTableSrc; -select count(*) from encryptedTable where ds='today'; -insert into table encryptedTable partition (ds='today') select key, value from encryptedTableSrc; -select count(*) from encryptedTable where ds='today'; - -insert overwrite table encryptedTable partition (ds='today') select key, value from encryptedTableSrc; -select count(*) from encryptedTable where ds='today'; - --- clean up -drop table encryptedTable PURGE; -drop table unencryptedTable PURGE; -CRYPTO DELETE_KEY --keyName key_1; -set fs.trash.interval=0 http://git-wip-us.apache.org/repos/asf/hive/blob/a5c5ec3c/ql/src/test/results/clientpositive/encrypted/encryption_with_trash.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_with_trash.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_with_trash.q.out deleted file mode 100644 index 3d1f75f..0000000 --- a/ql/src/test/results/clientpositive/encrypted/encryption_with_trash.q.out +++ /dev/null @@ -1,122 +0,0 @@ -Warning: Value had a \n character in it. -PREHOOK: query: drop table IF EXISTS unencryptedTable PURGE -PREHOOK: type: DROPTABLE -POSTHOOK: query: drop table IF EXISTS unencryptedTable PURGE -POSTHOOK: type: DROPTABLE -PREHOOK: query: create table encryptedTableSrc(key string, value string) -#### A masked pattern was here #### -PREHOOK: type: CREATETABLE -#### A masked pattern was here #### -PREHOOK: Output: database:default -PREHOOK: Output: default@encryptedTableSrc -POSTHOOK: query: create table encryptedTableSrc(key string, value string) -#### A masked pattern was here #### -POSTHOOK: type: CREATETABLE -#### A masked pattern was here #### -POSTHOOK: Output: database:default -POSTHOOK: Output: default@encryptedTableSrc -PREHOOK: query: create table encryptedTable(key string, value string) partitioned by (ds string) -#### A masked pattern was here #### -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) -#### A masked pattern was here #### -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/encryptedTableSrc' using key: 'key_1' -Encryption zone created: '/build/ql/test/data/warehouse/encryptedTable' using key: 'key_1' -PREHOOK: query: -- insert src table from values -insert into table encryptedTableSrc values ('501', 'val_501'), ('502', 'val_502') -PREHOOK: type: QUERY -PREHOOK: Input: default@values__tmp__table__1 -PREHOOK: Output: default@encryptedtablesrc -POSTHOOK: query: -- insert src table from values -insert into table encryptedTableSrc values ('501', 'val_501'), ('502', 'val_502') -POSTHOOK: type: QUERY -POSTHOOK: Input: default@values__tmp__table__1 -POSTHOOK: Output: default@encryptedtablesrc -POSTHOOK: Lineage: encryptedtablesrc.key SIMPLE [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ] -POSTHOOK: Lineage: encryptedtablesrc.value SIMPLE [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col2, type:string, comment:), ] -PREHOOK: query: insert into table encryptedTable partition (ds='today') select key, value from encryptedTableSrc -PREHOOK: type: QUERY -PREHOOK: Input: default@encryptedtablesrc -PREHOOK: Output: default@encryptedtable@ds=today -POSTHOOK: query: insert into table encryptedTable partition (ds='today') select key, value from encryptedTableSrc -POSTHOOK: type: QUERY -POSTHOOK: Input: default@encryptedtablesrc -POSTHOOK: Output: default@encryptedtable@ds=today -POSTHOOK: Lineage: encryptedtable PARTITION(ds=today).key SIMPLE [(encryptedtablesrc)encryptedtablesrc.FieldSchema(name:key, type:string, comment:null), ] -POSTHOOK: Lineage: encryptedtable PARTITION(ds=today).value SIMPLE [(encryptedtablesrc)encryptedtablesrc.FieldSchema(name:value, type:string, comment:null), ] -PREHOOK: query: select count(*) from encryptedTable where ds='today' -PREHOOK: type: QUERY -PREHOOK: Input: default@encryptedtable -PREHOOK: Input: default@encryptedtable@ds=today -#### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging -POSTHOOK: query: select count(*) from encryptedTable where ds='today' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@encryptedtable -POSTHOOK: Input: default@encryptedtable@ds=today -#### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging -2 -PREHOOK: query: insert into table encryptedTable partition (ds='today') select key, value from encryptedTableSrc -PREHOOK: type: QUERY -PREHOOK: Input: default@encryptedtablesrc -PREHOOK: Output: default@encryptedtable@ds=today -POSTHOOK: query: insert into table encryptedTable partition (ds='today') select key, value from encryptedTableSrc -POSTHOOK: type: QUERY -POSTHOOK: Input: default@encryptedtablesrc -POSTHOOK: Output: default@encryptedtable@ds=today -POSTHOOK: Lineage: encryptedtable PARTITION(ds=today).key SIMPLE [(encryptedtablesrc)encryptedtablesrc.FieldSchema(name:key, type:string, comment:null), ] -POSTHOOK: Lineage: encryptedtable PARTITION(ds=today).value SIMPLE [(encryptedtablesrc)encryptedtablesrc.FieldSchema(name:value, type:string, comment:null), ] -PREHOOK: query: select count(*) from encryptedTable where ds='today' -PREHOOK: type: QUERY -PREHOOK: Input: default@encryptedtable -PREHOOK: Input: default@encryptedtable@ds=today -#### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging -POSTHOOK: query: select count(*) from encryptedTable where ds='today' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@encryptedtable -POSTHOOK: Input: default@encryptedtable@ds=today -#### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging -4 -PREHOOK: query: insert overwrite table encryptedTable partition (ds='today') select key, value from encryptedTableSrc -PREHOOK: type: QUERY -PREHOOK: Input: default@encryptedtablesrc -PREHOOK: Output: default@encryptedtable@ds=today -POSTHOOK: query: insert overwrite table encryptedTable partition (ds='today') select key, value from encryptedTableSrc -POSTHOOK: type: QUERY -POSTHOOK: Input: default@encryptedtablesrc -POSTHOOK: Output: default@encryptedtable@ds=today -POSTHOOK: Lineage: encryptedtable PARTITION(ds=today).key SIMPLE [(encryptedtablesrc)encryptedtablesrc.FieldSchema(name:key, type:string, comment:null), ] -POSTHOOK: Lineage: encryptedtable PARTITION(ds=today).value SIMPLE [(encryptedtablesrc)encryptedtablesrc.FieldSchema(name:value, type:string, comment:null), ] -PREHOOK: query: select count(*) from encryptedTable where ds='today' -PREHOOK: type: QUERY -PREHOOK: Input: default@encryptedtable -PREHOOK: Input: default@encryptedtable@ds=today -#### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging -POSTHOOK: query: select count(*) from encryptedTable where ds='today' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@encryptedtable -POSTHOOK: Input: default@encryptedtable@ds=today -#### A PARTIAL masked pattern was here #### data/warehouse/encryptedTable/.hive-staging -2 -PREHOOK: query: -- clean up -drop table encryptedTable PURGE -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@encryptedtable -PREHOOK: Output: default@encryptedtable -POSTHOOK: query: -- clean up -drop table encryptedTable PURGE -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@encryptedtable -POSTHOOK: Output: default@encryptedtable -PREHOOK: query: drop table unencryptedTable PURGE -PREHOOK: type: DROPTABLE -POSTHOOK: query: drop table unencryptedTable PURGE -POSTHOOK: type: DROPTABLE -Encryption key deleted: 'key_1'