Merge #104293 #104447

104293: logictest: add a regression test for json comparison r=rafiss a=rafiss

fixes #49144

Other work resolved this issue. Add a test to make sure we don't regress on the functionality required by some tools.

Release note: None

104447: roachtest: reduce load for schemachange during tpcc tests r=rafiss a=rafiss

fixes #103552
fixes #103256

We've found that the cluster is overloaded during this test, so this commit scales down the load a little bit.

Release note: None

Co-authored-by: Rafi Shamim <rafi@cockroachlabs.com>

pkg/cmd/roachtest/tests/registry.go

@@ -119,9 +119,9 @@ func RegisterTests(r registry.Registry) {
 	registerSSTableCorruption(r)
 	registerSchemaChangeBulkIngest(r)
 	registerSchemaChangeDuringKV(r)
-	registerSchemaChangeDuringTPCC1000(r)
+	registerSchemaChangeDuringTPCC800(r)
 	registerSchemaChangeIndexTPCC100(r)
-	registerSchemaChangeIndexTPCC1000(r)
+	registerSchemaChangeIndexTPCC800(r)
 	registerSchemaChangeInvertedIndex(r)
 	registerSchemaChangeMixedVersions(r)
 	registerDeclSchemaChangeCompatMixedVersions(r)

pkg/cmd/roachtest/tests/schemachange.go

@@ -295,8 +295,8 @@ func findIndexProblem(
 	return nil
 }
 
-func registerSchemaChangeIndexTPCC1000(r registry.Registry) {
-	r.Add(makeIndexAddTpccTest(r.MakeClusterSpec(5, spec.CPU(16)), 1000, time.Hour*2))
+func registerSchemaChangeIndexTPCC800(r registry.Registry) {
+	r.Add(makeIndexAddTpccTest(r.MakeClusterSpec(5, spec.CPU(16)), 800, time.Hour*2))
 }
 
 func registerSchemaChangeIndexTPCC100(r registry.Registry) {
@@ -420,8 +420,8 @@ func makeSchemaChangeBulkIngestTest(
 	}
 }
 
-func registerSchemaChangeDuringTPCC1000(r registry.Registry) {
-	r.Add(makeSchemaChangeDuringTPCC(r.MakeClusterSpec(5, spec.CPU(16)), 1000, time.Hour*3))
+func registerSchemaChangeDuringTPCC800(r registry.Registry) {
+	r.Add(makeSchemaChangeDuringTPCC(r.MakeClusterSpec(5, spec.CPU(16)), 800, time.Hour*3))
 }
 
 func makeSchemaChangeDuringTPCC(

pkg/sql/logictest/testdata/logic_test/json

@@ -952,3 +952,24 @@ query T
 SELECT j FROM json_subscript_test WHERE j['other_field'] = '2' ORDER BY id
 ----
 {"other_field": 2}
+
+# Regression test for https://github.com/cockroachdb/cockroach/issues/49144.
+# Check that json columns can be compared.
+
+statement ok
+CREATE TABLE test_49144 (
+    value jsonb
+);
+INSERT INTO test_49144 VALUES ('{"c": 2}'), ('{"c": 2.5}'), ('{"c": 3}')
+
+query T
+SELECT * FROM test_49144 WHERE ("test_49144"."value" -> 'c') > '2' ORDER BY 1
+----
+{"c": 2.5}
+{"c": 3}
+
+query T
+SELECT * FROM test_49144 WHERE ("test_49144"."value" -> 'c') > '2.33' ORDER BY 1
+----
+{"c": 2.5}
+{"c": 3}