Repository: hive Updated Branches: refs/heads/master 255cf4ab2 -> 6b349b5f8
Revert "HIVE-18366: Update HBaseSerDe to use hbase.mapreduce.hfileoutputformat.table.name instead of hbase.table.name as the table name property (Aihua Xu, reviewed Yongzhi Chen)" This reverts commit 146234906982c59953d2dad25c0f1e8978126243. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/0fc1cd4a Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/0fc1cd4a Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/0fc1cd4a Branch: refs/heads/master Commit: 0fc1cd4a33e4de9060b50da9ff8b54a74f00579b Parents: 255cf4a Author: Aihua Xu <[email protected]> Authored: Fri Jan 26 13:43:38 2018 -0800 Committer: Aihua Xu <[email protected]> Committed: Fri Jan 26 13:43:38 2018 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hive/hbase/HBaseSerDe.java | 2 +- .../src/test/queries/negative/cascade_dbdrop.q | 2 +- .../queries/negative/cascade_dbdrop_hadoop20.q | 2 +- .../src/test/queries/negative/hbase_ddl.q | 2 +- .../test/queries/positive/external_table_ppd.q | 2 +- .../hbase_binary_external_table_queries.q | 6 +-- .../queries/positive/hbase_binary_map_queries.q | 16 +++---- .../positive/hbase_binary_map_queries_prefix.q | 6 +-- .../positive/hbase_binary_storage_queries.q | 10 ++-- .../test/queries/positive/hbase_custom_key.q | 4 +- .../test/queries/positive/hbase_custom_key2.q | 2 +- .../test/queries/positive/hbase_custom_key3.q | 2 +- .../src/test/queries/positive/hbase_ddl.q | 2 +- .../src/test/queries/positive/hbase_queries.q | 6 +-- .../queries/positive/hbase_tablename_property.q | 14 ------ .../queries/positive/hbase_timestamp_format.q | 4 +- .../src/test/queries/positive/hbase_viewjoins.q | 4 +- .../test/results/negative/cascade_dbdrop.q.out | 4 +- .../negative/cascade_dbdrop_hadoop20.q.out | 4 +- .../src/test/results/negative/hbase_ddl.q.out | 4 +- .../results/positive/external_table_ppd.q.out | 6 +-- .../hbase_binary_external_table_queries.q.out | 12 ++--- .../positive/hbase_binary_map_queries.q.out | 32 ++++++------- .../hbase_binary_map_queries_prefix.q.out | 12 ++--- .../positive/hbase_binary_storage_queries.q.out | 24 +++++----- .../results/positive/hbase_custom_key.q.out | 8 ++-- .../results/positive/hbase_custom_key2.q.out | 4 +- .../results/positive/hbase_custom_key3.q.out | 4 +- .../src/test/results/positive/hbase_ddl.q.out | 8 ++-- .../test/results/positive/hbase_queries.q.out | 14 +++--- .../positive/hbase_tablename_property.q.out | 49 -------------------- .../positive/hbase_timestamp_format.q.out | 8 ++-- .../test/results/positive/hbase_viewjoins.q.out | 8 ++-- .../hive/hcatalog/templeton/TestDesc.java | 2 +- .../hbase/TestPigHBaseStorageHandler.java | 21 ++++++--- .../hadoop/hive/hbase/HBaseQTestUtil.java | 2 +- 36 files changed, 128 insertions(+), 184 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java index f203b8f..1553525 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java @@ -71,7 +71,7 @@ public class HBaseSerDe extends AbstractSerDe { public static final Logger LOG = LoggerFactory.getLogger(HBaseSerDe.class); public static final String HBASE_COLUMNS_MAPPING = "hbase.columns.mapping"; - public static final String HBASE_TABLE_NAME = "hbase.mapreduce.hfileoutputformat.table.name"; + public static final String HBASE_TABLE_NAME = "hbase.table.name"; public static final String HBASE_TABLE_DEFAULT_STORAGE_TYPE = "hbase.table.default.storage.type"; public static final String HBASE_KEY_COL = ":key"; public static final String HBASE_TIMESTAMP_COL = ":timestamp"; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/negative/cascade_dbdrop.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/negative/cascade_dbdrop.q b/hbase-handler/src/test/queries/negative/cascade_dbdrop.q index 39ecc6b..7f9df5e 100644 --- a/hbase-handler/src/test/queries/negative/cascade_dbdrop.q +++ b/hbase-handler/src/test/queries/negative/cascade_dbdrop.q @@ -14,7 +14,7 @@ CREATE DATABASE hbaseDB; CREATE TABLE hbaseDB.hbase_table_0(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_0"); +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0"); dfs -ls target/tmp/hbase/data/default/hbase_table_0; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q b/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q index 043c7d9..8fa8c8a 100644 --- a/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q +++ b/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q @@ -14,7 +14,7 @@ CREATE DATABASE hbaseDB; CREATE TABLE hbaseDB.hbase_table_0(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_0"); +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0"); dfs -ls target/tmp/hbase/data/default/hbase_table_0; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/negative/hbase_ddl.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/negative/hbase_ddl.q b/hbase-handler/src/test/queries/negative/hbase_ddl.q index 7987750..2913bcd 100644 --- a/hbase-handler/src/test/queries/negative/hbase_ddl.q +++ b/hbase-handler/src/test/queries/negative/hbase_ddl.q @@ -2,7 +2,7 @@ DROP TABLE hbase_table_1; 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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0"); +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0"); DESCRIBE EXTENDED hbase_table_1; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/external_table_ppd.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/external_table_ppd.q b/hbase-handler/src/test/queries/positive/external_table_ppd.q index cf76bef..fbef4bb 100644 --- a/hbase-handler/src/test/queries/positive/external_table_ppd.q +++ b/hbase-handler/src/test/queries/positive/external_table_ppd.q @@ -10,7 +10,7 @@ CREATE TABLE t_hbase(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:binarykey#-,cf:binarybyte#-,cf:binaryshort#-,:key#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive", +TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary"); DESCRIBE FORMATTED t_hbase; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_binary_external_table_queries.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_binary_external_table_queries.q b/hbase-handler/src/test/queries/positive/hbase_binary_external_table_queries.q index fe181fa..f7a1218 100644 --- a/hbase-handler/src/test/queries/positive/hbase_binary_external_table_queries.q +++ b/hbase-handler/src/test/queries/positive/hbase_binary_external_table_queries.q @@ -5,7 +5,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_1 c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:cq-boolean,cf:cq-byte,cf:cq-short,cf:cq-int,cf:cq-long,cf:cq-string,cf:cq-float,cf:cq-double") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "HiveExternalTable"); +TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable"); SELECT * FROM t_ext_hbase_1; @@ -17,7 +17,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_2 c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:cq-boolean#b,cf:cq-byte#b,cf:cq-short#b,cf:cq-int#b,cf:cq-long#b,cf:cq-string#b,cf:cq-float#b,cf:cq-double#b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "HiveExternalTable"); +TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable"); SELECT * FROM t_ext_hbase_2; @@ -30,7 +30,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_3 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:cq-boolean,cf:cq-byte,cf:cq-short,cf:cq-int,cf:cq-long,cf:cq-string,cf:cq-float,cf:cq-double") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name" = "HiveExternalTable", +"hbase.table.name" = "HiveExternalTable", "hbase.table.default.storage.type" = "binary"); SELECT * from t_ext_hbase_3; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_binary_map_queries.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_binary_map_queries.q b/hbase-handler/src/test/queries/positive/hbase_binary_map_queries.q index 5714d42..255a2c7 100644 --- a/hbase-handler/src/test/queries/positive/hbase_binary_map_queries.q +++ b/hbase-handler/src/test/queries/positive/hbase_binary_map_queries.q @@ -27,7 +27,7 @@ CREATE TABLE t_hbase_maps(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps"); +TBLPROPERTIES ("hbase.table.name"="t_hive_maps"); INSERT OVERWRITE TABLE t_hbase_maps SELECT key, @@ -70,7 +70,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps"); +TBLPROPERTIES ("hbase.table.name"="t_hive_maps"); SELECT * FROM t_ext_hbase_maps ORDER BY key; @@ -89,7 +89,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_maps_1(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps"); +TBLPROPERTIES ("hbase.table.name"="t_hive_maps"); SELECT * FROM t_ext_hbase_maps_1 ORDER BY key; @@ -109,7 +109,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_maps_2(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps", +"hbase.table.name"="t_hive_maps", "hbase.table.default.storage.type"="binary"); SELECT * FROM t_ext_hbase_maps_2 ORDER BY key; @@ -129,7 +129,7 @@ CREATE TABLE t_hbase_maps_1(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#b:b,cf-smallint:#b:b,cf-int:#b:b,cf-bigint:#b:b,cf-float:#b:b,cf-double:#b:b,cf-string:#b:b,cf-boolean:#b:b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1"); +TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1"); INSERT OVERWRITE TABLE t_hbase_maps_1 SELECT key, @@ -172,7 +172,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_maps_3(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1"); +TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1"); SELECT * FROM t_ext_hbase_maps_3 ORDER BY key; @@ -191,7 +191,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_maps_4(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1"); +TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1"); SELECT * FROM t_ext_hbase_maps_4 ORDER BY key; @@ -211,7 +211,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_maps_5(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1", +"hbase.table.name"="t_hive_maps_1", "hbase.table.default.storage.type"="binary"); SELECT * FROM t_ext_hbase_maps_5 ORDER BY key; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_binary_map_queries_prefix.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_binary_map_queries_prefix.q b/hbase-handler/src/test/queries/positive/hbase_binary_map_queries_prefix.q index 3cc6a07..9ff4366 100644 --- a/hbase-handler/src/test/queries/positive/hbase_binary_map_queries_prefix.q +++ b/hbase-handler/src/test/queries/positive/hbase_binary_map_queries_prefix.q @@ -21,7 +21,7 @@ CREATE TABLE t_hbase_maps(key STRING, simple_string_col STRING) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:,cf-string:simple_string_col") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps"); +TBLPROPERTIES ("hbase.table.name"="t_hive_maps"); INSERT OVERWRITE TABLE t_hbase_maps SELECT key, @@ -45,7 +45,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING, string_map_cols MAP<STRING, STRING>, simple_string_col STRING) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_col.*,cf-string:simple_string_col") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps"); +TBLPROPERTIES ("hbase.table.name"="t_hive_maps"); SELECT * FROM t_ext_hbase_maps ORDER BY key; @@ -58,7 +58,7 @@ CREATE EXTERNAL TABLE t_ext_hbase_maps_cut_prefix(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_.*,cf-string:simple_string_col" ,"hbase.columns.mapping.prefix.hide"="true") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps"); +TBLPROPERTIES ("hbase.table.name"="t_hive_maps"); SELECT * FROM t_ext_hbase_maps_cut_prefix ORDER BY key; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_binary_storage_queries.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_binary_storage_queries.q b/hbase-handler/src/test/queries/positive/hbase_binary_storage_queries.q index b4ca6d9..b048871 100644 --- a/hbase-handler/src/test/queries/positive/hbase_binary_storage_queries.q +++ b/hbase-handler/src/test/queries/positive/hbase_binary_storage_queries.q @@ -10,7 +10,7 @@ CREATE TABLE t_hbase(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive", +TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary"); DESCRIBE FORMATTED t_hbase; @@ -63,7 +63,7 @@ CREATE EXTERNAL TABLE t_hbase_1(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive"); +TBLPROPERTIES ("hbase.table.name" = "t_hive"); DESCRIBE FORMATTED t_hbase_1; @@ -102,7 +102,7 @@ CREATE TABLE t_hbase_2(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive_2"); +TBLPROPERTIES ("hbase.table.name" = "t_hive_2"); INSERT OVERWRITE TABLE t_hbase_2 SELECT 'user1', 1, 1, 1, 1, 1.0, 1.0, true @@ -152,7 +152,7 @@ CREATE EXTERNAL TABLE t_hbase_3(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive_2"); +TBLPROPERTIES ("hbase.table.name" = "t_hive_2"); SELECT * FROM t_hbase_3; @@ -190,7 +190,7 @@ CREATE EXTERNAL TABLE t_hbase_4(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name" = "t_hive_2", +"hbase.table.name" = "t_hive_2", "hbase.table.default.storage.type" = "binary"); SELECT * FROM t_hbase_4; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_custom_key.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_custom_key.q b/hbase-handler/src/test/queries/positive/hbase_custom_key.q index e15b7a8..9dbb2a0 100644 --- a/hbase-handler/src/test/queries/positive/hbase_custom_key.q +++ b/hbase-handler/src/test/queries/positive/hbase_custom_key.q @@ -1,14 +1,14 @@ CREATE TABLE hbase_ck_1(key struct<col1:string,col2:string,col3:string>, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom", + "hbase.table.name" = "hbase_custom", "hbase.columns.mapping" = ":key,cf:string", "hbase.composite.key.factory"="org.apache.hadoop.hive.hbase.SampleHBaseKeyFactory"); CREATE EXTERNAL TABLE hbase_ck_2(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom", + "hbase.table.name" = "hbase_custom", "hbase.columns.mapping" = ":key,cf:string"); from src tablesample (1 rows) http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_custom_key2.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_custom_key2.q b/hbase-handler/src/test/queries/positive/hbase_custom_key2.q index 8cf2832..9fba4f6 100644 --- a/hbase-handler/src/test/queries/positive/hbase_custom_key2.q +++ b/hbase-handler/src/test/queries/positive/hbase_custom_key2.q @@ -1,7 +1,7 @@ CREATE TABLE hbase_ck_4(key struct<col1:string,col2:string,col3:string>, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom2", + "hbase.table.name" = "hbase_custom2", "hbase.columns.mapping" = ":key,cf:string", "hbase.composite.key.factory"="org.apache.hadoop.hive.hbase.SampleHBaseKeyFactory2"); http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_custom_key3.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_custom_key3.q b/hbase-handler/src/test/queries/positive/hbase_custom_key3.q index a642bc4..22d2c9e 100644 --- a/hbase-handler/src/test/queries/positive/hbase_custom_key3.q +++ b/hbase-handler/src/test/queries/positive/hbase_custom_key3.q @@ -1,7 +1,7 @@ CREATE TABLE hbase_ck_5(key struct<col1:string,col2:string,col3:string>, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom3", + "hbase.table.name" = "hbase_custom3", "hbase.columns.mapping" = ":key,cf:string", "hbase.composite.key.factory"="org.apache.hadoop.hive.hbase.SampleHBaseKeyFactory3"); http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_ddl.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_ddl.q b/hbase-handler/src/test/queries/positive/hbase_ddl.q index 7cfb768..a8bae75 100644 --- a/hbase-handler/src/test/queries/positive/hbase_ddl.q +++ b/hbase-handler/src/test/queries/positive/hbase_ddl.q @@ -2,7 +2,7 @@ DROP TABLE hbase_table_1; 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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0"); +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0"); DESCRIBE EXTENDED hbase_table_1; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_queries.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_queries.q b/hbase-handler/src/test/queries/positive/hbase_queries.q index fb7bf93..43efd6c 100644 --- a/hbase-handler/src/test/queries/positive/hbase_queries.q +++ b/hbase-handler/src/test/queries/positive/hbase_queries.q @@ -2,7 +2,7 @@ DROP TABLE hbase_table_1; 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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0"); +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0"); DESCRIBE EXTENDED hbase_table_1; @@ -15,7 +15,7 @@ DROP TABLE hbase_table_2; CREATE EXTERNAL TABLE hbase_table_2(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_0"); +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0"); EXPLAIN SELECT Y.* @@ -107,7 +107,7 @@ DROP TABLE hbase_table_5; CREATE EXTERNAL TABLE hbase_table_5(key int, value map<string,string>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "a:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_4"); +TBLPROPERTIES ("hbase.table.name" = "hbase_table_4"); SELECT * FROM hbase_table_5 ORDER BY key; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_tablename_property.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_tablename_property.q b/hbase-handler/src/test/queries/positive/hbase_tablename_property.q deleted file mode 100644 index 1cce407..0000000 --- a/hbase-handler/src/test/queries/positive/hbase_tablename_property.q +++ /dev/null @@ -1,14 +0,0 @@ -DROP TABLE hbase_table_1; -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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0"); - -INSERT INTO hbase_table_1 VALUES(1, 'value1'); - -CREATE EXTERNAL TABLE hbase_table_2(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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0"); - -SELECT * FROM hbase_table_2; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_timestamp_format.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_timestamp_format.q b/hbase-handler/src/test/queries/positive/hbase_timestamp_format.q index c9d940e..a8d5501 100644 --- a/hbase-handler/src/test/queries/positive/hbase_timestamp_format.q +++ b/hbase-handler/src/test/queries/positive/hbase_timestamp_format.q @@ -2,7 +2,7 @@ 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.mapreduce.hfileoutputformat.table.name' = 'hbase_ts'); + TBLPROPERTIES ('hbase.table.name' = 'hbase_ts'); describe hbase_str; insert overwrite table hbase_str select key, '2001-02-03-04.05.06.123456', value from src limit 3; @@ -12,7 +12,7 @@ select * from hbase_str; create external table hbase_ts(rowkey string,mytime timestamp,mystr string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ('hbase.columns.mapping' = 'm:mytime,m:mystr', 'timestamp.formats' = 'yyyy-MM-dd-HH.mm.ss.SSSSSS') - TBLPROPERTIES ('hbase.mapreduce.hfileoutputformat.table.name' = 'hbase_ts'); + TBLPROPERTIES ('hbase.table.name' = 'hbase_ts'); describe hbase_ts; select * from hbase_ts; http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/queries/positive/hbase_viewjoins.q ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/queries/positive/hbase_viewjoins.q b/hbase-handler/src/test/queries/positive/hbase_viewjoins.q index 88ccfdc..5c98903 100644 --- a/hbase-handler/src/test/queries/positive/hbase_viewjoins.q +++ b/hbase-handler/src/test/queries/positive/hbase_viewjoins.q @@ -16,7 +16,7 @@ WITH SERDEPROPERTIES ( 'hbase.scan.cacheblocks'='false', 'serialization.format'='1') TBLPROPERTIES ( - 'hbase.mapreduce.hfileoutputformat.table.name'='hbase_table_test_1', + 'hbase.table.name'='hbase_table_test_1', 'serialization.null.format'='' ); CREATE VIEW VIEW_HBASE_TABLE_TEST_1 AS SELECT hbase_table_test_1.cvalue,hbase_table_test_1.pk,hbase_table_test_1.ccount FROM hbase_table_test_1 WHERE hbase_table_test_1.ccount IS NOT NULL; @@ -35,7 +35,7 @@ WITH SERDEPROPERTIES ( 'hbase.scan.cacheblocks'='false', 'serialization.format'='1') TBLPROPERTIES ( - 'hbase.mapreduce.hfileoutputformat.table.name'='hbase_table_test_2', + 'hbase.table.name'='hbase_table_test_2', 'serialization.null.format'=''); CREATE VIEW VIEW_HBASE_TABLE_TEST_2 AS SELECT hbase_table_test_2.cvalue,hbase_table_test_2.pk,hbase_table_test_2.ccount http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out b/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out index 7599c2b..cef7a06 100644 --- a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out +++ b/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out @@ -7,14 +7,14 @@ POSTHOOK: Output: database:hbaseDB PREHOOK: query: CREATE TABLE hbaseDB.hbase_table_0(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE PREHOOK: Output: database:hbasedb PREHOOK: Output: hbaseDB@hbase_table_0 POSTHOOK: query: CREATE TABLE hbaseDB.hbase_table_0(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:hbasedb POSTHOOK: Output: hbaseDB@hbase_table_0 http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out b/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out index 0ed342e..d4e2917 100644 --- a/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out +++ b/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out @@ -15,7 +15,7 @@ PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE hbaseDB.hbase_table_0(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE PREHOOK: Output: database:hbasedb POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) @@ -31,7 +31,7 @@ POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE hbaseDB.hbase_table_0(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:hbasedb POSTHOOK: Output: hbaseDB@hbase_table_0 http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/negative/hbase_ddl.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/negative/hbase_ddl.q.out b/hbase-handler/src/test/results/negative/hbase_ddl.q.out index 9429f51..b5aad70 100644 --- a/hbase-handler/src/test/results/negative/hbase_ddl.q.out +++ b/hbase-handler/src/test/results/negative/hbase_ddl.q.out @@ -5,14 +5,14 @@ POSTHOOK: type: DROPTABLE 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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_1 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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_1 http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/external_table_ppd.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/external_table_ppd.q.out b/hbase-handler/src/test/results/positive/external_table_ppd.q.out index 6987774..cdc43ee 100644 --- a/hbase-handler/src/test/results/positive/external_table_ppd.q.out +++ b/hbase-handler/src/test/results/positive/external_table_ppd.q.out @@ -12,7 +12,7 @@ PREHOOK: query: CREATE TABLE t_hbase(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:binarykey#-,cf:binarybyte#-,cf:binaryshort#-,:key#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive", +TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -27,7 +27,7 @@ POSTHOOK: query: CREATE TABLE t_hbase(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:binarykey#-,cf:binarybyte#-,cf:binaryshort#-,:key#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive", +TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -56,8 +56,8 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"bigint_col\":\"true\",\"boolean_col\":\"true\",\"double_col\":\"true\",\"float_col\":\"true\",\"int_col\":\"true\",\"key\":\"true\",\"smallint_col\":\"true\",\"tinyint_col\":\"true\"}} - hbase.mapreduce.hfileoutputformat.table.name t_hive hbase.table.default.storage.type binary + hbase.table.name t_hive numFiles 0 numRows 0 rawDataSize 0 http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out index 1c46e0f..7eaba6b 100644 --- a/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out @@ -7,7 +7,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_1 c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:cq-boolean,cf:cq-byte,cf:cq-short,cf:cq-int,cf:cq-long,cf:cq-string,cf:cq-float,cf:cq-double") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "HiveExternalTable") +TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_ext_hbase_1 @@ -16,7 +16,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_1 c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:cq-boolean,cf:cq-byte,cf:cq-short,cf:cq-int,cf:cq-long,cf:cq-string,cf:cq-float,cf:cq-double") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "HiveExternalTable") +TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_1 @@ -48,7 +48,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_2 c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:cq-boolean#b,cf:cq-byte#b,cf:cq-short#b,cf:cq-int#b,cf:cq-long#b,cf:cq-string#b,cf:cq-float#b,cf:cq-double#b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "HiveExternalTable") +TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_ext_hbase_2 @@ -57,7 +57,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_2 c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:cq-boolean#b,cf:cq-byte#b,cf:cq-short#b,cf:cq-int#b,cf:cq-long#b,cf:cq-string#b,cf:cq-float#b,cf:cq-double#b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "HiveExternalTable") +TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_2 @@ -90,7 +90,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_3 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:cq-boolean,cf:cq-byte,cf:cq-short,cf:cq-int,cf:cq-long,cf:cq-string,cf:cq-float,cf:cq-double") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name" = "HiveExternalTable", +"hbase.table.name" = "HiveExternalTable", "hbase.table.default.storage.type" = "binary") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -101,7 +101,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_3 STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:cq-boolean,cf:cq-byte,cf:cq-short,cf:cq-int,cf:cq-long,cf:cq-string,cf:cq-float,cf:cq-double") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name" = "HiveExternalTable", +"hbase.table.name" = "HiveExternalTable", "hbase.table.default.storage.type" = "binary") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out index c6c467f..feaca4b 100644 --- a/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out @@ -61,7 +61,7 @@ PREHOOK: query: CREATE TABLE t_hbase_maps(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_hbase_maps @@ -76,7 +76,7 @@ POSTHOOK: query: CREATE TABLE t_hbase_maps(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_maps @@ -165,7 +165,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_ext_hbase_maps @@ -180,7 +180,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps @@ -217,7 +217,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_1(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_ext_hbase_maps_1 @@ -232,7 +232,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_1(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps_1 @@ -270,7 +270,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_2(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps", +"hbase.table.name"="t_hive_maps", "hbase.table.default.storage.type"="binary") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -287,7 +287,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_2(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps", +"hbase.table.name"="t_hive_maps", "hbase.table.default.storage.type"="binary") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -325,7 +325,7 @@ PREHOOK: query: CREATE TABLE t_hbase_maps_1(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#b:b,cf-smallint:#b:b,cf-int:#b:b,cf-bigint:#b:b,cf-float:#b:b,cf-double:#b:b,cf-string:#b:b,cf-boolean:#b:b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_hbase_maps_1 @@ -340,7 +340,7 @@ POSTHOOK: query: CREATE TABLE t_hbase_maps_1(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#b:b,cf-smallint:#b:b,cf-int:#b:b,cf-bigint:#b:b,cf-float:#b:b,cf-double:#b:b,cf-string:#b:b,cf-boolean:#b:b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_maps_1 @@ -429,7 +429,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_3(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_ext_hbase_maps_3 @@ -444,7 +444,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_3(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps_3 @@ -481,7 +481,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_4(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_ext_hbase_maps_4 @@ -496,7 +496,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_4(key STRING, boolean_map_col MAP<BOOLEAN, BOOLEAN>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps_4 @@ -534,7 +534,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_5(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1", +"hbase.table.name"="t_hive_maps_1", "hbase.table.default.storage.type"="binary") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -551,7 +551,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_5(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps_1", +"hbase.table.name"="t_hive_maps_1", "hbase.table.default.storage.type"="binary") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out b/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out index 28d0cbb..f6432b3 100644 --- a/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out +++ b/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out @@ -55,7 +55,7 @@ PREHOOK: query: CREATE TABLE t_hbase_maps(key STRING, simple_string_col STRING) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:,cf-string:simple_string_col") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_hbase_maps @@ -64,7 +64,7 @@ POSTHOOK: query: CREATE TABLE t_hbase_maps(key STRING, simple_string_col STRING) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:,cf-string:simple_string_col") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_maps @@ -122,7 +122,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING, string_map_cols MAP<STRING, STRING>, simple_string_col STRING) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_col.*,cf-string:simple_string_col") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_ext_hbase_maps @@ -130,7 +130,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING, string_map_cols MAP<STRING, STRING>, simple_string_col STRING) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_col.*,cf-string:simple_string_col") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps @@ -161,7 +161,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_cut_prefix(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_.*,cf-string:simple_string_col" ,"hbase.columns.mapping.prefix.hide"="true") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_ext_hbase_maps_cut_prefix @@ -170,7 +170,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_cut_prefix(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_.*,cf-string:simple_string_col" ,"hbase.columns.mapping.prefix.hide"="true") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name"="t_hive_maps") +TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps_cut_prefix http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out index 097da82..153613e 100644 --- a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out @@ -12,7 +12,7 @@ PREHOOK: query: CREATE TABLE t_hbase(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive", +TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -27,7 +27,7 @@ POSTHOOK: query: CREATE TABLE t_hbase(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive", +TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -56,8 +56,8 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"bigint_col\":\"true\",\"boolean_col\":\"true\",\"double_col\":\"true\",\"float_col\":\"true\",\"int_col\":\"true\",\"key\":\"true\",\"smallint_col\":\"true\",\"tinyint_col\":\"true\"}} - hbase.mapreduce.hfileoutputformat.table.name t_hive hbase.table.default.storage.type binary + hbase.table.name t_hive numFiles 0 numRows 0 rawDataSize 0 @@ -193,7 +193,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_1(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive") +TBLPROPERTIES ("hbase.table.name" = "t_hive") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_hbase_1 @@ -207,7 +207,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_hbase_1(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive") +TBLPROPERTIES ("hbase.table.name" = "t_hive") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_1 @@ -236,7 +236,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"bigint_col\":\"true\",\"boolean_col\":\"true\",\"double_col\":\"true\",\"float_col\":\"true\",\"int_col\":\"true\",\"key\":\"true\",\"smallint_col\":\"true\",\"tinyint_col\":\"true\"}} EXTERNAL TRUE - hbase.mapreduce.hfileoutputformat.table.name t_hive + hbase.table.name t_hive numFiles 0 numRows 0 rawDataSize 0 @@ -346,7 +346,7 @@ PREHOOK: query: CREATE TABLE t_hbase_2(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive_2") +TBLPROPERTIES ("hbase.table.name" = "t_hive_2") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_hbase_2 @@ -360,7 +360,7 @@ POSTHOOK: query: CREATE TABLE t_hbase_2(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive_2") +TBLPROPERTIES ("hbase.table.name" = "t_hive_2") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_2 @@ -481,7 +481,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_3(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive_2") +TBLPROPERTIES ("hbase.table.name" = "t_hive_2") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t_hbase_3 @@ -495,7 +495,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_hbase_3(key STRING, boolean_col BOOLEAN) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "t_hive_2") +TBLPROPERTIES ("hbase.table.name" = "t_hive_2") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_3 @@ -583,7 +583,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_4(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name" = "t_hive_2", +"hbase.table.name" = "t_hive_2", "hbase.table.default.storage.type" = "binary") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -599,7 +599,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE t_hbase_4(key STRING, STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") TBLPROPERTIES ( -"hbase.mapreduce.hfileoutputformat.table.name" = "t_hive_2", +"hbase.table.name" = "t_hive_2", "hbase.table.default.storage.type" = "binary") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/hbase_custom_key.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_custom_key.q.out b/hbase-handler/src/test/results/positive/hbase_custom_key.q.out index bf150fc..e5bc947 100644 --- a/hbase-handler/src/test/results/positive/hbase_custom_key.q.out +++ b/hbase-handler/src/test/results/positive/hbase_custom_key.q.out @@ -1,7 +1,7 @@ PREHOOK: query: CREATE TABLE hbase_ck_1(key struct<col1:string,col2:string,col3:string>, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom", + "hbase.table.name" = "hbase_custom", "hbase.columns.mapping" = ":key,cf:string", "hbase.composite.key.factory"="org.apache.hadoop.hive.hbase.SampleHBaseKeyFactory") PREHOOK: type: CREATETABLE @@ -10,7 +10,7 @@ PREHOOK: Output: default@hbase_ck_1 POSTHOOK: query: CREATE TABLE hbase_ck_1(key struct<col1:string,col2:string,col3:string>, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom", + "hbase.table.name" = "hbase_custom", "hbase.columns.mapping" = ":key,cf:string", "hbase.composite.key.factory"="org.apache.hadoop.hive.hbase.SampleHBaseKeyFactory") POSTHOOK: type: CREATETABLE @@ -19,7 +19,7 @@ POSTHOOK: Output: default@hbase_ck_1 PREHOOK: query: CREATE EXTERNAL TABLE hbase_ck_2(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom", + "hbase.table.name" = "hbase_custom", "hbase.columns.mapping" = ":key,cf:string") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -27,7 +27,7 @@ PREHOOK: Output: default@hbase_ck_2 POSTHOOK: query: CREATE EXTERNAL TABLE hbase_ck_2(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom", + "hbase.table.name" = "hbase_custom", "hbase.columns.mapping" = ":key,cf:string") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out b/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out index 6c3477f..5d381e7 100644 --- a/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out +++ b/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out @@ -1,7 +1,7 @@ PREHOOK: query: CREATE TABLE hbase_ck_4(key struct<col1:string,col2:string,col3:string>, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom2", + "hbase.table.name" = "hbase_custom2", "hbase.columns.mapping" = ":key,cf:string", "hbase.composite.key.factory"="org.apache.hadoop.hive.hbase.SampleHBaseKeyFactory2") PREHOOK: type: CREATETABLE @@ -10,7 +10,7 @@ PREHOOK: Output: default@hbase_ck_4 POSTHOOK: query: CREATE TABLE hbase_ck_4(key struct<col1:string,col2:string,col3:string>, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom2", + "hbase.table.name" = "hbase_custom2", "hbase.columns.mapping" = ":key,cf:string", "hbase.composite.key.factory"="org.apache.hadoop.hive.hbase.SampleHBaseKeyFactory2") POSTHOOK: type: CREATETABLE http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out b/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out index f3d873b..1b042fd 100644 --- a/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out +++ b/hbase-handler/src/test/results/positive/hbase_custom_key3.q.out @@ -1,7 +1,7 @@ PREHOOK: query: CREATE TABLE hbase_ck_5(key struct<col1:string,col2:string,col3:string>, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom3", + "hbase.table.name" = "hbase_custom3", "hbase.columns.mapping" = ":key,cf:string", "hbase.composite.key.factory"="org.apache.hadoop.hive.hbase.SampleHBaseKeyFactory3") PREHOOK: type: CREATETABLE @@ -10,7 +10,7 @@ PREHOOK: Output: default@hbase_ck_5 POSTHOOK: query: CREATE TABLE hbase_ck_5(key struct<col1:string,col2:string,col3:string>, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( - "hbase.mapreduce.hfileoutputformat.table.name" = "hbase_custom3", + "hbase.table.name" = "hbase_custom3", "hbase.columns.mapping" = ":key,cf:string", "hbase.composite.key.factory"="org.apache.hadoop.hive.hbase.SampleHBaseKeyFactory3") POSTHOOK: type: CREATETABLE http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/hbase_ddl.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_ddl.q.out b/hbase-handler/src/test/results/positive/hbase_ddl.q.out index 0baf15c..c015f29 100644 --- a/hbase-handler/src/test/results/positive/hbase_ddl.q.out +++ b/hbase-handler/src/test/results/positive/hbase_ddl.q.out @@ -5,14 +5,14 @@ POSTHOOK: type: DROPTABLE 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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_1 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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_1 @@ -117,7 +117,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: hbase.mapred.output.outputtable kkk - hbase.mapreduce.hfileoutputformat.table.name hbase_table_0 + hbase.table.name hbase_table_0 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -162,7 +162,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: - hbase.mapreduce.hfileoutputformat.table.name hbase_table_0 + hbase.table.name hbase_table_0 #### A masked pattern was here #### numFiles 0 numRows 0 http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/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 e4be370..0fce6c8 100644 --- a/hbase-handler/src/test/results/positive/hbase_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out @@ -5,14 +5,14 @@ POSTHOOK: type: DROPTABLE 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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_1 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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_1 @@ -98,14 +98,14 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_2(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_2 POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_2(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_2 @@ -712,14 +712,14 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_5(key int, value map<string,string>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "a:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_4") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_4") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_table_5 POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_5(key int, value map<string,string>) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "a:") -TBLPROPERTIES ("hbase.mapreduce.hfileoutputformat.table.name" = "hbase_table_4") +TBLPROPERTIES ("hbase.table.name" = "hbase_table_4") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_5 @@ -955,7 +955,7 @@ WITH SERDEPROPERTIES ( 'hbase.columns.mapping'='cf:string', 'serialization.format'='1') TBLPROPERTIES ( - 'hbase.mapreduce.hfileoutputformat.table.name'='hbase_table_0', + 'hbase.table.name'='hbase_table_0', #### A masked pattern was here #### PREHOOK: query: DROP TABLE IF EXISTS hbase_table_9 PREHOOK: type: DROPTABLE http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hbase-handler/src/test/results/positive/hbase_tablename_property.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_tablename_property.q.out b/hbase-handler/src/test/results/positive/hbase_tablename_property.q.out deleted file mode 100644 index 234f34a..0000000 --- a/hbase-handler/src/test/results/positive/hbase_tablename_property.q.out +++ /dev/null @@ -1,49 +0,0 @@ -PREHOOK: query: DROP TABLE hbase_table_1 -PREHOOK: type: DROPTABLE -POSTHOOK: query: DROP TABLE hbase_table_1 -POSTHOOK: type: DROPTABLE -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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@hbase_table_1 -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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@hbase_table_1 -PREHOOK: query: INSERT INTO hbase_table_1 VALUES(1, 'value1') -PREHOOK: type: QUERY -PREHOOK: Input: _dummy_database@_dummy_table -PREHOOK: Output: default@hbase_table_1 -POSTHOOK: query: INSERT INTO hbase_table_1 VALUES(1, 'value1') -POSTHOOK: type: QUERY -POSTHOOK: Input: _dummy_database@_dummy_table -POSTHOOK: Output: default@hbase_table_1 -PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_2(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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@hbase_table_2 -POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_2(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.mapreduce.hfileoutputformat.table.name" = "hbase_table_0") -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@hbase_table_2 -PREHOOK: query: SELECT * FROM hbase_table_2 -PREHOOK: type: QUERY -PREHOOK: Input: default@hbase_table_2 -#### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM hbase_table_2 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@hbase_table_2 -#### A masked pattern was here #### -1 value1 http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/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 b1f5a4b..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 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.mapreduce.hfileoutputformat.table.name' = 'hbase_ts') + TBLPROPERTIES ('hbase.table.name' = 'hbase_ts') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_str 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.mapreduce.hfileoutputformat.table.name' = 'hbase_ts') + TBLPROPERTIES ('hbase.table.name' = 'hbase_ts') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_str @@ -43,14 +43,14 @@ POSTHOOK: Input: default@hbase_str PREHOOK: query: create external table hbase_ts(rowkey string,mytime timestamp,mystr string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ('hbase.columns.mapping' = 'm:mytime,m:mystr', 'timestamp.formats' = 'yyyy-MM-dd-HH.mm.ss.SSSSSS') - TBLPROPERTIES ('hbase.mapreduce.hfileoutputformat.table.name' = 'hbase_ts') + TBLPROPERTIES ('hbase.table.name' = 'hbase_ts') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hbase_ts POSTHOOK: query: create external table hbase_ts(rowkey string,mytime timestamp,mystr string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ('hbase.columns.mapping' = 'm:mytime,m:mystr', 'timestamp.formats' = 'yyyy-MM-dd-HH.mm.ss.SSSSSS') - TBLPROPERTIES ('hbase.mapreduce.hfileoutputformat.table.name' = 'hbase_ts') + TBLPROPERTIES ('hbase.table.name' = 'hbase_ts') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_ts http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/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 a289a77..95fcaa0 100644 --- a/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out +++ b/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out @@ -28,7 +28,7 @@ WITH SERDEPROPERTIES ( 'hbase.scan.cacheblocks'='false', 'serialization.format'='1') TBLPROPERTIES ( - 'hbase.mapreduce.hfileoutputformat.table.name'='hbase_table_test_1', + 'hbase.table.name'='hbase_table_test_1', 'serialization.null.format'='' ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -47,7 +47,7 @@ WITH SERDEPROPERTIES ( 'hbase.scan.cacheblocks'='false', 'serialization.format'='1') TBLPROPERTIES ( - 'hbase.mapreduce.hfileoutputformat.table.name'='hbase_table_test_1', + 'hbase.table.name'='hbase_table_test_1', 'serialization.null.format'='' ) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -79,7 +79,7 @@ WITH SERDEPROPERTIES ( 'hbase.scan.cacheblocks'='false', 'serialization.format'='1') TBLPROPERTIES ( - 'hbase.mapreduce.hfileoutputformat.table.name'='hbase_table_test_2', + 'hbase.table.name'='hbase_table_test_2', 'serialization.null.format'='') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -98,7 +98,7 @@ WITH SERDEPROPERTIES ( 'hbase.scan.cacheblocks'='false', 'serialization.format'='1') TBLPROPERTIES ( - 'hbase.mapreduce.hfileoutputformat.table.name'='hbase_table_test_2', + 'hbase.table.name'='hbase_table_test_2', 'serialization.null.format'='') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestDesc.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestDesc.java b/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestDesc.java index 3fb4205..9ce714e 100644 --- a/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestDesc.java +++ b/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestDesc.java @@ -122,7 +122,7 @@ public class TestDesc extends TestCase { x.className = "org.apache.hadoop.hive.hbase.HBaseStorageHandler"; x.properties = new HashMap<String, String>(); x.properties.put("hbase.columns.mapping", "cf:string"); - x.properties.put("hbase.mapreduce.hfileoutputformat.table.name", "hbase_table_0"); + x.properties.put("hbase.table.name", "hbase_table_0"); return x; } http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/TestPigHBaseStorageHandler.java ---------------------------------------------------------------------- diff --git a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/TestPigHBaseStorageHandler.java b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/TestPigHBaseStorageHandler.java index 782804c..4778e1f 100644 --- a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/TestPigHBaseStorageHandler.java +++ b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/TestPigHBaseStorageHandler.java @@ -27,15 +27,18 @@ import java.io.FileWriter; import java.io.IOException; import java.net.URI; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; +import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; @@ -111,6 +114,7 @@ public class TestPigHBaseStorageHandler extends SkeletonHBaseTest { private List<Put> generatePuts(String tableName) throws IOException { + List<String> columnFamilies = Arrays.asList("testFamily"); List<Put> myPuts; myPuts = new ArrayList<Put>(); for (int i = 1; i <=10; i++) { @@ -148,7 +152,7 @@ public class TestPigHBaseStorageHandler extends SkeletonHBaseTest { String tableName = newTableName("MyTable"); String databaseName = newTableName("MyDatabase"); - //Table name will be lower case unless specified by hbase.mapreduce.hfileoutputformat.table.name property + //Table name will be lower case unless specified by hbase.table.name property String hbaseTableName = "testTable"; String db_dir = HCatUtil.makePathASafeFileName(getTestDir() + "/hbasedb"); @@ -161,16 +165,17 @@ public class TestPigHBaseStorageHandler extends SkeletonHBaseTest { + "(key float, testqualifier1 string, testqualifier2 int) STORED BY " + "'org.apache.hadoop.hive.hbase.HBaseStorageHandler'" + " WITH SERDEPROPERTIES ('hbase.columns.mapping'=':key,testFamily:testQualifier1,testFamily:testQualifier2')" - + " TBLPROPERTIES ('hbase.mapreduce.hfileoutputformat.table.name'='"+hbaseTableName+"')"; + + " TBLPROPERTIES ('hbase.table.name'='"+hbaseTableName+"')"; CommandProcessorResponse responseOne = driver.run(deleteQuery); assertEquals(0, responseOne.getResponseCode()); + CommandProcessorResponse responseTwo = driver.run(dbQuery); assertEquals(0, responseTwo.getResponseCode()); + CommandProcessorResponse responseThree = driver.run(tableQuery); - assertEquals(0, responseThree.getResponseCode()); Connection connection = null; Admin hAdmin = null; @@ -216,7 +221,7 @@ public class TestPigHBaseStorageHandler extends SkeletonHBaseTest { String tableName = newTableName("MyTable"); String databaseName = newTableName("MyDatabase"); - //Table name will be lower case unless specified by hbase.mapreduce.hfileoutputformat.table.name property + //Table name will be lower case unless specified by hbase.table.name property String hbaseTableName = (databaseName + "." + tableName).toLowerCase(); String db_dir = HCatUtil.makePathASafeFileName(getTestDir() + "/hbasedb"); @@ -240,7 +245,6 @@ public class TestPigHBaseStorageHandler extends SkeletonHBaseTest { CommandProcessorResponse responseThree = driver.run(tableQuery); - assertEquals(0, responseThree.getResponseCode()); Connection connection = null; Admin hAdmin = null; @@ -301,7 +305,7 @@ public class TestPigHBaseStorageHandler extends SkeletonHBaseTest { String tableName = newTableName("MyTable"); String databaseName = newTableName("MyDatabase"); - //Table name will be lower case unless specified by hbase.mapreduce.hfileoutputformat.table.name property + //Table name will be lower case unless specified by hbase.table.name property String hbaseTableName = (databaseName + "." + tableName).toLowerCase(); String db_dir = HCatUtil.makePathASafeFileName(getTestDir() + "/hbasedb"); String POPTXT_FILE_NAME = db_dir+"testfile.txt"; @@ -321,14 +325,16 @@ public class TestPigHBaseStorageHandler extends SkeletonHBaseTest { String selectQuery = "SELECT * from "+databaseName.toLowerCase()+"."+tableName.toLowerCase(); + CommandProcessorResponse responseOne = driver.run(deleteQuery); assertEquals(0, responseOne.getResponseCode()); + CommandProcessorResponse responseTwo = driver.run(dbQuery); assertEquals(0, responseTwo.getResponseCode()); + CommandProcessorResponse responseThree = driver.run(tableQuery); - assertEquals(0, responseThree.getResponseCode()); Connection connection = null; Admin hAdmin = null; @@ -342,6 +348,7 @@ public class TestPigHBaseStorageHandler extends SkeletonHBaseTest { assertTrue(doesTableExist); + createTestDataFile(POPTXT_FILE_NAME); PigServer server = new PigServer(ExecType.LOCAL,hcatConf.getAllProperties()); http://git-wip-us.apache.org/repos/asf/hive/blob/0fc1cd4a/itests/util/src/main/java/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java ---------------------------------------------------------------------- diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java b/itests/util/src/main/java/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java index 0502340..1873bfe 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/hbase/HBaseQTestUtil.java @@ -73,7 +73,7 @@ public class HBaseQTestUtil extends QTestUtil { "CREATE TABLE " + HBASE_SRC_NAME + "(key INT, value STRING)" + " STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'" + " WITH SERDEPROPERTIES ('hbase.columns.mapping' = ':key,cf:val')" - + " TBLPROPERTIES ('hbase.mapreduce.hfileoutputformat.table.name' = '" + HBASE_SRC_NAME + "')" + + " TBLPROPERTIES ('hbase.table.name' = '" + HBASE_SRC_NAME + "')" ); runCmd("INSERT OVERWRITE TABLE " + HBASE_SRC_NAME + " SELECT * FROM src");
