From c9267e23fe7f2643a50d536ee91d5c3603a46cb9 Mon Sep 17 00:00:00 2001 From: Eric Harmeling Date: Mon, 27 Jun 2022 12:35:51 -0400 Subject: [PATCH] sql: rename anonymizedStmt in sqlstats pkg to stmtNoConstants This commit changes all instances of anonymizedStmt to stmtNoConstants in the sqlstats package. The commit does not change any files outside the sqlstats package. Fixes #80725. Release note: None --- .../sqlstats/ssmemstorage/ss_mem_iterator.go | 2 +- .../sqlstats/ssmemstorage/ss_mem_storage.go | 42 +++++++++---------- .../sqlstats/ssmemstorage/ss_mem_writer.go | 6 +-- pkg/sql/sqlstats/ssmemstorage/utils.go | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkg/sql/sqlstats/ssmemstorage/ss_mem_iterator.go b/pkg/sql/sqlstats/ssmemstorage/ss_mem_iterator.go index 531e70cecf0c..8ad677314bb4 100644 --- a/pkg/sql/sqlstats/ssmemstorage/ss_mem_iterator.go +++ b/pkg/sql/sqlstats/ssmemstorage/ss_mem_iterator.go @@ -85,7 +85,7 @@ func (s *StmtStatsIterator) Next() bool { s.currentValue = &roachpb.CollectedStatementStatistics{ Key: roachpb.StatementStatisticsKey{ - Query: stmtKey.anonymizedStmt, + Query: stmtKey.stmtNoConstants, QuerySummary: querySummary, DistSQL: distSQLUsed, Vec: vectorized, diff --git a/pkg/sql/sqlstats/ssmemstorage/ss_mem_storage.go b/pkg/sql/sqlstats/ssmemstorage/ss_mem_storage.go index a0d09361a2d2..4befcc80aacd 100644 --- a/pkg/sql/sqlstats/ssmemstorage/ss_mem_storage.go +++ b/pkg/sql/sqlstats/ssmemstorage/ss_mem_storage.go @@ -48,21 +48,21 @@ type stmtKey struct { // sampledPlanKey is used by the Optimizer to determine if we should build a full EXPLAIN plan. type sampledPlanKey struct { - anonymizedStmt string - failed bool - implicitTxn bool - database string + stmtNoConstants string + failed bool + implicitTxn bool + database string } func (p sampledPlanKey) size() int64 { - return int64(unsafe.Sizeof(p)) + int64(len(p.anonymizedStmt)) + int64(len(p.database)) + return int64(unsafe.Sizeof(p)) + int64(len(p.stmtNoConstants)) + int64(len(p.database)) } func (s stmtKey) String() string { if s.failed { - return "!" + s.anonymizedStmt + return "!" + s.stmtNoConstants } - return s.anonymizedStmt + return s.stmtNoConstants } func (s stmtKey) size() int64 { @@ -259,10 +259,10 @@ func NewTempContainerFromExistingStmtStats( } key := stmtKey{ sampledPlanKey: sampledPlanKey{ - anonymizedStmt: statistics[i].Key.KeyData.Query, - failed: statistics[i].Key.KeyData.Failed, - implicitTxn: statistics[i].Key.KeyData.ImplicitTxn, - database: statistics[i].Key.KeyData.Database, + stmtNoConstants: statistics[i].Key.KeyData.Query, + failed: statistics[i].Key.KeyData.Failed, + implicitTxn: statistics[i].Key.KeyData.ImplicitTxn, + database: statistics[i].Key.KeyData.Database, }, planHash: statistics[i].Key.KeyData.PlanHash, transactionFingerprintID: statistics[i].Key.KeyData.TransactionFingerprintID, @@ -479,7 +479,7 @@ func (s *stmtStats) mergeStatsLocked(statistics *roachpb.CollectedStatementStati // stat object is returned or not, we always return the correct stmtFingerprintID // for the given stmt. func (s *Container) getStatsForStmt( - anonymizedStmt string, + stmtNoConstants string, implicitTxn bool, database string, failed bool, @@ -497,10 +497,10 @@ func (s *Container) getStatsForStmt( // that we use separate buckets for the different situations. key = stmtKey{ sampledPlanKey: sampledPlanKey{ - anonymizedStmt: anonymizedStmt, - failed: failed, - implicitTxn: implicitTxn, - database: database, + stmtNoConstants: stmtNoConstants, + failed: failed, + implicitTxn: implicitTxn, + database: database, }, planHash: planHash, transactionFingerprintID: transactionFingerprintID, @@ -671,10 +671,10 @@ func (s *Container) MergeApplicationStatementStats( } key := stmtKey{ sampledPlanKey: sampledPlanKey{ - anonymizedStmt: statistics.Key.Query, - failed: statistics.Key.Failed, - implicitTxn: statistics.Key.ImplicitTxn, - database: statistics.Key.Database, + stmtNoConstants: statistics.Key.Query, + failed: statistics.Key.Failed, + implicitTxn: statistics.Key.ImplicitTxn, + database: statistics.Key.Database, }, planHash: statistics.Key.PlanHash, transactionFingerprintID: statistics.Key.TransactionFingerprintID, @@ -961,6 +961,6 @@ type transactionCounts struct { func constructStatementFingerprintIDFromStmtKey(key stmtKey) roachpb.StmtFingerprintID { return roachpb.ConstructStatementFingerprintID( - key.anonymizedStmt, key.failed, key.implicitTxn, key.database, + key.stmtNoConstants, key.failed, key.implicitTxn, key.database, ) } diff --git a/pkg/sql/sqlstats/ssmemstorage/ss_mem_writer.go b/pkg/sql/sqlstats/ssmemstorage/ss_mem_writer.go index ed8095698559..5ef4569ffcad 100644 --- a/pkg/sql/sqlstats/ssmemstorage/ss_mem_writer.go +++ b/pkg/sql/sqlstats/ssmemstorage/ss_mem_writer.go @@ -190,9 +190,9 @@ func (s *Container) ShouldSaveLogicalPlanDesc( fingerprint string, implicitTxn bool, database string, ) bool { lastSampled := s.getLogicalPlanLastSampled(sampledPlanKey{ - anonymizedStmt: fingerprint, - implicitTxn: implicitTxn, - database: database, + stmtNoConstants: fingerprint, + implicitTxn: implicitTxn, + database: database, }) return s.shouldSaveLogicalPlanDescription(lastSampled) } diff --git a/pkg/sql/sqlstats/ssmemstorage/utils.go b/pkg/sql/sqlstats/ssmemstorage/utils.go index fa9bdc570e84..26a1094a2027 100644 --- a/pkg/sql/sqlstats/ssmemstorage/utils.go +++ b/pkg/sql/sqlstats/ssmemstorage/utils.go @@ -25,7 +25,7 @@ func (s stmtList) Swap(i, j int) { s[i], s[j] = s[j], s[i] } func (s stmtList) Less(i, j int) bool { - cmp := strings.Compare(s[i].anonymizedStmt, s[j].anonymizedStmt) + cmp := strings.Compare(s[i].stmtNoConstants, s[j].stmtNoConstants) if cmp == -1 { return true }