From 77091fe7ba7c00c21621d7deb3c9ee0f64ee02b6 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Wed, 21 Sep 2022 11:20:38 +0200 Subject: [PATCH] builtins: put check_consistency on DistsqlBlocklist Fixes #88222. Release note: None --- .../logictest/testdata/logic_test/builtin_function_notenant | 2 +- pkg/sql/planner.go | 1 + pkg/sql/sem/builtins/generator_builtins.go | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/sql/logictest/testdata/logic_test/builtin_function_notenant b/pkg/sql/logictest/testdata/logic_test/builtin_function_notenant index cc1f7f207ee8..146ceef9ad1b 100644 --- a/pkg/sql/logictest/testdata/logic_test/builtin_function_notenant +++ b/pkg/sql/logictest/testdata/logic_test/builtin_function_notenant @@ -59,7 +59,7 @@ true # Fill a table with consistency check results. This used to panic. # See: https://github.com/cockroachdb/cockroach/issues/88222 -statement error pgcode XX000 no consistency checker configured +statement ok CREATE TABLE conscheckresult AS (SELECT * FROM crdb_internal.check_consistency(false, '', '')); # Test crdb_internal commands which execute as root, but diff --git a/pkg/sql/planner.go b/pkg/sql/planner.go index 1350fc1c1e28..26751e334d27 100644 --- a/pkg/sql/planner.go +++ b/pkg/sql/planner.go @@ -481,6 +481,7 @@ func internalExtendedEvalCtx( SQLStatsController: sqlStatsController, SchemaTelemetryController: schemaTelemetryController, IndexUsageStatsController: indexUsageStatsController, + ConsistencyChecker: execCfg.ConsistencyChecker, StmtDiagnosticsRequestInserter: execCfg.StmtDiagnosticsRecorder.InsertRequest, RangeStatsFetcher: execCfg.RangeStatsFetcher, }, diff --git a/pkg/sql/sem/builtins/generator_builtins.go b/pkg/sql/sem/builtins/generator_builtins.go index 6ad4d26a1d50..40b249dee452 100644 --- a/pkg/sql/sem/builtins/generator_builtins.go +++ b/pkg/sql/sem/builtins/generator_builtins.go @@ -394,8 +394,9 @@ var generators = map[string]builtinDefinition{ "crdb_internal.check_consistency": makeBuiltin( tree.FunctionProperties{ - Class: tree.GeneratorClass, - Category: builtinconstants.CategorySystemInfo, + Class: tree.GeneratorClass, + Category: builtinconstants.CategorySystemInfo, + DistsqlBlocklist: true, // see #88222 }, makeGeneratorOverload( tree.ArgTypes{