sql: address a couple of old TODOs#98823
Conversation
|
This change is |
yuzefovich
left a comment
There was a problem hiding this comment.
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @cucaroach and @knz)
pkg/sql/conn_executor_exec.go line 691 at r1 (raw file):
// change would forget to add the call). // // TODO(andrei): really the code should be rearchitected to ensure
IIUC this whole comment as well as TODO are still applicable, so I didn't change anything about it. Also, IIUC the unconditional Step below is still required.
@knz I'm hoping you'd be ok reviewing this patch and confirming my understanding.
knz
left a comment
There was a problem hiding this comment.
Reviewed 6 of 6 files at r1, all commit messages.
Reviewable status:
pkg/sql/conn_executor_exec.go line 691 at r1 (raw file):
Previously, yuzefovich (Yahor Yuzefovich) wrote…
IIUC this whole comment as well as TODO are still applicable, so I didn't change anything about it. Also, IIUC the unconditional
Stepbelow is still required.@knz I'm hoping you'd be ok reviewing this patch and confirming my understanding.
sounds about right.
pkg/sql/conn_executor_exec.go line 1355 at r1 (raw file):
ctx, planner, stmt.AST.StatementReturnType(), res, distribute, progAtomic, ) planner.curPlan.savePlanInfo()
Shouldn't this be in a defer around the call to execWithDistSQLEngine, to handle the case where the call panics? With the previous implementation, savePlanInfo() was called by plan.close during panics.
This commit addresses a couple of old TODOs in the `connExecutor.dispatchToExecutionEngine` method. First, it simply removes the now-stale TODO about needing to `Step()` the txn before executing the query. The TODO mentioned things about the old way FK checks were performed, but we now always run checks in a deferred fashion, and perform the `Step`s correctly there for cascades and checks, thus, the TODO can be removed. (The TODO itself explicitly mentions that it can be removed once we do checks and cascades in the deferred fashion.) Second, it addresses a TODO about how some plan information is saved. Up until 961e66f the cleanup of `planNode` tree and `flow` infra was intertwined, so in 6ae4881 in order to "sample" the plan with correct info (some of which is only available _after_ the execution is done) we delegated that sampling to `planTop.close`. However, with `planNode` tree and `flow` cleanups refactored and de-coupled, we no longer have to close the plan early on. As a result, we now close the plan in a defer right after we create it (now it's the only place we do so), and this commit makes it so that we record the plan info explicitly right after returning from the execution engine, thus, addressing the second TODO. Epic: None Release note: None
562b8e6 to
4d835ec
Compare
There was a problem hiding this comment.
Reviewable status:
pkg/sql/conn_executor_exec.go line 1355 at r1 (raw file):
Previously, knz (Raphael 'kena' Poss) wrote…
Shouldn't this be in a defer around the call to execWithDistSQLEngine, to handle the case where the call panics? With the previous implementation, savePlanInfo() was called by plan.close during panics.
Done.
(Although if the panic were to occur in execWithDistSQLEngine, it wouldn't matter whether we stored this plan info or not - that plan info IIUC is only used in recordStatementSummary, and that method wouldn't execute in case of a panic, but I agree that it's cleaner to just defer it inside of execWithDistSQLEngine. The context for these changes is simplifying the code to make it easier to implement the multiple active portals feature.)
knz
left a comment
There was a problem hiding this comment.
Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status:
|
TFTR! bors r+ |
cucaroach
left a comment
There was a problem hiding this comment.
Reviewed 4 of 6 files at r1, 1 of 1 files at r2.
Reviewable status:
pkg/sql/conn_executor.go line 2766 at r2 (raw file):
// execInsertPlan func(ctx context.Context, p *planner, res RestrictedCommandResult) error { defer p.curPlan.close(ctx)
How important is this? Should it be backported? If copy wanted to scrape post execution stats or anything would the plan need to still be open? Wondering if this should go in insertRowsInternal.
pkg/sql/distsql_running.go line 1552 at r2 (raw file):
evalCtxFactory func(usedConcurrently bool) *extendedEvalContext, ) error { defer planner.curPlan.close(ctx)
Okay this was being called for copy so probably no backport necessary.
yuzefovich
left a comment
There was a problem hiding this comment.
Reviewable status:
pkg/sql/distsql_running.go line 1552 at r2 (raw file):
Previously, cucaroach (Tommy Reilly) wrote…
Okay this was being called for copy so probably no backport necessary.
Yeah, this PR lifts this curPlan.close call a few layers up, so it doesn't fix any bug but is, instead, a "philosophical cleanup".
|
Build succeeded: |
This commit addresses a couple of old TODOs in the
connExecutor.dispatchToExecutionEnginemethod.First, it simply removes the now-stale TODO about needing to
Step()the txn before executing the query. The TODO mentioned things about the old way FK checks were performed, but we now always run checks in a deferred fashion, and perform theSteps correctly there for cascades and checks, thus, the TODO can be removed. (The TODO itself explicitly mentions that it can be removed once we do checks and cascades in the deferred fashion.)Second, it addresses a TODO about how some plan information is saved. Up until 961e66f the cleanup of
planNodetree andflowinfra was intertwined, so in 6ae4881 in order to "sample" the plan with correct info (some of which is only available after the execution is done) we delegated that sampling toplanTop.close. However, withplanNodetree andflowcleanups refactored and de-coupled, we no longer have to close the plan early on. As a result, we now close the plan in a defer right after we create it (now it's the only place we do so), and this commit makes it so that we record the plan info explicitly right after returning from the execution engine, thus, addressing the second TODO.Epic: None
Release note: None