Skip to content

Commit

Permalink
colfetcher: disable direct columnar scans for now
Browse files Browse the repository at this point in the history
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
  • Loading branch information
yuzefovich committed Jan 26, 2023
1 parent 6819d87 commit 1786abf
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions pkg/sql/colfetcher/cfetcher_wrapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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 {
Expand Down

0 comments on commit 1786abf

Please sign in to comment.