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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rowexec: fix usage of the shared "single datum" acc in windower #89050

Merged
merged 1 commit into from
Sep 30, 2022
Merged

rowexec: fix usage of the shared "single datum" acc in windower #89050

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 20 additions & 19 deletions pkg/sql/rowexec/windower.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,26 @@ func newWindower(
w.inputTypes = input.OutputTypes()
ctx := evalCtx.Ctx()

// Limit the memory use by creating a child monitor with a hard limit.
// windower will overflow to disk if this limit is not enough.
limit := execinfra.GetWorkMemLimit(flowCtx)
if limit < memRequiredByWindower {
// The limit is set very low (likely by the tests in order to improve
// the test coverage), but the windower requires some amount of RAM, so
// we override the limit. This behavior is acceptable given that we
// don't expect anyone to lower the setting to less than 100KiB in
// production.
limit = memRequiredByWindower
}
limitedMon := mon.NewMonitorInheritWithLimit("windower-limited", limit, evalCtx.Mon)
limitedMon.StartNoReserved(ctx, evalCtx.Mon)
w.acc = limitedMon.MakeBoundAccount()
// If we have aggregate builtins that aggregate a single datum, we want
// them to reuse the same shared memory account with the windower. Notably,
// we need to update the eval context before constructing the window
// builtins.
evalCtx.SingleDatumAggMemAccount = &w.acc

w.partitionBy = spec.PartitionBy
windowFns := spec.WindowFns
w.windowFns = make([]*windowFunc, 0, len(windowFns))
Expand Down Expand Up @@ -145,20 +165,6 @@ func newWindower(
}
w.outputRow = make(rowenc.EncDatumRow, len(w.outputTypes))

// Limit the memory use by creating a child monitor with a hard limit.
// windower will overflow to disk if this limit is not enough.
limit := execinfra.GetWorkMemLimit(flowCtx)
if limit < memRequiredByWindower {
// The limit is set very low (likely by the tests in order to improve
// the test coverage), but the windower requires some amount of RAM, so
// we override the limit. This behavior is acceptable given that we
// don't expect anyone to lower the setting to less than 100KiB in
// production.
limit = memRequiredByWindower
}
limitedMon := mon.NewMonitorInheritWithLimit("windower-limited", limit, evalCtx.Mon)
limitedMon.StartNoReserved(ctx, evalCtx.Mon)

if err := w.InitWithEvalCtx(
w,
post,
Expand Down Expand Up @@ -191,11 +197,6 @@ func newWindower(
return nil, err
}

w.acc = w.MemMonitor.MakeBoundAccount()
// If we have aggregate builtins that aggregate a single datum, we want
// them to reuse the same shared memory account with the windower.
evalCtx.SingleDatumAggMemAccount = &w.acc

if execstats.ShouldCollectStats(ctx, flowCtx.CollectStats) {
w.input = newInputStatCollector(w.input)
w.ExecStatsForTrace = w.execStatsForTrace
Expand Down