Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Removed unnecessary and problematic column caching #2352

Merged
merged 6 commits into from
Apr 16, 2024
Merged

fix: Removed unnecessary and problematic column caching #2352

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a88701f
deprecate column caching
raulbonet Mar 30, 2024
5e0e780
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 30, 2024
f09675f
Merge branch 'main' into rb/2325/deprecate-caching
cjohnhanson Apr 12, 2024
3721c22
Merge branch 'main' into rb/2325/deprecate-caching
edgarrmondragon Apr 12, 2024
5ad307b
Merge branch 'main' into rb/2325/deprecate-caching
edgarrmondragon Apr 15, 2024
3f50ae4
Merge branch 'main' into rb/2325/deprecate-caching
edgarrmondragon Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 17 additions & 25 deletions singer_sdk/connectors/sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ def __init__(
"""
self._config: dict[str, t.Any] = config or {}
self._sqlalchemy_url: str | None = sqlalchemy_url or None
self._table_cols_cache: dict[str, dict[str, sa.Column]] = {}
self._schema_cache: set[str] = set()

@property
def config(self) -> dict:
Expand Down Expand Up @@ -586,12 +584,8 @@ def schema_exists(self, schema_name: str) -> bool:
Returns:
True if the database schema exists, False if not.
"""
if schema_name not in self._schema_cache:
self._schema_cache = set(
sa.inspect(self._engine).get_schema_names(),
)

return schema_name in self._schema_cache
schemas = set(sa.inspect(self._engine).get_schema_names())
return schema_name in schemas

def get_table_columns(
self,
Expand All @@ -607,24 +601,22 @@ def get_table_columns(
Returns:
An ordered list of column objects.
"""
if full_table_name not in self._table_cols_cache:
_, schema_name, table_name = self.parse_full_table_name(full_table_name)
inspector = sa.inspect(self._engine)
columns = inspector.get_columns(table_name, schema_name)

self._table_cols_cache[full_table_name] = {
col_meta["name"]: sa.Column(
col_meta["name"],
col_meta["type"],
nullable=col_meta.get("nullable", False),
)
for col_meta in columns
if not column_names
or col_meta["name"].casefold()
in {col.casefold() for col in column_names}
}
_, schema_name, table_name = self.parse_full_table_name(full_table_name)
inspector = sa.inspect(self._engine)
columns = inspector.get_columns(table_name, schema_name)

columns_dict: dict[str, sa.Column] = {
col_meta["name"]: sa.Column(
col_meta["name"],
col_meta["type"],
nullable=col_meta.get("nullable", False),
)
for col_meta in columns
if not column_names
or col_meta["name"].casefold() in {col.casefold() for col in column_names}
}

return self._table_cols_cache[full_table_name]
return columns_dict

def get_table(
self,
Expand Down