From 477292a53a9e46efd10a9de24ae2223ee0c358c2 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Tue, 29 Oct 2024 14:08:35 +0100 Subject: [PATCH] Use ordered steps to compute step number --- src/databricks/labs/ucx/assessment/sequencing.py | 4 +--- tests/unit/assessment/test_sequencing.py | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/databricks/labs/ucx/assessment/sequencing.py b/src/databricks/labs/ucx/assessment/sequencing.py index d65b798bf5..321b01ddce 100644 --- a/src/databricks/labs/ucx/assessment/sequencing.py +++ b/src/databricks/labs/ucx/assessment/sequencing.py @@ -237,17 +237,15 @@ def generate_steps(self) -> Iterable[MigrationStep]: queue = self._create_node_queue(incoming) seen = set[MigrationNode]() node = queue.get() - step_number = 1 ordered_steps: list[MigrationStep] = [] while node is not None: - step = node.as_step(step_number, sorted(n.node_id for n in incoming[node.key])) + step = node.as_step(len(ordered_steps), sorted(n.node_id for n in incoming[node.key])) ordered_steps.append(step) seen.add(node) # Update the queue priority as if the migration step was completed for dependency in self._outgoing[node.key]: priority = len(incoming[dependency.key] - seen) queue.update(priority, dependency) - step_number += 1 node = queue.get() return ordered_steps diff --git a/tests/unit/assessment/test_sequencing.py b/tests/unit/assessment/test_sequencing.py index 0afdb6289c..9c7c8cc099 100644 --- a/tests/unit/assessment/test_sequencing.py +++ b/tests/unit/assessment/test_sequencing.py @@ -46,7 +46,7 @@ def get_cluster(cluster_id: str) -> ClusterDetails: assert steps == [ MigrationStep( step_id=2, - step_number=1, + step_number=0, object_type="TASK", object_id="1234/test-task", object_name="test-task", @@ -55,7 +55,7 @@ def get_cluster(cluster_id: str) -> ClusterDetails: ), MigrationStep( step_id=1, - step_number=2, + step_number=1, object_type="JOB", object_id="1234", object_name="test-job", @@ -64,7 +64,7 @@ def get_cluster(cluster_id: str) -> ClusterDetails: ), MigrationStep( step_id=3, - step_number=3, + step_number=2, object_type="CLUSTER", object_id="cluster-123", object_name="my-cluster",