Skip to content

inspect: remove complex key configurability #169768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bghal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

inspect: remove complex key configurability #169768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions pkg/cmd/roachtest/tests/inspect_throughput.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,10 +461,6 @@ func makeInspectMultiRegionThroughputTest(
t.Fatal(err)
}

if complexKey {
enableComplexKeyUniquenessValidation(t, bulkDB)
}

metricName := "inspect"
exporter := roachtestutil.CreateWorkloadHistogramExporter(t, c)
reg, perfBuf := initInspectHistograms(
Expand Down Expand Up @@ -549,18 +545,6 @@ func disableRowCountValidation(t test.Test, db *gosql.DB) {
}
}

// enableComplexKeyUniquenessValidation enables validation of complex keys (i.e.
// the unique column does not immediately follow the region column) during the
// uniqueness check.
func enableComplexKeyUniquenessValidation(t test.Test, db *gosql.DB) {
t.Helper()
t.L().Printf("Enabling complex key uniqueness validation")
_, err := db.Exec("SET CLUSTER SETTING sql.inspect.uniqueness_check.complex_keys.enabled = true;")
if err != nil {
t.Fatal(err)
}
}

// runInspectInBackground runs an INSPECT DETACHED command, which starts the
// job in the background and returns immediately. It then looks up the job ID
// and polls until completion, reporting progress at 10% intervals. Returns the
Expand Down
12 changes: 2 additions & 10 deletions pkg/sql/inspect/inspect_job_entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ var checkSpecFactories = []checkFromIndexFunc{
idx.Index,
idx.TableDescriptor,
execCfg.Settings.Version.IsActive(ctx, clusterversion.V26_2),
uniquenessCheckComplexKeysEnabled.Get(execCfg.SV()),
); err != nil {
return nil, "", err
} else if reason != "" {
Expand Down Expand Up @@ -302,10 +301,7 @@ func isSupportedIndexForIndexConsistencyCheck(
}

func isSupportedIndexForUniquenessCheck(
ctx context.Context,
index catalog.Index,
table catalog.TableDescriptor,
isActiveV26_2, isComplexKeysEnabled bool,
ctx context.Context, index catalog.Index, table catalog.TableDescriptor, isActiveV26_2 bool,
) (reason string, uniquePos int, err error) {
if !isActiveV26_2 {
return "uniqueness: check requires v26.2", 0, nil
Expand All @@ -330,9 +326,5 @@ func isSupportedIndexForUniquenessCheck(
return "uniqueness: check only supported on tables with a single unique column", 0, nil
}

if uniquePositions[0] == 1 || isComplexKeysEnabled {
return "", uniquePositions[0], nil
} else {
return "uniqueness: complex key layout requires the cluster setting to opt in to (expensive) validation", 0, nil
}
return "", uniquePositions[0], nil
}
9 changes: 0 additions & 9 deletions pkg/sql/inspect/uniqueness_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/security/username"
"github.com/cockroachdb/cockroach/pkg/settings"
"github.com/cockroachdb/cockroach/pkg/sql"
"github.com/cockroachdb/cockroach/pkg/sql/catalog"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
Expand All @@ -28,13 +27,6 @@ import (
"github.com/cockroachdb/redact"
)

var uniquenessCheckComplexKeysEnabled = settings.RegisterBoolSetting(
settings.ApplicationLevel,
"sql.inspect.uniqueness_check.complex_keys.enabled",
"if true, the uniqueness check is enabled for INSPECT jobs on indexes where the unique column does not immediately follow the region column",
false,
)

type uniquenessCheck struct {
uniquenessCheckApplicability

Expand Down Expand Up @@ -422,7 +414,6 @@ func (c *uniquenessCheck) loadCatalogInfo(ctx context.Context) error {
index,
tableDesc,
c.execCfg.Settings.Version.IsActive(ctx, clusterversion.V26_2),
true, /* isComplexKeysEnabled */ // The cluster setting gates when the job is specced.
)
if err != nil {
return err
Expand Down
14 changes: 0 additions & 14 deletions pkg/sql/logictest/testdata/logic_test/inspect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,20 +813,6 @@ statement ok
INSERT INTO uniqueness_check_complex (crdb_region, filler, id, data) VALUES ('us-west1', 'filler1', 300, 'titi');
INSERT INTO uniqueness_check_complex (crdb_region, filler, id, data) VALUES ('us-west4', 'filler1', 300, 'tata');

# Run INSPECT which will not use the uniqueness check because it's a complex key.

statement ok
INSPECT TABLE uniqueness_check_complex;

skipif config local-mixed-25.4 local-mixed-26.1
statement error pq: no supported checks for index "uniqueness_check_complex_pkey" on table "uniqueness_check_complex" \(cannot check primary index consistency against itself; uniqueness: complex key layout requires the cluster setting to opt in to \(expensive\) validation\)
INSPECT TABLE uniqueness_check_complex WITH OPTIONS INDEX (uniqueness_check_complex_pkey);

# Enable and run again to see the unique validations.

statement ok
SET CLUSTER SETTING sql.inspect.uniqueness_check.complex_keys.enabled = true;

skipif config local-mixed-25.4 local-mixed-26.1
statement error pq: INSPECT found inconsistencies
INSPECT TABLE uniqueness_check_complex;
Expand Down
3 changes: 0 additions & 3 deletions pkg/sql/logictest/testdata/logic_test/inspect_ccl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ INSERT INTO uniqueness_check_complex (crdb_region, filler, id, data) VALUES ('us
INSERT INTO uniqueness_check_complex (crdb_region, filler, id, data) VALUES ('ca-central-1', 'filler1', 200, 'bar');
INSERT INTO uniqueness_check_complex (crdb_region, filler, id, data) VALUES ('ap-southeast-2', 'filler1', 300, 'tata');

statement ok
SET CLUSTER SETTING sql.inspect.uniqueness_check.complex_keys.enabled = true;

statement ok
INSPECT TABLE uniqueness_check_complex;

Expand Down
Loading