Merge pull request #109515 from maryliag/backport23.1-109444

release-23.1: cli, zip: fix column name

pkg/cli/zip_table_registry.go

@@ -252,7 +252,7 @@ var zipInternalTablesPerCluster = DebugZipTableRegistry{
 			"txn_fingerprint_id",
 			"query",
 			"implicit_txn",
-			"session_id,",
+			"session_id",
 			"start_time",
 			"end_time",
 			"user_name",
@@ -896,7 +896,7 @@ var zipInternalTablesPerNode = DebugZipTableRegistry{
 			"txn_fingerprint_id",
 			"query",
 			"implicit_txn",
-			"session_id,",
+			"session_id",
 			"start_time",
 			"end_time",
 			"user_name",

pkg/cli/zip_table_registry_test.go

@@ -13,6 +13,7 @@ package cli
 import (
 	"context"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/cockroachdb/cockroach/pkg/base"
@@ -162,7 +163,7 @@ func TestCustomQuery(t *testing.T) {
 	ctx := context.Background()
 
 	params, _ := tests.CreateTestServerParams()
-	cluster := serverutils.StartNewTestCluster(t, 3 /* numNodes */, base.TestClusterArgs{
+	cluster := serverutils.StartNewTestCluster(t, 1 /* numNodes */, base.TestClusterArgs{
 		ServerArgs: params,
 	})
 	testConn := cluster.ServerConn(0 /* idx */)
@@ -173,3 +174,32 @@ func TestCustomQuery(t *testing.T) {
 	executeAllCustomQuerys(t, sqlDB, zipInternalTablesPerNode)
 	executeAllCustomQuerys(t, sqlDB, zipSystemTables)
 }
+
+func executeSelectOnNonSensitiveColumns(
+	t *testing.T, sqlDB *sqlutils.SQLRunner, tableRegistry DebugZipTableRegistry,
+) {
+
+	for table, regConfig := range tableRegistry {
+		if len(regConfig.nonSensitiveCols) != 0 {
+			columns := strings.Join(regConfig.nonSensitiveCols[:], ",")
+			rows := sqlDB.Query(t, fmt.Sprintf("SELECT %s FROM %s", columns, table))
+			require.NoError(t, rows.Err(), "failed to select non sensitive columns on table %s", table)
+		}
+	}
+}
+
+func TestNonSensitiveColumns(t *testing.T) {
+	defer leaktest.AfterTest(t)()
+
+	params, _ := tests.CreateTestServerParams()
+	cluster := serverutils.StartNewTestCluster(t, 1 /* numNodes */, base.TestClusterArgs{
+		ServerArgs: params,
+	})
+	defer cluster.Stopper().Stop(context.Background())
+	testConn := cluster.ServerConn(0 /* idx */)
+	sqlDB := sqlutils.MakeSQLRunner(testConn)
+
+	executeSelectOnNonSensitiveColumns(t, sqlDB, zipInternalTablesPerCluster)
+	executeSelectOnNonSensitiveColumns(t, sqlDB, zipInternalTablesPerNode)
+	executeSelectOnNonSensitiveColumns(t, sqlDB, zipSystemTables)
+}