Skip to content

Commit d7e5dd5

Browse files
committed
WIP on disabling direct scans and a notice
1 parent 6cddce1 commit d7e5dd5

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Diff for: pkg/sql/colfetcher/cfetcher_wrapper.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"github.com/cockroachdb/cockroach/pkg/sql/types"
2626
"github.com/cockroachdb/cockroach/pkg/storage"
2727
"github.com/cockroachdb/cockroach/pkg/util/buildutil"
28-
"github.com/cockroachdb/cockroach/pkg/util/metamorphic"
2928
"github.com/cockroachdb/cockroach/pkg/util/mon"
3029
"github.com/cockroachdb/errors"
3130
)
@@ -36,14 +35,14 @@ var DirectScansEnabled = settings.RegisterBoolSetting(
3635
settings.ApplicationLevel,
3736
"sql.distsql.direct_columnar_scans.enabled",
3837
"set to true to enable the 'direct' columnar scans in the KV layer",
39-
directScansEnabledDefault,
40-
)
41-
42-
var directScansEnabledDefault = metamorphic.ConstantWithTestBool(
43-
"direct-scans-enabled",
4438
false,
4539
)
4640

41+
//var directScansEnabledDefault = metamorphic.ConstantWithTestBool(
42+
// "direct-scans-enabled",
43+
// false,
44+
//)
45+
4746
// cFetcherWrapper implements the storage.CFetcherWrapper interface. See a large
4847
// comment in storage/col_mvcc.go for more details.
4948
type cFetcherWrapper struct {

Diff for: pkg/sql/conn_executor_ddl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (ex *connExecutor) maybeAdjustTxnForDDL(ctx context.Context, stmt Statement
8989
}
9090
if ex.state.mu.txn.BufferedWritesEnabled() {
9191
ex.state.mu.txn.SetBufferedWritesEnabled(false /* enabled */)
92-
p.BufferClientNotice(ctx, pgnotice.Newf("disabling buffered writes on the current txn due to schema change"))
92+
//p.BufferClientNotice(ctx, pgnotice.Newf("disabling buffered writes on the current txn due to schema change"))
9393
}
9494
}
9595
return nil

0 commit comments

Comments
 (0)