Skip to content

Commit 908b041

Browse files
committed
Move table migration index to global index
1 parent 05c2d6a commit 908b041

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

src/databricks/labs/ucx/contexts/application.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
from databricks.labs.blueprint.tui import Prompts
1212
from databricks.labs.blueprint.wheels import ProductInfo, WheelsV2
1313
from databricks.labs.lsql.backends import SqlBackend
14+
from databricks.sdk import AccountClient, WorkspaceClient, core
15+
from databricks.sdk.errors import NotFound
16+
from databricks.sdk.service import sql
1417

1518
from databricks.labs.ucx.assessment.dashboards import DashboardOwnership
1619
from databricks.labs.ucx.assessment.jobs import JobsCrawler
@@ -24,9 +27,6 @@
2427
from databricks.labs.ucx.source_code.directfs_access import DirectFsAccessCrawler, DirectFsAccessOwnership
2528
from databricks.labs.ucx.source_code.python_libraries import PythonLibraryResolver
2629
from databricks.labs.ucx.source_code.used_table import UsedTablesCrawler
27-
from databricks.sdk import AccountClient, WorkspaceClient, core
28-
from databricks.sdk.service import sql
29-
3030
from databricks.labs.ucx.account.workspaces import WorkspaceInfo
3131
from databricks.labs.ucx.assessment.azure import AzureServicePrincipalCrawler
3232
from databricks.labs.ucx.assessment.dashboards import LakeviewDashboardCrawler, RedashDashboardCrawler
@@ -48,7 +48,6 @@
4848
PrincipalACL,
4949
)
5050
from databricks.labs.ucx.hive_metastore.mapping import TableMapping
51-
from databricks.labs.ucx.hive_metastore.table_migration_status import TableMigrationIndex
5251
from databricks.labs.ucx.hive_metastore.ownership import (
5352
TableMigrationOwnership,
5453
TableOwnership,
@@ -59,6 +58,7 @@
5958
TableMigrationStatusRefresher,
6059
TablesMigrator,
6160
)
61+
from databricks.labs.ucx.hive_metastore.table_migration_status import TableMigrationIndex
6262
from databricks.labs.ucx.hive_metastore.table_move import TableMove
6363
from databricks.labs.ucx.hive_metastore.udfs import UdfsCrawler, UdfOwnership
6464
from databricks.labs.ucx.hive_metastore.verification import VerifyHasCatalog, VerifyHasMetastore
@@ -585,6 +585,15 @@ def dependency_resolver(self) -> DependencyResolver:
585585
self.pip_resolver, self.notebook_resolver, self.file_resolver, self.file_resolver, self.path_lookup
586586
)
587587

588+
@cached_property
589+
def table_migration_index(self) -> TableMigrationIndex:
590+
try:
591+
index = self.tables_migrator.index()
592+
except NotFound as e:
593+
logger.warning("Table migration index is not found. Initializing empty index.", exc_info=e)
594+
index = TableMigrationIndex([])
595+
return index
596+
588597
@cached_property
589598
def workflow_linter(self) -> WorkflowLinter:
590599
return WorkflowLinter(

src/databricks/labs/ucx/contexts/workspace_cli.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
from databricks.labs.lsql.backends import SqlBackend, StatementExecutionBackend
88
from databricks.sdk import WorkspaceClient
9-
from databricks.sdk.errors import NotFound
109

1110
from databricks.labs.ucx.assessment.aws import AWSResources
1211
from databricks.labs.ucx.framework.utils import run_command
@@ -19,7 +18,6 @@
1918
from databricks.labs.ucx.azure.resources import AzureAPIClient, AzureResources
2019
from databricks.labs.ucx.contexts.application import CliContext
2120
from databricks.labs.ucx.hive_metastore.federation import HiveMetastoreFederation, HiveMetastoreFederationEnabler
22-
from databricks.labs.ucx.hive_metastore.table_migration_status import TableMigrationIndex
2321
from databricks.labs.ucx.progress.install import ProgressTrackingInstallation
2422
from databricks.labs.ucx.source_code.linters.context import LinterContext
2523
from databricks.labs.ucx.source_code.linters.folders import LocalCodeLinter
@@ -212,15 +210,6 @@ class LocalCheckoutContext(WorkspaceContext):
212210
"""Local context extends Workspace context to provide extra properties
213211
for running local operations."""
214212

215-
@cached_property
216-
def _migration_index(self) -> TableMigrationIndex:
217-
try:
218-
index = self.tables_migrator.index()
219-
except NotFound:
220-
logger.warning("Metastore does not seem to exist yet. Skipping loading of migration status.")
221-
index = TableMigrationIndex([])
222-
return index
223-
224213
@cached_property
225214
def local_code_linter(self) -> LocalCodeLinter:
226215
return LocalCodeLinter(
@@ -229,5 +218,5 @@ def local_code_linter(self) -> LocalCodeLinter:
229218
self.folder_loader,
230219
self.path_lookup,
231220
self.dependency_resolver,
232-
lambda: LinterContext(self._migration_index),
221+
lambda: LinterContext(self.table_migration_index),
233222
)

0 commit comments

Comments
 (0)