Skip to content

fix: Load cached DB metadata as DatasourceName and add catalog to schema_list cache key #31948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Vitor-Avila merged 1 commit into from
Jan 21, 2025
+11 −8
Merged

fix: Load cached DB metadata as DatasourceName and add catalog to schema_list cache key #31948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions superset/commands/database/tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
from superset.exceptions import SupersetException
from superset.extensions import db, security_manager
from superset.models.core import Database
from superset.utils.core import DatasourceName

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -59,7 +60,8 @@ def run(self) -> dict[str, Any]:
catalog=self._catalog_name,
schema=self._schema_name,
datasource_names=sorted(
self._model.get_all_table_names_in_schema(
DatasourceName(*datasource_name)
for datasource_name in self._model.get_all_table_names_in_schema(
catalog=self._catalog_name,
schema=self._schema_name,
force=self._force,
Expand All @@ -74,7 +76,8 @@ def run(self) -> dict[str, Any]:
catalog=self._catalog_name,
schema=self._schema_name,
datasource_names=sorted(
self._model.get_all_view_names_in_schema(
DatasourceName(*datasource_name)
for datasource_name in self._model.get_all_view_names_in_schema(
catalog=self._catalog_name,
schema=self._schema_name,
force=self._force,
Expand Down
12 changes: 6 additions & 6 deletions superset/models/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
)
from superset.utils import cache as cache_util, core as utils, json
from superset.utils.backports import StrEnum
from superset.utils.core import DatasourceName, get_username
from superset.utils.core import get_username
from superset.utils.oauth2 import get_oauth2_access_token, OAuth2ClientConfigSchema

config = app.config
Expand Down Expand Up @@ -798,7 +798,7 @@ def get_all_table_names_in_schema(
self,
catalog: str | None,
schema: str,
) -> set[DatasourceName]:
) -> set[tuple[str, str, str | None]]:
"""Parameters need to be passed as keyword arguments.

For unused parameters, they are referenced in
Expand All @@ -814,7 +814,7 @@ def get_all_table_names_in_schema(
try:
with self.get_inspector(catalog=catalog, schema=schema) as inspector:
return {
DatasourceName(table, schema, catalog)
(table, schema, catalog)
for table in self.db_engine_spec.get_table_names(
database=self,
inspector=inspector,
Expand All @@ -832,7 +832,7 @@ def get_all_view_names_in_schema(
self,
catalog: str | None,
schema: str,
) -> set[DatasourceName]:
) -> set[tuple[str, str, str | None]]:
"""Parameters need to be passed as keyword arguments.

For unused parameters, they are referenced in
Expand All @@ -848,7 +848,7 @@ def get_all_view_names_in_schema(
try:
with self.get_inspector(catalog=catalog, schema=schema) as inspector:
return {
DatasourceName(view, schema, catalog)
(view, schema, catalog)
for view in self.db_engine_spec.get_view_names(
database=self,
inspector=inspector,
Expand All @@ -873,7 +873,7 @@ def get_inspector(
yield sqla.inspect(engine)

@cache_util.memoized_func(
key="db:{self.id}:schema_list",
key="db:{self.id}:catalog:{catalog}:schema_list",
cache=cache_manager.cache,
)
def get_all_schema_names(
Expand Down