From 1786abfe98ace0e13a473eb52942208e42b629a2 Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Thu, 26 Jan 2023 08:28:54 -0800 Subject: [PATCH] colfetcher: disable direct columnar scans for now This commit disables direct columnar scans which are now randomly enabled in tests due to this feature having a data race at the moment. Release note: None --- pkg/sql/colfetcher/cfetcher_wrapper.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/sql/colfetcher/cfetcher_wrapper.go b/pkg/sql/colfetcher/cfetcher_wrapper.go index 3176b836b7a0..fec5c8f883a0 100644 --- a/pkg/sql/colfetcher/cfetcher_wrapper.go +++ b/pkg/sql/colfetcher/cfetcher_wrapper.go @@ -24,7 +24,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/colmem" "github.com/cockroachdb/cockroach/pkg/sql/execinfra" "github.com/cockroachdb/cockroach/pkg/storage" - "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/mon" ) @@ -34,16 +33,17 @@ var DirectScansEnabled = settings.RegisterBoolSetting( settings.TenantWritable, "sql.distsql.direct_columnar_scans.enabled", "set to true to enable the 'direct' columnar scans in the KV layer", - directScansEnabledDefault, -) - -var directScansEnabledDefault = util.ConstantWithMetamorphicTestBool( - "direct-scans-enabled", - // TODO(yuzefovich, 23.1): update the default to 'true' for multi-tenant - // setups. false, ) +// TODO(yuzefovich): uncomment this when #95937 is fixed. +//var directScansEnabledDefault = util.ConstantWithMetamorphicTestBool( +// "direct-scans-enabled", +// // TODO(yuzefovich, 23.1): update the default to 'true' for multi-tenant +// // setups. +// false, +//) + // cFetcherWrapper implements the storage.CFetcherWrapper interface. See a large // comment in storage/col_mvcc.go for more details. type cFetcherWrapper struct {