Skip to content

fix!: rename renderer cache so it's not serialized #3039

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
tobymao merged 2 commits into from
Aug 23, 2024
Merged

fix!: rename renderer cache so it's not serialized #3039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
565ce1b
fix!: rename renderer cache so it's not serialized
tobymao Aug 23, 2024
8b7a7cb
delete cache in migration script
tobymao Aug 23, 2024
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
1 change: 1 addition & 0 deletions .circleci/test_migration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ cp -r ./examples/sushi $TMP_DIR
pushd $SUSHI_DIR
rm -rf ./data/*
sqlmesh --gateway $GATEWAY_NAME plan --no-prompts --auto-apply
rm -rf .cache
popd

# Switch back to the starting state of the repository
Expand Down
12 changes: 6 additions & 6 deletions sqlmesh/core/model/definition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class _Model(ModelMeta, frozen=True):
mapping_schema: t.Dict[str, t.Any] = {}

_full_depends_on: t.Optional[t.Set[str]] = None
__statement_renderers: t.Dict[int, ExpressionRenderer] = {}
_statement_renderer_cache: t.Dict[int, ExpressionRenderer] = {}

pre_statements_: t.Optional[t.List[exp.Expression]] = Field(
default=None, alias="pre_statements"
Expand All @@ -133,12 +133,12 @@ class _Model(ModelMeta, frozen=True):
def __getstate__(self) -> t.Dict[t.Any, t.Any]:
state = super().__getstate__()
private = state[PRIVATE_FIELDS]
private["_SqlBasedModel__statement_renderers"] = {}
private["_statement_renderer_cache"] = {}
return state

def copy(self, **kwargs: t.Any) -> Self:
model = super().copy(**kwargs)
model.__statement_renderers = {}
model._statement_renderer_cache = {}
return model

def render(
Expand Down Expand Up @@ -437,8 +437,8 @@ def _render_statements(

def _statement_renderer(self, expression: exp.Expression) -> ExpressionRenderer:
expression_key = id(expression)
if expression_key not in self.__statement_renderers:
self.__statement_renderers[expression_key] = ExpressionRenderer(
if expression_key not in self._statement_renderer_cache:
self._statement_renderer_cache[expression_key] = ExpressionRenderer(
expression,
self.dialect,
self.macro_definitions,
Expand All @@ -449,7 +449,7 @@ def _statement_renderer(self, expression: exp.Expression) -> ExpressionRenderer:
default_catalog=self.default_catalog,
model_fqn=self.fqn,
)
return self.__statement_renderers[expression_key]
return self._statement_renderer_cache[expression_key]

def render_signals(
self,
Expand Down