From fbefe4264a3b73967e80f15e95070dc9c00b2b97 Mon Sep 17 00:00:00 2001 From: Rafi Shamim Date: Wed, 23 Nov 2022 14:27:23 -0500 Subject: [PATCH] sql: fix implicit txn flag in console Release note (bug fix): Fixed the statement activity page so that it no longer shows multi-statement implicit transactions as "explicit." --- pkg/sql/conn_executor_exec.go | 3 +-- .../testdata/logic_test/statement_statistics | 13 +++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/sql/conn_executor_exec.go b/pkg/sql/conn_executor_exec.go index ca60c523dbbd..13118bc111e0 100644 --- a/pkg/sql/conn_executor_exec.go +++ b/pkg/sql/conn_executor_exec.go @@ -1117,8 +1117,7 @@ func (ex *connExecutor) dispatchToExecutionEngine( // include gist in error reports ctx = withPlanGist(ctx, planner.instrumentation.planGist.String()) - - if planner.autoCommit { + if planner.extendedEvalCtx.TxnImplicit { planner.curPlan.flags.Set(planFlagImplicitTxn) } diff --git a/pkg/sql/logictest/testdata/logic_test/statement_statistics b/pkg/sql/logictest/testdata/logic_test/statement_statistics index 820cfed4f1d3..8d568fb12d2f 100644 --- a/pkg/sql/logictest/testdata/logic_test/statement_statistics +++ b/pkg/sql/logictest/testdata/logic_test/statement_statistics @@ -61,13 +61,13 @@ select 1, 2; select 1, 2, 3; select 'ok' statement ok SET application_name = '' -query T -SELECT txn_fingerprint_id FROM crdb_internal.node_statement_statistics WHERE application_name = 'multi_stmts_test' ORDER BY txn_fingerprint_id +query TTB +SELECT txn_fingerprint_id, key, implicit_txn FROM crdb_internal.node_statement_statistics WHERE application_name = 'multi_stmts_test' ORDER BY txn_fingerprint_id ---- -10413021493801724718 -10413021493801724718 -10413021493801724718 -17854018046052698166 +10659166962890673102 SELECT '_' true +10659166962890673102 SELECT _, _ true +10659166962890673102 SELECT _, _, _ true +17854018046052698166 SET application_name = '_' true statement ok CREATE TABLE test(x INT, y INT, z INT); INSERT INTO test(x, y, z) VALUES (0,0,0); @@ -256,6 +256,7 @@ ORDER BY key, implicit_txn; ---- key implicit_txn SELECT _ false +SELECT _ true SELECT x FROM test WHERE y = _ false SELECT x FROM test WHERE y = _ false SELECT x FROM test WHERE y = _ true