chore(sqlalchemy): Remove erroneous SQLAlchemy ORM session.merge operations #24776
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
john-bodley
force-pushed
the
john-bodley--cleanup-sqlalchemy-merge
branch
2 times, most recently
from
375f79a to
f34edc5
Compare
Codecov Report
@@ Coverage Diff @@
## master #24776 +/- ##
===========================================
- Coverage 68.96% 58.48% -10.49%
===========================================
Files 1906 1906
Lines 74122 74107 -15
Branches 8208 8208
===========================================
- Hits 51116 43339 -7777
- Misses 20883 28645 +7762
Partials 2123 2123
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 282 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
john-bodley
force-pushed
the
john-bodley--cleanup-sqlalchemy-merge
branch
from
f34edc5 to
5b429b3
Compare
john-bodley
force-pushed
the
john-bodley--cleanup-sqlalchemy-merge
branch
from
5b429b3 to
9e6e897
Compare
john-bodley
changed the title
john-bodley
force-pushed
the
john-bodley--cleanup-sqlalchemy-merge
branch
from
9e6e897 to
0c55386
Compare
john-bodley
commented
Aug 31, 2023
| @@ -141,10 +141,9 @@ def upgrade_slice(cls, slc: Slice) -> Slice: | |||
| if "form_data" in (query_context := try_load_json(slc.query_context)): | |||
| query_context["form_data"] = clz.data | |||
| slc.query_context = json.dumps(query_context) | |||
| return slc | |||
There was a problem hiding this comment.
Previously this was returning the same object as the one being passed in.
john-bodley
force-pushed
the
john-bodley--cleanup-sqlalchemy-merge
branch
3 times, most recently
from
9e5d609 to
1b61a9e
Compare
john-bodley
commented
Aug 31, 2023
| @@ -326,7 +326,8 @@ def virtual_dataset(): | |||
| TableColumn(column_name="col5", type="VARCHAR(255)", table=dataset) | |||
|
|
|||
| SqlMetric(metric_name="count", expression="count(*)", table=dataset) | |||
| db.session.merge(dataset) | |||
| db.session.add(dataset) | |||
| db.session.commit() | |||
There was a problem hiding this comment.
There's likely a lot wrong happening here, but committing seems consistent with the logic on lines 334-335.
john-bodley
force-pushed
the
john-bodley--cleanup-sqlalchemy-merge
branch
from
1b61a9e to
edc8500
Compare
|
ping @michael-s-molina |
| @@ -87,7 +87,6 @@ def update(self) -> Optional[Key]: | |||
| entry.expires_on = self.expires_on | |||
| entry.changed_on = datetime.now() | |||
| entry.changed_by_fk = get_user_id() | |||
| db.session.merge(entry) | |||
There was a problem hiding this comment.
Do you know if the autoflush(False) when querying for the model influences anything?
There was a problem hiding this comment.
@michael-s-molina I'm not entirely sure why auto-flushing has been disabled here (and elsewhere in the key/value commands). Maybe @villebro can provide some context as this was added in #19078.
There was a problem hiding this comment.
@michael-s-molina I removed the unnecessary auto-flush logic in #26009.
9 tasks
john-bodley
force-pushed
the
john-bodley--cleanup-sqlalchemy-merge
branch
from
7cebf8b to
46ffd85
Compare
john-bodley
force-pushed
the
john-bodley--cleanup-sqlalchemy-merge
branch
from
46ffd85 to
77ef809
Compare
john-bodley
changed the title
josedev-union
pushed a commit
to Ortege-xyz/studio
that referenced
this pull request
Jan 22, 2024
cccs-rc
pushed a commit
to CybercentreCanada/superset
that referenced
this pull request
Mar 6, 2024
mistercrunch
added
🏷️ bot
sfirke
pushed a commit
to sfirke/superset
that referenced
this pull request
Mar 22, 2024
vinothkumar66
pushed a commit
to vinothkumar66/superset
that referenced
this pull request
Nov 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
This PR addresses a non-controversial observation from [SIP-99A] Primer on managing SQLAlchemy sessions where we have a tendency to unnecessarily re-merge objects into the SQLAlchemy session which are already present in the seession.
BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF
TESTING INSTRUCTIONS
CI.
ADDITIONAL INFORMATION