Backport to 2.15.x: #6922: Fix accessor function cagg_get_bucket_function #6933
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.
This is an automated backport of #6922: Fix accessor function cagg_get_bucket_function.
This PR will be merged automatically after all the relevant CI checks pass. If this fix should not be backported, or will be backported manually, just close this PR. You can use the backport branch to add your changes, it won't be modified automatically anymore.
For more details, please see the documentation
Original description
Fix accessor function cagg_get_bucket_function
In #6624 we refactored time_bucket catalog table to be more generic and introduced the
cagg_get_bucket_function
to inspect the query tree of a given Continuous Aggregate and return the time_bucket function oid.The problem with the implementation is we traverse the whole query tree looking for
FuncExpr
and in certain cases we can have two differenttime_bucket
function definition but what matters is the correct and validtime_bucket
function that is part of theQuery->groupClause
.Fixed it by inspecting only the
Query->groupClause
items looking for a valid time bucketFuncExpr
and return itOid
.Disable-check: force-changelog-file