Merge #144394 #144517

144394: jsonpath: optimize string lookups with arrays instead of maps r=normanchenn a=normanchenn

This commit replaces MethodTypeStrings and OperationTypeStrings maps with arrays since the number of keys are small. The String() methods both now include bounds checking to handle invalid indices.

Epic: None
Release note: None

144517: sqlstatsutil: add sqlType to statement stats json fields r=kyle-a-wong a=kyle-a-wong

The jsonFields receiver on innerStmtStats didn't include the sqlType field, so the sql activity apis always returned an empty string for this field. This field is expected in db console and used to filter sql activity fingerprints by sql type.

Now, this field is properly set and can be used to filter fingerprints in sql activity

Fixes: CC-31238
Epic: CC-30965
Release note (bug fix): Fixes a bug in the sql activity page where filtering on "Statement Type" resulted in 0 results returned. This filter should now work.

Co-authored-by: Norman Chen <[email protected]>
Co-authored-by: Kyle Wong <[email protected]>

Author: 3 people

pkg/sql/sqlstats/persistedsqlstats/sqlstatsutil/json_encoding_test.go

@@ -106,7 +106,8 @@ func TestSQLStatsJsonEncoding(t *testing.T) {
            "min": {{.Float}},
            "max": {{.Float}}
          },
-         "lastErrorCode": "{{.String}}"
+         "lastErrorCode": "{{.String}}",
+				 "sqlType": "{{.String}}" 
        },
        "execution_statistics": {
          "cnt": {{.Int64}},

pkg/sql/sqlstats/persistedsqlstats/sqlstatsutil/json_impl.go

@@ -345,6 +345,7 @@ func (s *innerStmtStats) jsonFields() jsonFields {
 		{"lastErrorCode", (*jsonString)(&s.LastErrorCode)},
 		{"failureCount", (*jsonInt)(&s.FailureCount)},
 		{"genericCount", (*jsonInt)(&s.GenericCount)},
+		{"sqlType", (*jsonString)(&s.SQLType)},
 	}
 }
 

pkg/util/jsonpath/method.go

@@ -15,7 +15,7 @@ const (
 	TypeMethod
 )
 
-var MethodTypeStrings = map[MethodType]string{
+var methodTypeStrings = [...]string{
 	SizeMethod: "size",
 	TypeMethod: "type",
 }
@@ -27,5 +27,8 @@ type Method struct {
 var _ Path = Method{}
 
 func (m Method) String() string {
-	return fmt.Sprintf(".%s()", MethodTypeStrings[m.Type])
+	if int(m.Type) < 0 || int(m.Type) >= len(methodTypeStrings) || m.Type == InvalidMethod {
+		panic(fmt.Sprintf("invalid method type: %d", m.Type))
+	}
+	return fmt.Sprintf(".%s()", methodTypeStrings[m.Type])
 }

pkg/util/jsonpath/operation.go

@@ -10,7 +10,8 @@ import "fmt"
 type OperationType int
 
 const (
-	OpCompEqual OperationType = iota
+	OpInvalid OperationType = iota
+	OpCompEqual
 	OpCompNotEqual
 	OpCompLess
 	OpCompLessEqual
@@ -32,7 +33,7 @@ const (
 	OpStartsWith
 )
 
-var OperationTypeStrings = map[OperationType]string{
+var OperationTypeStrings = [...]string{
 	OpCompEqual:        "==",
 	OpCompNotEqual:     "!=",
 	OpCompLess:         "<",
@@ -64,6 +65,9 @@ type Operation struct {
 var _ Path = Operation{}
 
 func (o Operation) String() string {
+	if int(o.Type) < 0 || int(o.Type) >= len(OperationTypeStrings) || o.Type == OpInvalid {
+		panic(fmt.Sprintf("invalid operation type: %d", o.Type))
+	}
 	// TODO(normanchenn): Fix recursive brackets. When there is a operation like
 	// 1 == 1 && 1 != 1, postgres will output (1 == 1 && 1 != 1), but we output
 	// ((1 == 1) && (1 != 1)).