Merge cockroachdb#105577

105577: sql: add crdb_internal.kv_protected_ts_records virtual table r=jayshrivastava a=jayshrivastava

This change adds a new virtual table `crdb_internal.kv_protected_ts_records` which provides better visability into PTS records than `system.protected_ts_records`. This virtual table includes all columns from the system table and adds the following columns:
- `num_ranges INT`: the number of ranges protected by the PTS record. Note this does not
  count ranges when the PTS record is protecting a database, cluster, or tenant. It
  only counts ranges protected by tables. Adding support for databases, clusters,
  and tenants is left as a TODO.
- `decoded_meta JSON`: the decoded `meta` column from the system table. For the jobs `meta_type`,
  this contains the job ID. For the schedules `meta_type`, this is contains the schedule ID.
- `decoded_target JSON`: the decoded `ptpb.Target` field.
- `internal_meta JSON`: any additional metadata added by this table. For the jobs `meta_type`,
  this contains the job owner. For the schedules `meta_type`, this contains the schedule label
  and owner.

This change also adds this table to the debug zip.

Release note: None
Closes: cockroachdb#104161
Epic: None

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

Author: craig[bot]

pkg/ccl/changefeedccl/changefeed_dist.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/cdceval"
 	"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedbase"
-	"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/kvfeed"
 	"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
 	"github.com/cockroachdb/cockroach/pkg/jobs/jobsprofiler"
 	"github.com/cockroachdb/cockroach/pkg/kv"
