remove hive instance hardcode cluster name

This commit is contained in:
Na Zhang 2016-09-26 15:06:30 -07:00
parent bc06c1a882
commit 5c76f47313

View File

@ -298,6 +298,8 @@ class HiveLoad:
set sdi.dataset_id = d.id where sdi.abstract_dataset_urn = d.urn set sdi.dataset_id = d.id where sdi.abstract_dataset_urn = d.urn
and sdi.db_id = {db_id}; and sdi.db_id = {db_id};
# nzhang fix issue hive_instance.*.csv has hard-coded datacenter
INSERT INTO dict_dataset_instance INSERT INTO dict_dataset_instance
( dataset_id, ( dataset_id,
db_id, db_id,
@ -316,8 +318,8 @@ class HiveLoad:
created_time, created_time,
wh_etl_exec_id wh_etl_exec_id
) )
select s.dataset_id, s.db_id, s.deployment_tier, s.data_center, select s.dataset_id, s.db_id, s.deployment_tier, c.data_center, c.cluster,
s.server_cluster, s.slice, s.status_id, s.native_name, s.logical_name, s.version, s.slice, s.status_id, s.native_name, s.logical_name, s.version,
case when s.version regexp '[0-9]+\.[0-9]+\.[0-9]+' case when s.version regexp '[0-9]+\.[0-9]+\.[0-9]+'
then cast(substring_index(s.version, '.', 1) as unsigned) * 100000000 + then cast(substring_index(s.version, '.', 1) as unsigned) * 100000000 +
cast(substring_index(substring_index(s.version, '.', 2), '.', -1) as unsigned) * 10000 + cast(substring_index(substring_index(s.version, '.', 2), '.', -1) as unsigned) * 10000 +
@ -326,6 +328,7 @@ class HiveLoad:
end version_sort_id, s.schema_text, s.ddl_text, end version_sort_id, s.schema_text, s.ddl_text,
s.instance_created_time, s.created_time, s.wh_etl_exec_id s.instance_created_time, s.created_time, s.wh_etl_exec_id
from stg_dict_dataset_instance s join dict_dataset d on s.dataset_id = d.id from stg_dict_dataset_instance s join dict_dataset d on s.dataset_id = d.id
join cfg_database c on c.db_id = {db_id}
where s.db_id = {db_id} where s.db_id = {db_id}
on duplicate key update on duplicate key update
deployment_tier=s.deployment_tier, data_center=s.data_center, server_cluster=s.server_cluster, slice=s.slice, deployment_tier=s.deployment_tier, data_center=s.data_center, server_cluster=s.server_cluster, slice=s.slice,
@ -335,6 +338,7 @@ class HiveLoad:
; ;
""".format(source_file=self.input_instance_file, db_id=self.db_id, wh_etl_exec_id=self.wh_etl_exec_id) """.format(source_file=self.input_instance_file, db_id=self.db_id, wh_etl_exec_id=self.wh_etl_exec_id)
# didn't load into final table for now # didn't load into final table for now
for state in load_cmd.split(";"): for state in load_cmd.split(";"):