Skip to content
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

Jump to bottom

logictest: introduce new configs for experimental distsql planning #50249

Merged
merged 1 commit into from
Jun 17, 2020
+42 −9
Merged

logictest: introduce new configs for experimental distsql planning #50249

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
47 changes: 40 additions & 7 deletions pkg/sql/logictest/logic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ type testClusterConfig struct {
overrideVectorize string
// if non-empty, overrides the default automatic statistics mode.
overrideAutoStats string
// if non-empty, overrides the default experimental DistSQL planning mode.
overrideExperimentalDistSQLPlanning string
// if set, queries using distSQL processors or vectorized operators that can
// fall back to disk do so immediately, using only their disk-based
// implementation.
Expand Down Expand Up @@ -467,13 +469,6 @@ var logicTestConfigs = []testClusterConfig{
overrideAutoStats: "false",
overrideVectorize: "201auto",
},
{
name: "fakedist",
numNodes: 3,
useFakeSpanResolver: true,
overrideDistSQLMode: "on",
overrideAutoStats: "false",
},
{
name: "local-mixed-19.2-20.1",
numNodes: 1,
Expand All @@ -483,6 +478,20 @@ var logicTestConfigs = []testClusterConfig{
binaryVersion: roachpb.Version{Major: 20, Minor: 1},
disableUpgrade: true,
},
{
name: "local-spec-planning",
numNodes: 1,
overrideDistSQLMode: "off",
overrideAutoStats: "false",
overrideExperimentalDistSQLPlanning: "on",
},
{
name: "fakedist",
numNodes: 3,
useFakeSpanResolver: true,
overrideDistSQLMode: "on",
overrideAutoStats: "false",
},
{
name: "fakedist-vec-off",
numNodes: 3,
Expand Down Expand Up @@ -527,6 +536,14 @@ var logicTestConfigs = []testClusterConfig{
sqlExecUseDisk: true,
skipShort: true,
},
{
name: "fakedist-spec-planning",
numNodes: 3,
useFakeSpanResolver: true,
overrideDistSQLMode: "on",
overrideAutoStats: "false",
overrideExperimentalDistSQLPlanning: "on",
},
{
name: "5node",
numNodes: 5,
Expand Down Expand Up @@ -565,6 +582,13 @@ var logicTestConfigs = []testClusterConfig{
sqlExecUseDisk: true,
skipShort: true,
},
{
name: "5node-spec-planning",
numNodes: 5,
overrideDistSQLMode: "on",
overrideAutoStats: "false",
overrideExperimentalDistSQLPlanning: "on",
},
{
name: "3node-tenant",
numNodes: 3,
Expand Down Expand Up @@ -618,6 +642,7 @@ var (
"5node-vec-disk-auto",
"5node-metadata",
"5node-disk",
"5node-spec-planning",
}
defaultConfig = parseTestConfig(defaultConfigNames)
fiveNodeDefaultConfig = parseTestConfig(fiveNodeDefaultConfigNames)
Expand Down Expand Up @@ -1349,6 +1374,14 @@ func (t *logicTest) setup(cfg testClusterConfig, serverArgs TestServerArgs) {
t.Fatal(err)
}
}

if cfg.overrideExperimentalDistSQLPlanning != "" {
if _, err := conn.Exec(
"SET CLUSTER SETTING sql.defaults.experimental_distsql_planning = $1::string", cfg.overrideExperimentalDistSQLPlanning,
); err != nil {
t.Fatal(err)
}
}
}

if cfg.overrideDistSQLMode != "" {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/logictest/testdata/logic_test/explain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# LogicTest: local local-vec-off local-vec-auto
# LogicTest: local local-vec-off local-vec-auto local-spec-planning

statement ok
CREATE TABLE t (a INT PRIMARY KEY)
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/logictest/testdata/logic_test/explain_analyze_plans
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# LogicTest: 5node
# LogicTest: 5node 5node-spec-planning

# These tests are different from explain_analyze because they require manual
# data placement.
Expand Down