@@ -521,7 +520,7 @@ type distResolver struct {
 func (r *distResolver) getRangesForSpans(
 	ctx context.Context, spans []roachpb.Span,
 ) ([]roachpb.Span, error) {
-	spans, _, err := kvfeed.AllRangeSpans(ctx, r.DistSender, spans)
+	spans, _, err := r.DistSender.AllRangeSpans(ctx, spans)
 	return spans, err
 }
 

pkg/ccl/changefeedccl/kvfeed/BUILD.bazel

@@ -24,7 +24,6 @@ go_library(
         "//pkg/settings/cluster",
         "//pkg/sql/covering",
         "//pkg/storage/enginepb",
-        "//pkg/util",
         "//pkg/util/admission/admissionpb",
         "//pkg/util/ctxgroup",
         "//pkg/util/hlc",

pkg/ccl/changefeedccl/kvfeed/scanner.go

@@ -25,7 +25,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/covering"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
-	"github.com/cockroachdb/cockroach/pkg/util"
 	"github.com/cockroachdb/cockroach/pkg/util/admission/admissionpb"
 	"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
@@ -254,7 +253,7 @@ func (p *scanRequestScanner) exportSpan(
 func getRangesToProcess(
 	ctx context.Context, ds *kvcoord.DistSender, targetSpans []roachpb.Span,
 ) ([]roachpb.Span, int, error) {
-	ranges, numNodes, err := AllRangeSpans(ctx, ds, targetSpans)
+	ranges, numNodes, err := ds.AllRangeSpans(ctx, targetSpans)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -324,40 +323,6 @@ func slurpScanResponse(
 	return nil
 }
 
-// AllRangeSpans returns the list of all ranges that cover input spans along with the
-// nodeCountHint indicating the number of nodes that host those ranges.
-func AllRangeSpans(
-	ctx context.Context, ds *kvcoord.DistSender, spans []roachpb.Span,
-) (_ []roachpb.Span, nodeCountHint int, _ error) {
-	ranges := make([]roachpb.Span, 0, len(spans))
-
-	it := kvcoord.MakeRangeIterator(ds)
-	var replicas util.FastIntMap
-
-	for i := range spans {
-		rSpan, err := keys.SpanAddr(spans[i])
-		if err != nil {
-			return nil, 0, err
-		}
-		for it.Seek(ctx, rSpan.Key, kvcoord.Ascending); ; it.Next(ctx) {
-			if !it.Valid() {
-				return nil, 0, it.Error()
-			}
-			ranges = append(ranges, roachpb.Span{
-				Key: it.Desc().StartKey.AsRawKey(), EndKey: it.Desc().EndKey.AsRawKey(),
-			})
-			for _, r := range it.Desc().InternalReplicas {
-				replicas.Set(int(r.NodeID), 0)
-			}
-			if !it.NeedAnother(rSpan) {
-				break
-			}
-		}
-	}
-
-	return ranges, replicas.Len(), nil
-}
-
 // maxConcurrentScanRequests returns the number of concurrent scan requests.
 func maxConcurrentScanRequests(numNodesHint int, sv *settings.Values) int {
 	// If the user specified ScanRequestLimit -- use that value.

pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant

@@ -72,6 +72,7 @@ crdb_internal  kv_inherited_role_members               table  admin  NULL  NULL
 crdb_internal  kv_node_liveness                        table  admin  NULL  NULL
 crdb_internal  kv_node_status                          table  admin  NULL  NULL
 crdb_internal  kv_repairable_catalog_corruptions       view   admin  NULL  NULL
+crdb_internal  kv_protected_ts_records                 table  admin  NULL  NULL
 crdb_internal  kv_store_status                         table  admin  NULL  NULL
 crdb_internal  kv_system_privileges                    view   admin  NULL  NULL
 crdb_internal  leases                                  table  admin  NULL  NULL

pkg/cli/testdata/zip/partial1

@@ -29,6 +29,7 @@ debug zip --concurrency=1 --cpu-profile-duration=0s /dev/null
 [cluster] retrieving SQL data for crdb_internal.jobs... writing output: debug/crdb_internal.jobs.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_liveness... writing output: debug/crdb_internal.kv_node_liveness.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_status... writing output: debug/crdb_internal.kv_node_status.txt... done
+[cluster] retrieving SQL data for crdb_internal.kv_protected_ts_records... writing output: debug/crdb_internal.kv_protected_ts_records.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_store_status... writing output: debug/crdb_internal.kv_store_status.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_system_privileges... writing output: debug/crdb_internal.kv_system_privileges.txt... done
 [cluster] retrieving SQL data for crdb_internal.partitions... writing output: debug/crdb_internal.partitions.txt... done

pkg/cli/testdata/zip/partial1_excluded

@@ -29,6 +29,7 @@ debug zip /dev/null --concurrency=1 --exclude-nodes=2 --cpu-profile-duration=0
 [cluster] retrieving SQL data for crdb_internal.jobs... writing output: debug/crdb_internal.jobs.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_liveness... writing output: debug/crdb_internal.kv_node_liveness.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_status... writing output: debug/crdb_internal.kv_node_status.txt... done
+[cluster] retrieving SQL data for crdb_internal.kv_protected_ts_records... writing output: debug/crdb_internal.kv_protected_ts_records.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_store_status... writing output: debug/crdb_internal.kv_store_status.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_system_privileges... writing output: debug/crdb_internal.kv_system_privileges.txt... done
 [cluster] retrieving SQL data for crdb_internal.partitions... writing output: debug/crdb_internal.partitions.txt... done

pkg/cli/testdata/zip/partial2

@@ -29,6 +29,7 @@ debug zip --concurrency=1 --cpu-profile-duration=0 /dev/null
 [cluster] retrieving SQL data for crdb_internal.jobs... writing output: debug/crdb_internal.jobs.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_liveness... writing output: debug/crdb_internal.kv_node_liveness.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_status... writing output: debug/crdb_internal.kv_node_status.txt... done
+[cluster] retrieving SQL data for crdb_internal.kv_protected_ts_records... writing output: debug/crdb_internal.kv_protected_ts_records.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_store_status... writing output: debug/crdb_internal.kv_store_status.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_system_privileges... writing output: debug/crdb_internal.kv_system_privileges.txt... done
 [cluster] retrieving SQL data for crdb_internal.partitions... writing output: debug/crdb_internal.partitions.txt... done

pkg/cli/testdata/zip/testzip

@@ -29,6 +29,7 @@ debug zip --concurrency=1 --cpu-profile-duration=1s /dev/null
 [cluster] retrieving SQL data for crdb_internal.jobs... writing output: debug/crdb_internal.jobs.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_liveness... writing output: debug/crdb_internal.kv_node_liveness.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_status... writing output: debug/crdb_internal.kv_node_status.txt... done
+[cluster] retrieving SQL data for crdb_internal.kv_protected_ts_records... writing output: debug/crdb_internal.kv_protected_ts_records.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_store_status... writing output: debug/crdb_internal.kv_store_status.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_system_privileges... writing output: debug/crdb_internal.kv_system_privileges.txt... done
 [cluster] retrieving SQL data for crdb_internal.partitions... writing output: debug/crdb_internal.partitions.txt... done

pkg/cli/testdata/zip/testzip_concurrent

@@ -101,6 +101,9 @@ zip
 [cluster] retrieving SQL data for crdb_internal.kv_node_status...
 [cluster] retrieving SQL data for crdb_internal.kv_node_status: done
 [cluster] retrieving SQL data for crdb_internal.kv_node_status: writing output: debug/crdb_internal.kv_node_status.txt...
+[cluster] retrieving SQL data for crdb_internal.kv_protected_ts_records...
+[cluster] retrieving SQL data for crdb_internal.kv_protected_ts_records: done
+[cluster] retrieving SQL data for crdb_internal.kv_protected_ts_records: writing output: debug/crdb_internal.kv_protected_ts_records.txt...
 [cluster] retrieving SQL data for crdb_internal.kv_store_status...
 [cluster] retrieving SQL data for crdb_internal.kv_store_status: done
 [cluster] retrieving SQL data for crdb_internal.kv_store_status: writing output: debug/crdb_internal.kv_store_status.txt...

pkg/cli/testdata/zip/testzip_external_process_virtualization

@@ -35,6 +35,7 @@ debug zip --concurrency=1 --cpu-profile-duration=1s /dev/null
 [cluster] retrieving SQL data for crdb_internal.kv_node_status... writing output: debug/crdb_internal.kv_node_status.txt...
 [cluster] retrieving SQL data for crdb_internal.kv_node_status: last request failed: ERROR: unimplemented: operation is unsupported in multi-tenancy mode (SQLSTATE 0A000)
 [cluster] retrieving SQL data for crdb_internal.kv_node_status: creating error output: debug/crdb_internal.kv_node_status.txt.err.txt... done
+[cluster] retrieving SQL data for crdb_internal.kv_protected_ts_records... writing output: debug/crdb_internal.kv_protected_ts_records.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_store_status... writing output: debug/crdb_internal.kv_store_status.txt...
 [cluster] retrieving SQL data for crdb_internal.kv_store_status: last request failed: ERROR: unimplemented: operation is unsupported in multi-tenancy mode (SQLSTATE 0A000)
 [cluster] retrieving SQL data for crdb_internal.kv_store_status: creating error output: debug/crdb_internal.kv_store_status.txt.err.txt... done