Conversation
serprex
approved these changes
Jun 16, 2026
For a normal foreign scan, it's fine to let Postgres clean up the `batch_cxt` when it clears the memory context. But for a scan that repeatedly re-scans (e.g., `clickhouseEndForeignScan` is called via the `ReScanForeignScan` callback), it Postgres doesn't clear the context until the query finishes. Since pg_clickhouse creates the `ChFdwScanState` anew for each scan (in `clickhouseBeginForeignScan()`), that memory from previous scans would just hang around. Delete `batch_cxt` in `clickhouseEndForeignScan` to ensure the context is cleaned up for every scan. Resolves #273.
This file contains hidden or 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
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.
For a normal foreign scan, it's fine to let Postgres clean up the
batch_cxtwhen it clears the memory context. But for a scan that repeatedly re-scans (e.g.,clickhouseEndForeignScanis called via theReScanForeignScancallback), it Postgres doesn't clear the context until the query finishes. Since pg_clickhouse creates theChFdwScanStateanew for each scan (inclickhouseBeginForeignScan()), that memory from previous scans would just hang around.Delete
batch_cxtinclickhouseEndForeignScanto ensure the context is cleaned up for every scan. Resolves #273.