Merge #157234

157234: batcheval/result: fix spaces in LocalResult.String r=yuzefovich a=yuzefovich

There was a missing space between two elements as well as a dangling space at the end.

Fixes: #157215.
Release note: None

Co-authored-by: Yahor Yuzefovich <[email protected]>

Author: craig[bot]

pkg/kv/kvserver/batcheval/result/result.go

@@ -100,12 +100,12 @@ func (lResult *LocalResult) String() string {
 		return "LocalResult: nil"
 	}
 	return fmt.Sprintf("LocalResult (reply: %v, "+
-		"#encountered intents: %d, #acquired locks: %d, #resolved locks: %d"+
+		"#encountered intents: %d, #acquired locks: %d, #resolved locks: %d "+
 		"#updated txns: %d #end txns: %d, "+
 		"PopulateBarrierResponse:%t RepopulateSubsumeResponse:%t "+
 		"GossipFirstRange:%t MaybeGossipSystemConfig:%t "+
 		"MaybeGossipSystemConfigIfHaveFailure:%t MaybeAddToSplitQueue:%t "+
-		"MaybeGossipNodeLiveness:%s ",
+		"MaybeGossipNodeLiveness:%s",
 		lResult.Reply,
 		len(lResult.EncounteredIntents), len(lResult.AcquiredLocks), len(lResult.ResolvedLocks),
 		len(lResult.UpdatedTxns), len(lResult.EndTxns),

pkg/sql/trace_test.go

@@ -347,11 +347,20 @@ func TestTraceFieldDecomposition(t *testing.T) {
 			},
 		},
 	}
-	s, sqlDB, _ := serverutils.StartServer(t, params)
-	defer s.Stopper().Stop(context.Background())
+	srv, sqlDB, _ := serverutils.StartServer(t, params)
+	defer srv.Stopper().Stop(context.Background())
 
 	sqlDB.SetMaxOpenConns(1)
 
+	if srv.DeploymentMode() == serverutils.ExternalProcess {
+		// Disable RU estimation because it adds a structured payload to the
+		// trace that - when stringified - can have unexpected whitespace (i.e.
+		// it'll be of the form 'r_u:0.625 ').
+		if _, err := sqlDB.Exec("SET CLUSTER SETTING sql.tenant_ru_estimation.enabled = false;"); err != nil {
+			t.Fatal(err)
+		}
+	}
+
 	if _, err := sqlDB.Exec("SET tracing = ON"); err != nil {
 		t.Fatal(err)
 	}