Merge #75760

75760: sql: handle null values in merge_{statement,transaction}_stats builtins r=xinhaoz a=xinhaoz Fixes #75607 The merge_{statement,transaction}_stats builtin functions should skip NULL JSONB values. Release note: None Co-authored-by: Xin Hao Zhang <[email protected]>
cockroachdb · Feb 1, 2022 · 2e5cbeb · 2e5cbeb
2 parents 932b65f + ec4434c
commit 2e5cbeb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/sql/sem/builtins/builtins.go b/pkg/sql/sem/builtins/builtins.go
@@ -4085,6 +4085,9 @@ value if you rely on the HLC for accuracy.`,
 				arr := tree.MustBeDArray(args[0])
 				var aggregatedStats roachpb.StatementStatistics
 				for _, statsDatum := range arr.Array {
+					if statsDatum == tree.DNull {
+						continue
+					}
 					var stats roachpb.StatementStatistics
 					statsJSON := tree.MustBeDJSON(statsDatum).JSON
 					if err := sqlstatsutil.DecodeStmtStatsStatisticsJSON(statsJSON, &stats); err != nil {
@@ -4113,6 +4116,9 @@ value if you rely on the HLC for accuracy.`,
 				arr := tree.MustBeDArray(args[0])
 				var aggregatedStats roachpb.TransactionStatistics
 				for _, statsDatum := range arr.Array {
+					if statsDatum == tree.DNull {
+						continue
+					}
 					var stats roachpb.TransactionStatistics
 					statsJSON := tree.MustBeDJSON(statsDatum).JSON
 					if err := sqlstatsutil.DecodeTxnStatsStatisticsJSON(statsJSON, &stats); err != nil {