Skip to content

Commit 30872fc

Browse files
committed
add object name
1 parent be30d4c commit 30872fc

File tree

1 file changed

+24
-5
lines changed

1 file changed

+24
-5
lines changed

src/databricks/labs/ucx/sequencing/sequencing.py

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class MigrationStep:
1515
step_number: int
1616
object_type: str
1717
object_id: str
18+
object_name: str
1819
object_owner: str
1920
required_step_ids: list[int] = field(default_factory=list)
2021

@@ -25,6 +26,7 @@ class MigrationNode:
2526
node_id: int
2627
object_type: str
2728
object_id: str
29+
object_name: str
2830
object_owner: str
2931
required_steps: list[MigrationNode] = field(default_factory=list)
3032

@@ -46,6 +48,7 @@ def generate_steps(self) -> tuple[MigrationStep, Iterable[MigrationStep]]:
4648
step_number=highest_step_number + 1,
4749
object_type=self.object_type,
4850
object_id=self.object_id,
51+
object_name=self.object_name,
4952
object_owner=self.object_owner,
5053
required_step_ids=required_step_ids,
5154
)
@@ -64,16 +67,23 @@ def find(self, object_type: str, object_id: str) -> MigrationNode | None:
6467
class MigrationSequencer:
6568

6669
def __init__(self):
67-
self._root = MigrationNode(node_id=0, object_type="ROOT", object_id="ROOT", object_owner="NONE")
70+
self._root = MigrationNode(
71+
node_id=0, object_type="ROOT", object_id="ROOT", object_name="ROOT", object_owner="NONE"
72+
)
6873

6974
def register_workflow_task(self, task: jobs.Task, job: jobs.Job, _graph: DependencyGraph) -> MigrationNode:
70-
task_node = self._find_node(object_type="TASK", object_id=task.task_key)
75+
task_id = f"{job.job_id}/{task.task_key}"
76+
task_node = self._find_node(object_type="TASK", object_id=task_id)
7177
if task_node:
7278
return task_node
7379
job_node = self.register_workflow_job(job)
7480
MigrationNode.last_node_id += 1
7581
task_node = MigrationNode(
76-
node_id=MigrationNode.last_node_id, object_type="TASK", object_id=task.task_key, object_owner="NONE"
82+
node_id=MigrationNode.last_node_id,
83+
object_type="TASK",
84+
object_id=task_id,
85+
object_name=task.task_key,
86+
object_owner="NONE",
7787
) # TODO object_owner
7888
job_node.required_steps.append(task_node)
7989
if task.existing_cluster_id:
@@ -89,8 +99,13 @@ def register_workflow_job(self, job: jobs.Job) -> MigrationNode:
8999
if job_node:
90100
return job_node
91101
MigrationNode.last_node_id += 1
102+
job_name = job.settings.name if job.settings and job.settings.name else str(job.job_id)
92103
job_node = MigrationNode(
93-
node_id=MigrationNode.last_node_id, object_type="JOB", object_id=str(job.job_id), object_owner="NONE"
104+
node_id=MigrationNode.last_node_id,
105+
object_type="JOB",
106+
object_id=str(job.job_id),
107+
object_name=job_name,
108+
object_owner="NONE",
94109
) # TODO object_owner
95110
top_level = True
96111
if job.settings and job.settings.job_clusters:
@@ -114,7 +129,11 @@ def register_cluster(self, cluster_key: str) -> MigrationNode:
114129
return cluster_node
115130
MigrationNode.last_node_id += 1
116131
cluster_node = MigrationNode(
117-
node_id=MigrationNode.last_node_id, object_type="CLUSTER", object_id=cluster_key, object_owner="NONE"
132+
node_id=MigrationNode.last_node_id,
133+
object_type="CLUSTER",
134+
object_id=cluster_key,
135+
object_name=cluster_key,
136+
object_owner="NONE",
118137
) # TODO object_owner
119138
# TODO register warehouses and policies
120139
self._root.required_steps.append(cluster_node)

0 commit comments

Comments
 (0)