Repository: hive Updated Branches: refs/heads/branch-3 c7386550e -> 7a41f0b52
http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_handler_bulk.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_handler_bulk.q.out b/hbase-handler/src/test/results/positive/hbase_handler_bulk.q.out index 0b8c853..de1c139 100644 --- a/hbase-handler/src/test/results/positive/hbase_handler_bulk.q.out +++ b/hbase-handler/src/test/results/positive/hbase_handler_bulk.q.out @@ -2,17 +2,17 @@ PREHOOK: query: drop table if exists hb_target PREHOOK: type: DROPTABLE POSTHOOK: query: drop table if exists hb_target POSTHOOK: type: DROPTABLE -PREHOOK: query: create external table hb_target(key int, val string) +PREHOOK: query: create table hb_target(key int, val string) stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' with serdeproperties ('hbase.columns.mapping' = ':key,cf:val') -tblproperties ('hbase.table.name' = 'positive_hbase_handler_bulk', 'external.table.purge' = 'true') +tblproperties ('hbase.table.name' = 'positive_hbase_handler_bulk') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hb_target -POSTHOOK: query: create external table hb_target(key int, val string) +POSTHOOK: query: create table hb_target(key int, val string) stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' with serdeproperties ('hbase.columns.mapping' = ':key,cf:val') -tblproperties ('hbase.table.name' = 'positive_hbase_handler_bulk', 'external.table.purge' = 'true') +tblproperties ('hbase.table.name' = 'positive_hbase_handler_bulk') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hb_target @@ -33,17 +33,17 @@ POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@hb_target POSTHOOK: Output: default@hb_target #### A masked pattern was here #### -PREHOOK: query: create external table hb_target(key int, val string) +PREHOOK: query: create table hb_target(key int, val string) stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' with serdeproperties ('hbase.columns.mapping' = ':key,cf:val') -tblproperties ('hbase.table.name' = 'positive_hbase_handler_bulk', 'external.table.purge' = 'true') +tblproperties ('hbase.table.name' = 'positive_hbase_handler_bulk') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hb_target -POSTHOOK: query: create external table hb_target(key int, val string) +POSTHOOK: query: create table hb_target(key int, val string) stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' with serdeproperties ('hbase.columns.mapping' = ':key,cf:val') -tblproperties ('hbase.table.name' = 'positive_hbase_handler_bulk', 'external.table.purge' = 'true') +tblproperties ('hbase.table.name' = 'positive_hbase_handler_bulk') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hb_target http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_joins.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_joins.q.out b/hbase-handler/src/test/results/positive/hbase_joins.q.out index a591c4e..697675e 100644 --- a/hbase-handler/src/test/results/positive/hbase_joins.q.out +++ b/hbase-handler/src/test/results/positive/hbase_joins.q.out @@ -14,57 +14,51 @@ PREHOOK: query: DROP TABLE users_level PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE users_level POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE users(key string, state string, country string, country_id int) +PREHOOK: query: CREATE TABLE users(key string, state string, country string, country_id int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:state,info:country,info:country_id" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@users -POSTHOOK: query: CREATE EXTERNAL TABLE users(key string, state string, country string, country_id int) +POSTHOOK: query: CREATE TABLE users(key string, state string, country string, country_id int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:state,info:country,info:country_id" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@users -PREHOOK: query: CREATE EXTERNAL TABLE states(key string, name string) +PREHOOK: query: CREATE TABLE states(key string, name string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "state:name" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@states -POSTHOOK: query: CREATE EXTERNAL TABLE states(key string, name string) +POSTHOOK: query: CREATE TABLE states(key string, name string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "state:name" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@states -PREHOOK: query: CREATE EXTERNAL TABLE countries(key string, name string, country string, country_id int) +PREHOOK: query: CREATE TABLE countries(key string, name string, country string, country_id int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:name,info:country,info:country_id" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@countries -POSTHOOK: query: CREATE EXTERNAL TABLE countries(key string, name string, country string, country_id int) +POSTHOOK: query: CREATE TABLE countries(key string, name string, country string, country_id int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:name,info:country,info:country_id" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@countries @@ -224,31 +218,27 @@ POSTHOOK: query: DROP TABLE countries POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@countries POSTHOOK: Output: default@countries -PREHOOK: query: CREATE EXTERNAL TABLE users(key int, userid int, username string, created int) +PREHOOK: query: CREATE TABLE users(key int, userid int, username string, created int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:nickname,f:created") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@users -POSTHOOK: query: CREATE EXTERNAL TABLE users(key int, userid int, username string, created int) +POSTHOOK: query: CREATE TABLE users(key int, userid int, username string, created int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:nickname,f:created") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@users -PREHOOK: query: CREATE EXTERNAL TABLE users_level(key int, userid int, level int) +PREHOOK: query: CREATE TABLE users_level(key int, userid int, level int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:level") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@users_level -POSTHOOK: query: CREATE EXTERNAL TABLE users_level(key int, userid int, level int) +POSTHOOK: query: CREATE TABLE users_level(key int, userid int, level int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:level") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@users_level http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_null_first_col.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_null_first_col.q.out b/hbase-handler/src/test/results/positive/hbase_null_first_col.q.out index 47f56fc..bb4491b 100644 --- a/hbase-handler/src/test/results/positive/hbase_null_first_col.q.out +++ b/hbase-handler/src/test/results/positive/hbase_null_first_col.q.out @@ -22,21 +22,19 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE s POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@src_null -PREHOOK: query: CREATE EXTERNAL TABLE hbase_null(key string, col1 string, col2 string) +PREHOOK: query: CREATE TABLE hbase_null(key string, col1 string, col2 string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = ":key,cf1:c1,cf1:c2" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_null -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_null(key string, col1 string, col2 string) +POSTHOOK: query: CREATE TABLE hbase_null(key string, col1 string, col2 string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = ":key,cf1:c1,cf1:c2" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_null http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out b/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out index 47327e5..0744caf 100644 --- a/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out +++ b/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out @@ -14,19 +14,17 @@ PREHOOK: query: drop view if exists hive1_view_data_hbase2 PREHOOK: type: DROPVIEW POSTHOOK: query: drop view if exists hive1_view_data_hbase2 POSTHOOK: type: DROPVIEW -PREHOOK: query: CREATE EXTERNAL TABLE hive1_tbl_data_hbase1 (COLUMID string,COLUMN_FN string,COLUMN_LN string,EMAIL string,COL_UPDATED_DATE timestamp, PK_COLUM string) +PREHOOK: query: CREATE TABLE hive1_tbl_data_hbase1 (COLUMID string,COLUMN_FN string,COLUMN_LN string,EMAIL string,COL_UPDATED_DATE timestamp, PK_COLUM string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES("hbase.columns.mapping" = "default:COLUMID,default:COLUMN_FN,default:COLUMN_LN,default:EMAIL,default:COL_UPDATED_DATE,:key" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hive1_tbl_data_hbase1 -POSTHOOK: query: CREATE EXTERNAL TABLE hive1_tbl_data_hbase1 (COLUMID string,COLUMN_FN string,COLUMN_LN string,EMAIL string,COL_UPDATED_DATE timestamp, PK_COLUM string) +POSTHOOK: query: CREATE TABLE hive1_tbl_data_hbase1 (COLUMID string,COLUMN_FN string,COLUMN_LN string,EMAIL string,COL_UPDATED_DATE timestamp, PK_COLUM string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES("hbase.columns.mapping" = "default:COLUMID,default:COLUMN_FN,default:COLUMN_LN,default:EMAIL,default:COL_UPDATED_DATE,:key" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hive1_tbl_data_hbase1 @@ -66,19 +64,17 @@ POSTHOOK: query: insert into table hive1_tbl_data_hbase1 select '00001','john',' POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@hive1_tbl_data_hbase1 -PREHOOK: query: CREATE EXTERNAL TABLE hive1_tbl_data_hbase2 (COLUMID string,COLUMN_FN string,COLUMN_LN string,EMAIL string,COL_UPDATED_DATE timestamp, PK_COLUM string) +PREHOOK: query: CREATE TABLE hive1_tbl_data_hbase2 (COLUMID string,COLUMN_FN string,COLUMN_LN string,EMAIL string,COL_UPDATED_DATE timestamp, PK_COLUM string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES("hbase.columns.mapping" = "default:COLUMID,default:COLUMN_FN,default:COLUMN_LN,default:EMAIL,default:COL_UPDATED_DATE,:key" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hive1_tbl_data_hbase2 -POSTHOOK: query: CREATE EXTERNAL TABLE hive1_tbl_data_hbase2 (COLUMID string,COLUMN_FN string,COLUMN_LN string,EMAIL string,COL_UPDATED_DATE timestamp, PK_COLUM string) +POSTHOOK: query: CREATE TABLE hive1_tbl_data_hbase2 (COLUMID string,COLUMN_FN string,COLUMN_LN string,EMAIL string,COL_UPDATED_DATE timestamp, PK_COLUM string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES("hbase.columns.mapping" = "default:COLUMID,default:COLUMN_FN,default:COLUMN_LN,default:EMAIL,default:COL_UPDATED_DATE,:key" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hive1_tbl_data_hbase2 http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out b/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out index 4d44d1d..75294ed 100644 --- a/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out +++ b/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out @@ -1,14 +1,12 @@ -PREHOOK: query: CREATE EXTERNAL TABLE hbase_pushdown(key string, value string) +PREHOOK: query: CREATE TABLE hbase_pushdown(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_pushdown -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_pushdown(key string, value string) +POSTHOOK: query: CREATE TABLE hbase_pushdown(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_pushdown http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_pushdown.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_pushdown.q.out b/hbase-handler/src/test/results/positive/hbase_pushdown.q.out index 909a5fa..2816164 100644 --- a/hbase-handler/src/test/results/positive/hbase_pushdown.q.out +++ b/hbase-handler/src/test/results/positive/hbase_pushdown.q.out @@ -1,14 +1,12 @@ -PREHOOK: query: CREATE EXTERNAL TABLE hbase_pushdown(key int, value string) +PREHOOK: query: CREATE TABLE hbase_pushdown(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_pushdown -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_pushdown(key int, value string) +POSTHOOK: query: CREATE TABLE hbase_pushdown(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_pushdown http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_queries.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_queries.q.out b/hbase-handler/src/test/results/positive/hbase_queries.q.out index a746dcc..eb91bf9 100644 --- a/hbase-handler/src/test/results/positive/hbase_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out @@ -2,17 +2,17 @@ PREHOOK: query: DROP TABLE hbase_table_1 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE hbase_table_1 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_1(key int comment 'It is a column key', value string comment 'It is the column string value') +PREHOOK: query: CREATE TABLE hbase_table_1(key int comment 'It is a column key', value string comment 'It is the column string value') STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") -TBLPROPERTIES ("hbase.table.name" = "hbase_table_0", "external.table.purge" = "true") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_1 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_1(key int comment 'It is a column key', value string comment 'It is the column string value') +POSTHOOK: query: CREATE TABLE hbase_table_1(key int comment 'It is a column key', value string comment 'It is the column string value') STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") -TBLPROPERTIES ("hbase.table.name" = "hbase_table_0", "external.table.purge" = "true") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_1 @@ -393,17 +393,15 @@ PREHOOK: query: DROP TABLE empty_hbase_table PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE empty_hbase_table POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE empty_hbase_table(key int, value string) +PREHOOK: query: CREATE TABLE empty_hbase_table(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@empty_hbase_table -POSTHOOK: query: CREATE EXTERNAL TABLE empty_hbase_table(key int, value string) +POSTHOOK: query: CREATE TABLE empty_hbase_table(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@empty_hbase_table @@ -467,21 +465,19 @@ POSTHOOK: Input: default@src #### A masked pattern was here #### 155 500 -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_3(key int, value string, count int) +PREHOOK: query: CREATE TABLE hbase_table_3(key int, value string, count int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "cf:val,cf2:count" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_3 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_3(key int, value string, count int) +POSTHOOK: query: CREATE TABLE hbase_table_3(key int, value string, count int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "cf:val,cf2:count" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_3 @@ -667,21 +663,19 @@ PREHOOK: query: DROP TABLE hbase_table_4 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE hbase_table_4 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_4(key int, value1 string, value2 int, value3 int) +PREHOOK: query: CREATE TABLE hbase_table_4(key int, value1 string, value2 int, value3 int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "a:b,a:c,d:e" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_4 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_4(key int, value1 string, value2 int, value3 int) +POSTHOOK: query: CREATE TABLE hbase_table_4(key int, value1 string, value2 int, value3 int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "a:b,a:c,d:e" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_4 @@ -737,21 +731,19 @@ PREHOOK: query: DROP TABLE hbase_table_6 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE hbase_table_6 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_6(key int, value map<string,string>) +PREHOOK: query: CREATE TABLE hbase_table_6(key int, value map<string,string>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = ":key,cf:" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_6 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_6(key int, value map<string,string>) +POSTHOOK: query: CREATE TABLE hbase_table_6(key int, value map<string,string>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = ":key,cf:" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_6 @@ -779,21 +771,19 @@ PREHOOK: query: DROP TABLE hbase_table_7 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE hbase_table_7 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_7(value map<string,string>, key int) +PREHOOK: query: CREATE TABLE hbase_table_7(value map<string,string>, key int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "cf:,:key" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_7 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_7(value map<string,string>, key int) +POSTHOOK: query: CREATE TABLE hbase_table_7(value map<string,string>, key int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "cf:,:key" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_7 @@ -823,21 +813,19 @@ PREHOOK: query: DROP TABLE hbase_table_8 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE hbase_table_8 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_8(key int, value1 string, value2 int, value3 int) +PREHOOK: query: CREATE TABLE hbase_table_8(key int, value1 string, value2 int, value3 int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "a:b,a:c,d:e" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_8 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_8(key int, value1 string, value2 int, value3 int) +POSTHOOK: query: CREATE TABLE hbase_table_8(key int, value1 string, value2 int, value3 int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "a:b,a:c,d:e" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_8 @@ -967,17 +955,15 @@ PREHOOK: query: DROP TABLE IF EXISTS hbase_table_9 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_9 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_9 (id bigint, data map<string, string>, str string) +PREHOOK: query: CREATE TABLE hbase_table_9 (id bigint, data map<string, string>, str string) stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' with serdeproperties ("hbase.columns.mapping" = ":key,cf:map_col#s:s,cf:str_col") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_9 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_9 (id bigint, data map<string, string>, str string) +POSTHOOK: query: CREATE TABLE hbase_table_9 (id bigint, data map<string, string>, str string) stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' with serdeproperties ("hbase.columns.mapping" = ":key,cf:map_col#s:s,cf:str_col") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_9 @@ -1038,17 +1024,15 @@ PREHOOK: query: DROP TABLE IF EXISTS hbase_table_10 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_10 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_10 (id bigint, data map<int, int>, str string) +PREHOOK: query: CREATE TABLE hbase_table_10 (id bigint, data map<int, int>, str string) stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' with serdeproperties ("hbase.columns.mapping" = ":key,cf:map_col2,cf:str2_col") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_10 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_10 (id bigint, data map<int, int>, str string) +POSTHOOK: query: CREATE TABLE hbase_table_10 (id bigint, data map<int, int>, str string) stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' with serdeproperties ("hbase.columns.mapping" = ":key,cf:map_col2,cf:str2_col") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_10 @@ -1109,17 +1093,15 @@ PREHOOK: query: DROP TABLE IF EXISTS hbase_table_11 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_11 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_11(id INT, map_column STRUCT<s_int:INT,s_string:STRING,s_date:DATE>) +PREHOOK: query: CREATE TABLE hbase_table_11(id INT, map_column STRUCT<s_int:INT,s_string:STRING,s_date:DATE>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ('hbase.columns.mapping'=':key,id:id') -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_11 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_11(id INT, map_column STRUCT<s_int:INT,s_string:STRING,s_date:DATE>) +POSTHOOK: query: CREATE TABLE hbase_table_11(id INT, map_column STRUCT<s_int:INT,s_string:STRING,s_date:DATE>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ('hbase.columns.mapping'=':key,id:id') -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_11 @@ -1144,17 +1126,15 @@ PREHOOK: query: DROP TABLE IF EXISTS hbase_table_12 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_12 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_12(id INT, list_column ARRAY <STRING>) +PREHOOK: query: CREATE TABLE hbase_table_12(id INT, list_column ARRAY <STRING>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ('hbase.columns.mapping'=':key,id:id') -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_12 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_12(id INT, list_column ARRAY <STRING>) +POSTHOOK: query: CREATE TABLE hbase_table_12(id INT, list_column ARRAY <STRING>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ('hbase.columns.mapping'=':key,id:id') -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_12 http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_scan_params.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_scan_params.q.out b/hbase-handler/src/test/results/positive/hbase_scan_params.q.out index 5ae8b1a..1ccaba0 100644 --- a/hbase-handler/src/test/results/positive/hbase_scan_params.q.out +++ b/hbase-handler/src/test/results/positive/hbase_scan_params.q.out @@ -1,16 +1,14 @@ -PREHOOK: query: CREATE EXTERNAL TABLE hbase_pushdown(key int, value string) +PREHOOK: query: CREATE TABLE hbase_pushdown(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string", "hbase.scan.cache" = "500", "hbase.scan.cacheblocks" = "true", "hbase.scan.batch" = "1") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_pushdown -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_pushdown(key int, value string) +POSTHOOK: query: CREATE TABLE hbase_pushdown(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string", "hbase.scan.cache" = "500", "hbase.scan.cacheblocks" = "true", "hbase.scan.batch" = "1") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_pushdown http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out b/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out index 7982f22..86a9fea 100644 --- a/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out +++ b/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out @@ -6,17 +6,15 @@ POSTHOOK: query: CREATE TABLE src_x1(key string, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@src_x1 -PREHOOK: query: CREATE EXTERNAL TABLE src_x2(key string, value string) +PREHOOK: query: CREATE TABLE src_x2(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key, cf:value") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@src_x2 -POSTHOOK: query: CREATE EXTERNAL TABLE src_x2(key string, value string) +POSTHOOK: query: CREATE TABLE src_x2(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key, cf:value") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@src_x2 http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_timestamp.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_timestamp.q.out b/hbase-handler/src/test/results/positive/hbase_timestamp.q.out index 9318cd7..6e7d7e6 100644 --- a/hbase-handler/src/test/results/positive/hbase_timestamp.q.out +++ b/hbase-handler/src/test/results/positive/hbase_timestamp.q.out @@ -2,17 +2,15 @@ PREHOOK: query: DROP TABLE hbase_table PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE hbase_table POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table (key string, value string, `time` timestamp) +PREHOOK: query: CREATE TABLE hbase_table (key string, value string, `time` timestamp) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string,:timestamp") - TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table (key string, value string, `time` timestamp) +POSTHOOK: query: CREATE TABLE hbase_table (key string, value string, `time` timestamp) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string,:timestamp") - TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table @@ -71,17 +69,15 @@ POSTHOOK: query: DROP TABLE hbase_table POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@hbase_table POSTHOOK: Output: default@hbase_table -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table (key string, value string, `time` bigint) +PREHOOK: query: CREATE TABLE hbase_table (key string, value string, `time` bigint) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string,:timestamp") - TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table (key string, value string, `time` bigint) +POSTHOOK: query: CREATE TABLE hbase_table (key string, value string, `time` bigint) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string,:timestamp") - TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table @@ -129,17 +125,15 @@ POSTHOOK: query: DROP TABLE hbase_table POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@hbase_table POSTHOOK: Output: default@hbase_table -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table (key string, value string, `time` bigint) +PREHOOK: query: CREATE TABLE hbase_table (key string, value string, `time` bigint) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string,:timestamp") - TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table (key string, value string, `time` bigint) +POSTHOOK: query: CREATE TABLE hbase_table (key string, value string, `time` bigint) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string,:timestamp") - TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table @@ -369,17 +363,15 @@ POSTHOOK: query: DROP TABLE hbase_table POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@hbase_table POSTHOOK: Output: default@hbase_table -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table(key string, value map<string, string>, `time` timestamp) +PREHOOK: query: CREATE TABLE hbase_table(key string, value map<string, string>, `time` timestamp) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:,:timestamp") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table(key string, value map<string, string>, `time` timestamp) +POSTHOOK: query: CREATE TABLE hbase_table(key string, value map<string, string>, `time` timestamp) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:,:timestamp") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_timestamp_format.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_timestamp_format.q.out b/hbase-handler/src/test/results/positive/hbase_timestamp_format.q.out index 8156724..a2a2f56 100644 --- a/hbase-handler/src/test/results/positive/hbase_timestamp_format.q.out +++ b/hbase-handler/src/test/results/positive/hbase_timestamp_format.q.out @@ -1,14 +1,14 @@ -PREHOOK: query: create external table hbase_str(rowkey string,mytime string,mystr string) +PREHOOK: query: create table hbase_str(rowkey string,mytime string,mystr string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ('hbase.columns.mapping' = 'm:mytime,m:mystr') - TBLPROPERTIES ('hbase.table.name' = 'hbase_ts', 'external.table.purge' = 'true') + TBLPROPERTIES ('hbase.table.name' = 'hbase_ts') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_str -POSTHOOK: query: create external table hbase_str(rowkey string,mytime string,mystr string) +POSTHOOK: query: create table hbase_str(rowkey string,mytime string,mystr string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ('hbase.columns.mapping' = 'm:mytime,m:mystr') - TBLPROPERTIES ('hbase.table.name' = 'hbase_ts', 'external.table.purge' = 'true') + TBLPROPERTIES ('hbase.table.name' = 'hbase_ts') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_str http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out b/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out index 9eae99d..95fcaa0 100644 --- a/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out +++ b/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out @@ -14,7 +14,7 @@ PREHOOK: query: DROP TABLE IF EXISTS HBASE_TABLE_TEST_1 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE IF EXISTS HBASE_TABLE_TEST_1 POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE HBASE_TABLE_TEST_1( +PREHOOK: query: CREATE TABLE HBASE_TABLE_TEST_1( cvalue string , pk string, ccount int ) @@ -29,12 +29,11 @@ WITH SERDEPROPERTIES ( 'serialization.format'='1') TBLPROPERTIES ( 'hbase.table.name'='hbase_table_test_1', - 'serialization.null.format'='', - 'external.table.purge' = 'true') + 'serialization.null.format'='' ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@HBASE_TABLE_TEST_1 -POSTHOOK: query: CREATE EXTERNAL TABLE HBASE_TABLE_TEST_1( +POSTHOOK: query: CREATE TABLE HBASE_TABLE_TEST_1( cvalue string , pk string, ccount int ) @@ -49,8 +48,7 @@ WITH SERDEPROPERTIES ( 'serialization.format'='1') TBLPROPERTIES ( 'hbase.table.name'='hbase_table_test_1', - 'serialization.null.format'='', - 'external.table.purge' = 'true') + 'serialization.null.format'='' ) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@HBASE_TABLE_TEST_1 @@ -67,7 +65,7 @@ POSTHOOK: Output: default@VIEW_HBASE_TABLE_TEST_1 POSTHOOK: Lineage: VIEW_HBASE_TABLE_TEST_1.ccount SIMPLE [(hbase_table_test_1)hbase_table_test_1.FieldSchema(name:ccount, type:int, comment:), ] POSTHOOK: Lineage: VIEW_HBASE_TABLE_TEST_1.cvalue SIMPLE [(hbase_table_test_1)hbase_table_test_1.FieldSchema(name:cvalue, type:string, comment:), ] POSTHOOK: Lineage: VIEW_HBASE_TABLE_TEST_1.pk SIMPLE [(hbase_table_test_1)hbase_table_test_1.FieldSchema(name:pk, type:string, comment:), ] -PREHOOK: query: CREATE EXTERNAL TABLE HBASE_TABLE_TEST_2( +PREHOOK: query: CREATE TABLE HBASE_TABLE_TEST_2( cvalue string , pk string , ccount int ) @@ -82,12 +80,11 @@ WITH SERDEPROPERTIES ( 'serialization.format'='1') TBLPROPERTIES ( 'hbase.table.name'='hbase_table_test_2', - 'serialization.null.format'='', - 'external.table.purge' = 'true') + 'serialization.null.format'='') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@HBASE_TABLE_TEST_2 -POSTHOOK: query: CREATE EXTERNAL TABLE HBASE_TABLE_TEST_2( +POSTHOOK: query: CREATE TABLE HBASE_TABLE_TEST_2( cvalue string , pk string , ccount int ) @@ -102,8 +99,7 @@ WITH SERDEPROPERTIES ( 'serialization.format'='1') TBLPROPERTIES ( 'hbase.table.name'='hbase_table_test_2', - 'serialization.null.format'='', - 'external.table.purge' = 'true') + 'serialization.null.format'='') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@HBASE_TABLE_TEST_2 http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/hbasestats.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbasestats.q.out b/hbase-handler/src/test/results/positive/hbasestats.q.out index b6737b7..e206191 100644 --- a/hbase-handler/src/test/results/positive/hbasestats.q.out +++ b/hbase-handler/src/test/results/positive/hbasestats.q.out @@ -2,21 +2,19 @@ PREHOOK: query: DROP TABLE users PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE users POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE EXTERNAL TABLE users(key string, state string, country string, country_id int) +PREHOOK: query: CREATE TABLE users(key string, state string, country string, country_id int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:state,info:country,info:country_id" ) -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@users -POSTHOOK: query: CREATE EXTERNAL TABLE users(key string, state string, country string, country_id int) +POSTHOOK: query: CREATE TABLE users(key string, state string, country string, country_id int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:state,info:country,info:country_id" ) -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@users @@ -37,12 +35,10 @@ Database: default #### A masked pattern was here #### Retention: 0 #### A masked pattern was here #### -Table Type: EXTERNAL_TABLE +Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"country\":\"true\",\"country_id\":\"true\",\"key\":\"true\",\"state\":\"true\"}} - EXTERNAL TRUE bucketing_version 2 - external.table.purge true numFiles 0 numRows 0 rawDataSize 0 @@ -128,11 +124,9 @@ Database: default #### A masked pattern was here #### Retention: 0 #### A masked pattern was here #### -Table Type: EXTERNAL_TABLE +Table Type: MANAGED_TABLE Table Parameters: - EXTERNAL TRUE bucketing_version 2 - external.table.purge true #### A masked pattern was here #### numFiles 0 numRows 0 @@ -195,11 +189,9 @@ Database: default #### A masked pattern was here #### Retention: 0 #### A masked pattern was here #### -Table Type: EXTERNAL_TABLE +Table Type: MANAGED_TABLE Table Parameters: - EXTERNAL TRUE bucketing_version 2 - external.table.purge true #### A masked pattern was here #### numFiles 0 numRows 0 @@ -253,12 +245,10 @@ Database: default #### A masked pattern was here #### Retention: 0 #### A masked pattern was here #### -Table Type: EXTERNAL_TABLE +Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} - EXTERNAL TRUE bucketing_version 2 - external.table.purge true #### A masked pattern was here #### numFiles 0 numRows 2 @@ -359,11 +349,9 @@ Database: default #### A masked pattern was here #### Retention: 0 #### A masked pattern was here #### -Table Type: EXTERNAL_TABLE +Table Type: MANAGED_TABLE Table Parameters: - EXTERNAL TRUE bucketing_version 2 - external.table.purge true #### A masked pattern was here #### numFiles 0 numRows 2 http://git-wip-us.apache.org/repos/asf/hive/blob/7a41f0b5/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out b/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out index 8112046..18441e8 100644 --- a/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out +++ b/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out @@ -1,14 +1,12 @@ -PREHOOK: query: CREATE EXTERNAL TABLE hbase_ppd_keyrange(key int, value string) +PREHOOK: query: CREATE TABLE hbase_ppd_keyrange(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#binary,cf:string") -TBLPROPERTIES ("external.table.purge" = "true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_ppd_keyrange -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_ppd_keyrange(key int, value string) +POSTHOOK: query: CREATE TABLE hbase_ppd_keyrange(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#binary,cf:string") -TBLPROPERTIES ("external.table.purge" = "true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_ppd_keyrange
