From c76b06d37d9a3a246b565e74d617845e9fc8e719 Mon Sep 17 00:00:00 2001
From: Wenyi Hu <wenyi@cockroachlabs.com>
Date: Tue, 28 Jan 2025 12:10:23 -0500
Subject: [PATCH] cdctest: fix fingerprint validator primary key cols check

Previously, fingerprint validator could fail with sql smith due to precision
loss from JSON encoding & decoding of large numbers. We previously fixed the
validator regarding its values check. This patch fixes the primary key columns
check accordingly.

Part of: https://github.com/cockroachdb/cockroach/issues/124146
Release note: none
---
 pkg/ccl/changefeedccl/cdctest/nemeses.go   |  4 --
 pkg/ccl/changefeedccl/cdctest/validator.go | 53 ++++------------------
 2 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/pkg/ccl/changefeedccl/cdctest/nemeses.go b/pkg/ccl/changefeedccl/cdctest/nemeses.go
index 515a8a37b56b..5605dd2104eb 100644
--- a/pkg/ccl/changefeedccl/cdctest/nemeses.go
+++ b/pkg/ccl/changefeedccl/cdctest/nemeses.go
@@ -240,10 +240,6 @@ type NemesesOption struct {
 var NemesesOptions = []NemesesOption{
 	{
 		EnableFpValidator: true,
-		EnableSQLSmith:    false,
-	},
-	{
-		EnableFpValidator: false,
 		EnableSQLSmith:    true,
 	},
 }
diff --git a/pkg/ccl/changefeedccl/cdctest/validator.go b/pkg/ccl/changefeedccl/cdctest/validator.go
index 3559b303344c..dca57702f43c 100644
--- a/pkg/ccl/changefeedccl/cdctest/validator.go
+++ b/pkg/ccl/changefeedccl/cdctest/validator.go
@@ -804,32 +804,16 @@ func (v *FingerprintValidator) applyRowUpdate(row validatorRow) (_err error) {
 		stmtBuf.WriteString(`)`)
 
 		// Also verify that the key matches the value.
-		type wrapper struct {
-			After map[string]interface{} `json:"after"`
-		}
-		var value wrapper
-		if err := gojson.Unmarshal([]byte(row.value), &value); err != nil {
-			return err
-		}
-		primaryKeyDatums := make([]interface{}, len(v.primaryKeyCols))
 		for idx, primaryKeyCol := range v.primaryKeyCols {
-			primaryKeyDatums[idx] = value.After[primaryKeyCol]
-		}
-		primaryKeyJSON, err := gojson.Marshal(primaryKeyDatums)
-		if err != nil {
-			return err
-		}
-
-		rowKey := row.key
-		if len(primaryKeyDatums) > 1 {
-			// format the key using the Go marshaller; otherwise, differences
-			// in formatting could lead to the comparison below failing
-			rowKey = asGoJSON(row.key)
-		}
-		if string(primaryKeyJSON) != rowKey {
-			v.failures = append(v.failures,
-				fmt.Sprintf(`key %s did not match expected key %s for value %s`,
-					rowKey, primaryKeyJSON, row.value))
+			valueJSON, err := afterJSON.FetchValKey(primaryKeyCol)
+			if err != nil {
+				return err
+			}
+			if rowKeyValue := keyJSONAsArray[idx]; valueJSON != rowKeyValue {
+				v.failures = append(v.failures,
+					fmt.Sprintf(`key %s did not match expected key %s for value %s`,
+						primaryKeyCol, rowKeyValue, valueJSON))
+			}
 		}
 	} else {
 		// DELETE
@@ -1096,22 +1080,3 @@ func fetchPrimaryKeyCols(sqlDB *gosql.DB, tableStr string) ([]string, error) {
 	}
 	return primaryKeyCols, nil
 }
-
-// asGoJSON tries to unmarshal the given string as JSON; if
-// successful, the struct is marshalled back to JSON. This is to
-// enforce the default formatting of the standard library marshaller,
-// allowing comparisons of JSON strings when we don't control the
-// formatting of the strings.
-func asGoJSON(s string) string {
-	var obj interface{}
-	if err := gojson.Unmarshal([]byte(s), &obj); err != nil {
-		return s
-	}
-
-	blob, err := gojson.Marshal(obj)
-	if err != nil {
-		return s
-	}
-
-	return string(blob)
-}