Merge cockroachdb#107586 cockroachdb#108147 cockroachdb#108191

107586: sql: remove deferred c.bufferReadyForQuery r=rafiss a=ecwall

Informs cockroachdb#105448

This line is only used in a testing knob, but is not required by any tests so
it can be removed.

Release note: None

108147: ui: upgrade typescript from v4 to v5 r=maryliag a=maryliag

Upgrade Typescript from v4 to v5, that has a smaller size, is faster and adds new features.

This commit make some updates that were causing errors
on the new Typescript version, such as type mismatch error. [1]

[1] https://devblogs.microsoft.com/typescript/announcing-typescript-5-0/#forbidden-implicit-coercions-in-relational-operators
Epic: none

Release note: None

108191: changefeedccl: fix row count in nemeses test r=miretskiy a=jayshrivastava

There was a bug in this test where, when using the declarative schema changer, we would increment the running row count by a factor of 3 when doing addColumn/dropColumn operations. This behavior aligns with the legacy schema changer where we expect to see two backfills. For the declarative schema changer, we should only double the row count because we see one backfill.

In cockroachdb#108155, this bug was caused the rowcount would be incorrectly nonzero which would cause test would get stuck waiting for rows to be emitted.

Fixes: cockroachdb#108155
Release note: None
Epic: None

Co-authored-by: Evan Wall <[email protected]>
Co-authored-by: maryliag <[email protected]>
Co-authored-by: Jayant Shrivastava <[email protected]>

Author: 4 people

pkg/ccl/changefeedccl/cdctest/nemeses.go

@@ -30,7 +30,7 @@ import (
 // real output of a changefeed. The output rows and resolved timestamps of the
 // tested feed are fed into them to check for anomalies.
 func RunNemesis(
-	f TestFeedFactory, db *gosql.DB, isSinkless bool, rng *rand.Rand,
+	f TestFeedFactory, db *gosql.DB, isSinkless bool, withLegacySchemaChanger bool, rng *rand.Rand,
 ) (Validator, error) {
 	// possible additional nemeses:
 	// - schema changes
@@ -54,9 +54,10 @@ func RunNemesis(
 		eventPauseCount = 0
 	}
 	ns := &nemeses{
-		maxTestColumnCount: 10,
-		rowCount:           4,
-		db:                 db,
+		withLegacySchemaChanger: withLegacySchemaChanger,
+		maxTestColumnCount:      10,
+		rowCount:                4,
+		db:                      db,
 		// eventMix does not have to add to 100
 		eventMix: map[fsm.Event]int{
 			// We don't want `eventFinished` to ever be returned by `nextEvent` so we set
@@ -262,6 +263,8 @@ type addColumnPayload struct {
 }
 
 type nemeses struct {
+	withLegacySchemaChanger bool
+
 	rowCount           int
 	maxTestColumnCount int
 	eventMix           map[fsm.Event]int
@@ -692,9 +695,14 @@ func addColumn(a fsm.Args) error {
 	if err := ns.db.QueryRow(`SELECT count(*) FROM foo`).Scan(&rows); err != nil {
 		return err
 	}
-	// We expect one table scan that corresponds to the schema change backfill, and one
-	// scan that corresponds to the changefeed level backfill.
-	ns.availableRows += 2 * rows
+	if ns.withLegacySchemaChanger {
+		// We expect one table scan that corresponds to the schema change backfill, and one
+		// scan that corresponds to the changefeed level backfill.
+		ns.availableRows += 2 * rows
+	} else {
+		// We expect to see a backfill
+		ns.availableRows += rows
+	}
 	return nil
 }
 
@@ -715,9 +723,14 @@ func removeColumn(a fsm.Args) error {
 	if err := ns.db.QueryRow(`SELECT count(*) FROM foo`).Scan(&rows); err != nil {
 		return err
 	}
-	// We expect one table scan that corresponds to the schema change backfill, and one
-	// scan that corresponds to the changefeed level backfill.
-	ns.availableRows += 2 * rows
+	if ns.withLegacySchemaChanger {
+		// We expect one table scan that corresponds to the schema change backfill, and one
+		// scan that corresponds to the changefeed level backfill.
+		ns.availableRows += 2 * rows
+	} else {
+		// We expect to see a backfill
+		ns.availableRows += rows
+	}
 	return nil
 }
 

pkg/ccl/changefeedccl/nemeses_test.go

@@ -32,11 +32,11 @@ func TestChangefeedNemeses(t *testing.T) {
 		t.Logf("random seed: %d", seed)
 
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
-		_ = maybeDisableDeclarativeSchemaChangesForTest(t, sqlDB, rng)
+		withLegacySchemaChanger := maybeDisableDeclarativeSchemaChangesForTest(t, sqlDB, rng)
 		// TODO(dan): Ugly hack to disable `eventPause` in sinkless feeds. See comment in
 		// `RunNemesis` for details.
 		isSinkless := strings.Contains(t.Name(), "sinkless")
-		v, err := cdctest.RunNemesis(f, s.DB, isSinkless, rng)
+		v, err := cdctest.RunNemesis(f, s.DB, isSinkless, withLegacySchemaChanger, rng)
 		if err != nil {
 			t.Fatalf("%+v", err)
 		}

pkg/sql/pgwire/conn.go

@@ -187,9 +187,6 @@ func (c *conn) processCommands(
 				_ = c.writeErr(ctx, retErr, &c.writerState.buf)
 				_ /* n */, _ /* err */ = c.writerState.buf.WriteTo(c.conn)
 				c.stmtBuf.Close()
-				// Send a ready for query to make sure the client can react.
-				// TODO(andrei, jordan): Why are we sending this exactly?
-				c.bufferReadyForQuery('I')
 			}
 		}
 		if !authOK {