Merge #26044 #26048

26044: misc: fix encryption stats nits. r=mberhault a=mberhault

Nothing major, followups to premature merge of #25850

Release note: None

26048: tpccbench: fix existing dataset fast-path r=nvanbenschoten a=nvanbenschoten

This skewed with #24735, which changed the output of `information_schema`
when connecting to an implicit database.

Release note: None

Co-authored-by: marc <marc@cockroachlabs.com>
Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>

Author: 3 people

c-deps/libroach/ccl/db.cc

@@ -39,13 +39,13 @@ class CCLEnvStatsHandler : public EnvStatsHandler {
     enginepbccl::EncryptionStatus enc_status;
 
     bool has_stats = false;
-    if (this->store_key_manager_ != nullptr) {
+    if (store_key_manager_ != nullptr) {
       has_stats = true;
       // Transfer ownership of new key info to status proto, this frees any previous value.
       enc_status.set_allocated_active_store_key(store_key_manager_->CurrentKeyInfo().release());
     }
 
-    if (this->data_key_manager_ != nullptr) {
+    if (data_key_manager_ != nullptr) {
       has_stats = true;
       // Transfer ownership of new key info to status proto, this frees any previous value.
       enc_status.set_allocated_active_data_key(data_key_manager_->CurrentKeyInfo().release());

pkg/cmd/roachtest/tpcc.go

@@ -22,10 +22,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/lib/pq"
+	"github.com/pkg/errors"
+
+	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
 	"github.com/cockroachdb/cockroach/pkg/util/color"
 	"github.com/cockroachdb/cockroach/pkg/util/search"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
-	"github.com/pkg/errors"
 )
 
 func registerTPCC(r *registry) {
@@ -138,15 +141,9 @@ func loadTPCCBench(
 
 	// Check if the dataset already exists and is already large enough to
 	// accommodate this benchmarking. If so, we can skip the fixture RESTORE.
-	var tableExists bool
-	if err := db.QueryRowContext(ctx, `
-		SELECT COUNT(*) > 0
-		FROM INFORMATION_SCHEMA.TABLES
-		WHERE TABLE_CATALOG = 'tpcc' AND TABLE_NAME = 'warehouse'`,
-	).Scan(&tableExists); err != nil {
-		return err
-	}
-	if tableExists {
+	if _, err := db.ExecContext(ctx, `USE tpcc`); err == nil {
+		c.l.printf("found existing tpcc database\n")
+
 		var curWarehouses int
 		if err := db.QueryRowContext(ctx,
 			`SELECT COUNT(*) FROM tpcc.warehouse`,
@@ -162,6 +159,9 @@ func loadTPCCBench(
 		// before restoring.
 		c.Wipe(ctx, roachNodes)
 		c.Start(ctx, roachNodes)
+	} else if pqErr, ok := err.(*pq.Error); !ok ||
+		string(pqErr.Code) != pgerror.CodeInvalidCatalogNameError {
+		return err
 	}
 
 	// Load the corresponding fixture.

pkg/storage/engine/engine.go

@@ -348,7 +348,7 @@ type Stats struct {
 
 // EnvStats is a set of RocksDB env stats, including encryption status.
 type EnvStats struct {
-	// EncryptionStatus is a serialized	enginepbccl/stats.proto::EncryptionStatus protobuf.
+	// EncryptionStatus is a serialized enginepbccl/stats.proto::EncryptionStatus protobuf.
 	EncryptionStatus []byte
 }