From 6dcdab76d3f04181928a0a211867c3a2fa3387ed Mon Sep 17 00:00:00 2001
From: Arseniy Volynets <a.volynets@picodata.io>
Date: Wed, 4 Sep 2024 23:22:59 +1000
Subject: [PATCH] refactor: rename sql_vdbe_max_steps to vdbe_max_steps
---
doc/sql/query.ebnf | 8 +-
.../test/integration/explain_test.lua | 24 +-
.../test/integration/left_outer_join_test.lua | 10 +-
.../test/integration/options_test.lua | 16 +-
sbroad-core/src/executor/tests/exec_plan.rs | 6 +-
sbroad-core/src/executor/tests/frontend.rs | 8 +-
sbroad-core/src/frontend/sql.rs | 10 +-
sbroad-core/src/frontend/sql/ir/tests.rs | 289 +++++++++---------
sbroad-core/src/frontend/sql/ir/tests/cte.rs | 28 +-
.../src/frontend/sql/ir/tests/funcs.rs | 2 +-
.../src/frontend/sql/ir/tests/global.rs | 92 +++---
.../src/frontend/sql/ir/tests/insert.rs | 6 +-
sbroad-core/src/frontend/sql/ir/tests/join.rs | 8 +-
sbroad-core/src/frontend/sql/ir/tests/like.rs | 10 +-
.../src/frontend/sql/ir/tests/limit.rs | 16 +-
.../src/frontend/sql/ir/tests/params.rs | 14 +-
sbroad-core/src/frontend/sql/ir/tests/trim.rs | 6 +-
.../src/frontend/sql/ir/tests/union.rs | 6 +-
.../src/frontend/sql/ir/tests/update.rs | 4 +-
sbroad-core/src/frontend/sql/query.pest | 4 +-
sbroad-core/src/ir.rs | 12 +-
sbroad-core/src/ir/distribution/tests.rs | 2 +-
sbroad-core/src/ir/explain/tests.rs | 38 +--
sbroad-core/src/ir/explain/tests/concat.rs | 4 +-
sbroad-core/src/ir/explain/tests/delete.rs | 6 +-
.../sql/tree/arbitrary_projection_plan.yaml | 2 +-
.../ir/distribution/join_unite_keys.yaml | 2 +-
.../ir/distribution/shrink_dist_key_1.yaml | 2 +-
.../ir/distribution/shrink_dist_key_2.yaml | 2 +-
.../ir/distribution/shuffle_dist_key.yaml | 2 +-
.../union_fallback_to_random.yaml | 2 +-
.../ir/distribution/union_preserve_dist.yaml | 2 +-
.../tests/artifactory/ir/operator/join.yaml | 2 +-
.../operator/output_aliases_duplicates.yaml | 2 +-
.../ir/operator/output_aliases_oor.yaml | 2 +-
.../output_aliases_unsupported_type.yaml | 2 +-
.../artifactory/ir/operator/projection.yaml | 8 +-
.../artifactory/ir/operator/scan_rel.yaml | 2 +-
.../artifactory/ir/operator/selection.yaml | 20 +-
.../ir/operator/selection_with_sub_query.yaml | 10 +-
.../artifactory/ir/operator/sub_query.yaml | 6 +-
.../tests/artifactory/ir/plan_no_top.yaml | 4 +-
.../tests/artifactory/ir/plan_oor_top.yaml | 2 +-
.../full_motion_less_for_sub_query.yaml | 2 +-
...otion_non_segment_outer_for_sub_query.yaml | 4 +-
.../redistribution/local_sub_query.yaml | 2 +-
.../redistribution/multiple_sub_queries.yaml | 4 +-
.../segment_motion_for_sub_query.yaml | 2 +-
48 files changed, 358 insertions(+), 359 deletions(-)
diff --git a/doc/sql/query.ebnf b/doc/sql/query.ebnf
index 3484ba8c50..a1f0a39728 100644
--- a/doc/sql/query.ebnf
+++ b/doc/sql/query.ebnf
@@ -2,8 +2,8 @@ statement ::= explain | ddl | dml | dql | acl | call
explain ::= 'EXPLAIN' (dml | dql)
dql ::= (with? select | values)
('OPTION' '('
- (('VTABLE_MAX_ROWS' | 'SQL_VDBE_MAX_STEPS') '=' unsigned)
- (',' (('VTABLE_MAX_ROWS' | 'SQL_VDBE_MAX_STEPS') '=' unsigned))*
+ (('VTABLE_MAX_ROWS' | 'vdbe_max_steps') '=' unsigned)
+ (',' (('VTABLE_MAX_ROWS' | 'vdbe_max_steps') '=' unsigned))*
')')?
with ::= 'WITH'
cte ('(' column (',' column)* ')')? 'AS' '(' (select | values) ')'
@@ -80,8 +80,8 @@ literal ::= 'TRUE'
| '?'
dml ::= (call | delete | insert | update)
('OPTION' '('
- (('VTABLE_MAX_ROWS' | 'SQL_VDBE_MAX_STEPS') '=' unsigned)
- (',' (('VTABLE_MAX_ROWS' | 'SQL_VDBE_MAX_STEPS') '=' unsigned))*
+ (('VTABLE_MAX_ROWS' | 'vdbe_max_steps') '=' unsigned)
+ (',' (('VTABLE_MAX_ROWS' | 'vdbe_max_steps') '=' unsigned))*
')')?
call ::= 'CALL' procedure '(' (literal (',' literal)*)? ')'
delete ::= 'DELETE' 'FROM' table ('WHERE' expression)?
diff --git a/sbroad-cartridge/test_app/test/integration/explain_test.lua b/sbroad-cartridge/test_app/test/integration/explain_test.lua
index 298d21cd66..daab105590 100644
--- a/sbroad-cartridge/test_app/test/integration/explain_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/explain_test.lua
@@ -118,7 +118,7 @@ g.test_motion_explain = function()
" selection ROW(\"space_simple_shard_key_hist\".\"sysOp\"::integer) < ROW(0::unsigned)",
" scan \"space_simple_shard_key_hist\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -158,7 +158,7 @@ WHERE "t3"."name" = '123']], {} })
" selection ROW(\"testing_space\".\"id\"::integer) <> ROW(1::unsigned)",
" scan \"testing_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -190,7 +190,7 @@ g.test_valid_explain = function()
" selection ROW(\"space_simple_shard_key_hist\".\"sysOp\"::integer) > ROW(0::unsigned)",
" scan \"space_simple_shard_key_hist\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -212,7 +212,7 @@ g.test_explain_arithmetic_selection = function()
" selection ROW(\"arithmetic_space\".\"a\"::integer) + ROW(\"arithmetic_space\".\"b\"::integer) = ROW(\"arithmetic_space\".\"b\"::integer) + ROW(\"arithmetic_space\".\"a\"::integer)",
" scan \"arithmetic_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -228,7 +228,7 @@ g.test_explain_arithmetic_selection = function()
" selection ROW(\"arithmetic_space\".\"a\"::integer) + ROW(\"arithmetic_space\".\"b\"::integer) > ROW(0::unsigned) and ROW(\"arithmetic_space\".\"b\"::integer) * ROW(\"arithmetic_space\".\"a\"::integer) = ROW(5::unsigned)",
" scan \"arithmetic_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -267,7 +267,7 @@ WHERE "t3"."id" = 2
" selection ROW(\"arithmetic_space2\".\"c\"::integer) < ROW(0::unsigned)",
" scan \"arithmetic_space2\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -306,7 +306,7 @@ WHERE "t3"."id" = 2
" selection ROW(\"arithmetic_space2\".\"c\"::integer) < ROW(0::unsigned)",
" scan \"arithmetic_space2\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -327,7 +327,7 @@ g.test_explain_arithmetic_projection = function()
"projection (ROW(\"arithmetic_space\".\"id\"::integer) + ROW(2::unsigned) -> \"col_1\")",
" scan \"arithmetic_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -343,7 +343,7 @@ g.test_explain_arithmetic_projection = function()
"projection (ROW(\"arithmetic_space\".\"a\"::integer) + ROW(\"arithmetic_space\".\"b\"::integer) * ROW(\"arithmetic_space\".\"c\"::integer) -> \"col_1\")",
" scan \"arithmetic_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -359,7 +359,7 @@ g.test_explain_arithmetic_projection = function()
"projection ((ROW(\"arithmetic_space\".\"a\"::integer) + ROW(\"arithmetic_space\".\"b\"::integer)) * ROW(\"arithmetic_space\".\"c\"::integer) -> \"col_1\")",
" scan \"arithmetic_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -375,7 +375,7 @@ g.test_explain_arithmetic_projection = function()
"projection (ROW(\"arithmetic_space\".\"a\"::integer) > ROW(\"arithmetic_space\".\"b\"::integer) -> \"col_1\")",
" scan \"arithmetic_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
@@ -390,7 +390,7 @@ g.test_explain_arithmetic_projection = function()
"projection (ROW(\"arithmetic_space\".\"a\"::integer) is null -> \"col_1\")",
" scan \"arithmetic_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
}
)
diff --git a/sbroad-cartridge/test_app/test/integration/left_outer_join_test.lua b/sbroad-cartridge/test_app/test/integration/left_outer_join_test.lua
index 75f10aa8e2..0c8e723ad5 100644
--- a/sbroad-cartridge/test_app/test/integration/left_outer_join_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/left_outer_join_test.lua
@@ -210,7 +210,7 @@ left_join.test_left_join_local_execution = function()
" projection (\"arithmetic_space2\".\"id\"::integer -> \"B\")",
" scan \"arithmetic_space2\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
})
end
@@ -252,7 +252,7 @@ left_join.test_inner_segment_motion = function()
" projection (\"arithmetic_space2\".\"a\"::integer -> \"B\")",
" scan \"arithmetic_space2\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
})
end
@@ -293,7 +293,7 @@ left_join.test_inner_full_motion = function()
" projection (\"arithmetic_space2\".\"a\"::integer -> \"B\")",
" scan \"arithmetic_space2\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
})
end
@@ -417,7 +417,7 @@ left_join.test_sq_with_full_motion = function()
" projection (ROW(\"arithmetic_space\".\"a\"::integer) + ROW(1::unsigned) -> \"col_1\")",
" scan \"arithmetic_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
})
end
@@ -465,7 +465,7 @@ left_join.test_sq_with_segment_motion = function()
" projection (\"arithmetic_space\".\"c\"::integer -> \"c\")",
" scan \"arithmetic_space\"",
"execution options:",
- "sql_vdbe_max_steps = 45000",
+ "vdbe_max_steps = 45000",
"vtable_max_rows = 5000",
})
end
diff --git a/sbroad-cartridge/test_app/test/integration/options_test.lua b/sbroad-cartridge/test_app/test/integration/options_test.lua
index 8a32938c2a..fd910df509 100644
--- a/sbroad-cartridge/test_app/test/integration/options_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/options_test.lua
@@ -60,7 +60,7 @@ option_queries.test_basic = function()
local api = cluster:server("api-1").net_box
local query_str = [[select * from "testing_space"]]
local _, err = api:call("sbroad.execute", {
- query_str .. [[ option(sql_vdbe_max_steps = 5) ]]
+ query_str .. [[ option(vdbe_max_steps = 5) ]]
})
t.assert_str_contains(err, [[Reached a limit on max executed vdbe opcodes. Limit: 5]])
@@ -77,7 +77,7 @@ option_queries.test_basic = function()
local no_limit_rows = r.rows
-- check query executes with an appropriate limit
- r, err = api:call("sbroad.execute", { query_str .. [[ option(sql_vdbe_max_steps = 30) ]] })
+ r, err = api:call("sbroad.execute", { query_str .. [[ option(vdbe_max_steps = 30) ]] })
t.assert_equals(err, nil)
t.assert_equals(r.metadata, {
{ name = "id", type = "integer" },
@@ -91,13 +91,13 @@ option_queries.test_dml = function()
local api = cluster:server("api-1").net_box
local query_str = [[insert into "testing_space" select "id" + 10, "name", "product_units" from "testing_space"]]
local _, err = api:call("sbroad.execute", {
- query_str .. [[ option(sql_vdbe_max_steps = 10) ]]
+ query_str .. [[ option(vdbe_max_steps = 10) ]]
})
t.assert_str_contains(err, [[Reached a limit on max executed vdbe opcodes. Limit: 10]])
-- check query works without limit
local r
- r, err = api:call("sbroad.execute", { query_str .. [[ option(sql_vdbe_max_steps = 0) ]] })
+ r, err = api:call("sbroad.execute", { query_str .. [[ option(vdbe_max_steps = 0) ]] })
t.assert_equals(err, nil)
t.assert_equals(r, { row_count = 6 })
end
@@ -106,14 +106,14 @@ option_queries.test_invalid = function()
local api = cluster:server("api-1").net_box
local query_str = [[select * from "testing_space"]]
local _, err = api:call("sbroad.execute", {
- query_str .. [[ option(sql_vdbe_max_steps = 10, sql_vdbe_max_steps = 11) ]]
+ query_str .. [[ option(vdbe_max_steps = 10, vdbe_max_steps = 11) ]]
})
- t.assert_str_contains(err, [[option sql_vdbe_max_steps specified more than once!]])
+ t.assert_str_contains(err, [[option vdbe_max_steps specified more than once!]])
_, err = api:call("sbroad.execute", {
- query_str .. [[ option(sql_vdbe_max_steps = ?) ]], { -1 }
+ query_str .. [[ option(vdbe_max_steps = ?) ]], { -1 }
})
- t.assert_str_contains(err, [[expected option sql_vdbe_max_steps to be unsigned got: Integer(-1)]])
+ t.assert_str_contains(err, [[expected option vdbe_max_steps to be unsigned got: Integer(-1)]])
_, err = api:call("sbroad.execute", {
query_str .. [[ option(vtable_max_rows = ?) ]], { -1 }
})
diff --git a/sbroad-core/src/executor/tests/exec_plan.rs b/sbroad-core/src/executor/tests/exec_plan.rs
index 121c84f2e1..eb986ad5ad 100644
--- a/sbroad-core/src/executor/tests/exec_plan.rs
+++ b/sbroad-core/src/executor/tests/exec_plan.rs
@@ -1432,7 +1432,7 @@ fn subtree_hash1() {
fn subtree_hash2() {
check_subtree_hashes_are_equal(
r#"select ?, ? from "t"
- option(sql_vdbe_max_steps = ?, vtable_max_rows = ?)"#,
+ option(vdbe_max_steps = ?, vtable_max_rows = ?)"#,
vec![
Value::Unsigned(1),
Value::Unsigned(11),
@@ -1440,7 +1440,7 @@ fn subtree_hash2() {
Value::Unsigned(10),
],
r#"select $1, $1 from "t"
- option(sql_vdbe_max_steps = $1, vtable_max_rows = $1)"#,
+ option(vdbe_max_steps = $1, vtable_max_rows = $1)"#,
vec![Value::Unsigned(1)],
);
}
@@ -1450,7 +1450,7 @@ fn subtree_hash2() {
fn subtree_hash3() {
check_subtree_hashes_are_equal(
r#"select ?, ? from "t"
- option(sql_vdbe_max_steps = ?)"#,
+ option(vdbe_max_steps = ?)"#,
vec![Value::Unsigned(1), Value::Unsigned(11), Value::Unsigned(10)],
r#"select ?, ? from "t""#,
vec![Value::Unsigned(1), Value::Unsigned(1)],
diff --git a/sbroad-core/src/executor/tests/frontend.rs b/sbroad-core/src/executor/tests/frontend.rs
index fef876e5c1..aada64b853 100644
--- a/sbroad-core/src/executor/tests/frontend.rs
+++ b/sbroad-core/src/executor/tests/frontend.rs
@@ -74,7 +74,7 @@ fn front_explain_select_sql1() {
r#"projection ("t"."identification_number"::integer -> "c1", "t"."product_code"::string -> "product_code")
scan "hash_testing" -> "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -103,7 +103,7 @@ fn front_explain_select_sql2() {
r#" projection ("t2"."identification_number"::integer -> "identification_number", "t2"."product_code"::string -> "product_code")"#,
r#" scan "hash_testing_hist" -> "t2""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
);
@@ -134,7 +134,7 @@ fn front_explain_select_sql3() {
r#" projection ("t3"."a"::string -> "a2", "t3"."b"::integer -> "b2")"#,
r#" scan "t3""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
);
@@ -165,7 +165,7 @@ fn front_explain_select_sql4() {
r#" projection ("q2"."a"::string -> "a", "q2"."b"::integer -> "b")"#,
r#" scan "t3" -> "q2""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
);
diff --git a/sbroad-core/src/frontend/sql.rs b/sbroad-core/src/frontend/sql.rs
index 112cb80e12..7019174bb2 100644
--- a/sbroad-core/src/frontend/sql.rs
+++ b/sbroad-core/src/frontend/sql.rs
@@ -1305,7 +1305,7 @@ fn parse_unsigned(ast_node: &ParseNode) -> Result<u64, SbroadError> {
}
}
-/// Common logic for `SqlVdbeMaxSteps` and `VTableMaxRows` parsing.
+/// Common logic for `VdbeMaxSteps` and `VTableMaxRows` parsing.
fn parse_option<M: Metadata>(
ast: &AbstractSyntaxTree,
option_node_id: usize,
@@ -3458,22 +3458,22 @@ impl AbstractSyntaxTree {
let ast_child_id = node
.children
.first()
- .expect("no children for sql_vdbe_max_steps option");
+ .expect("no children for vdbe_max_steps option");
let val = parse_option(self, *ast_child_id, &mut worker, &mut plan)?;
plan.raw_options.push(OptionSpec {
kind: OptionKind::VTableMaxRows,
val,
});
}
- Rule::SqlVdbeMaxSteps => {
+ Rule::VdbeMaxSteps => {
let ast_child_id = node
.children
.first()
- .expect("no children for sql_vdbe_max_steps option");
+ .expect("no children for vdbe_max_steps option");
let val = parse_option(self, *ast_child_id, &mut worker, &mut plan)?;
plan.raw_options.push(OptionSpec {
- kind: OptionKind::SqlVdbeMaxSteps,
+ kind: OptionKind::VdbeMaxSteps,
val,
});
}
diff --git a/sbroad-core/src/frontend/sql/ir/tests.rs b/sbroad-core/src/frontend/sql/ir/tests.rs
index f34ceac55b..61f1b14028 100644
--- a/sbroad-core/src/frontend/sql/ir/tests.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests.rs
@@ -35,7 +35,7 @@ fn front_sql1() {
selection ROW("hash_testing"."identification_number"::integer) = ROW(1::unsigned)
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -56,7 +56,7 @@ fn front_sql2() {
selection ROW("hash_testing"."identification_number"::integer) = ROW(1::unsigned) and ROW("hash_testing"."product_code"::string) = ROW('1'::string) or ROW("hash_testing"."identification_number"::integer) = ROW(2::unsigned) and ROW("hash_testing"."product_code"::string) = ROW('2'::string)
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -90,7 +90,7 @@ fn front_sql3() {
selection ROW("hash_testing_hist"."sys_op"::unsigned) > ROW(1::unsigned)
scan "hash_testing_hist"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -128,7 +128,7 @@ fn front_sql4() {
selection ROW("hash_testing_hist"."sys_op"::unsigned) > ROW(1::unsigned)
scan "hash_testing_hist"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -155,7 +155,7 @@ motion [policy: full]
selection ROW("hash_testing_hist"."product_code"::string) = ROW('a'::string)
scan "hash_testing_hist"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -184,7 +184,7 @@ fn front_sql6() {
projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -204,7 +204,7 @@ fn front_sql8() {
selection ROW("t"."identification_number"::integer) = ROW(1::unsigned)
scan "hash_testing" -> "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -259,7 +259,7 @@ fn front_sql9() {
selection ROW("hash_single_testing_hist"."sys_op"::unsigned) <= ROW(0::unsigned)
scan "hash_single_testing_hist"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -279,7 +279,7 @@ fn front_sql10() {
values
value row (data=ROW(1::unsigned, 2::unsigned, 3::unsigned, 4::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -299,7 +299,7 @@ fn front_sql11() {
values
value row (data=ROW(1::unsigned, 2::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -319,7 +319,7 @@ fn front_sql14() {
projection ("t"."b"::unsigned -> "b", "t"."d"::unsigned -> "d")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -340,7 +340,7 @@ fn front_sql16() {
selection ROW("hash_testing"."product_code"::string) = ROW('кириллица'::string)
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -360,7 +360,7 @@ fn front_sql17() {
selection ROW("hash_testing"."product_code"::string) is null
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -380,7 +380,7 @@ fn front_sql18() {
selection ROW("hash_testing"."product_code"::string) >= ROW(1::unsigned) and ROW("hash_testing"."product_code"::string) <= ROW(2::unsigned)
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -400,7 +400,7 @@ fn front_sql19() {
selection not ROW("hash_testing"."product_code"::string) is null
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -434,7 +434,7 @@ fn front_sql_between_with_additional_and_from_left() {
selection ROW("t"."id"::unsigned) > ROW(1::unsigned) and ROW("t"."id"::unsigned) >= ROW("t"."id"::unsigned) and ROW("t"."id"::unsigned) <= ROW("t"."id"::unsigned) + ROW(10::unsigned)
scan "test_space" -> "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -455,7 +455,7 @@ fn front_sql_between_with_additional_not_from_left() {
selection not (ROW("t"."id"::unsigned) >= ROW("t"."id"::unsigned) and ROW("t"."id"::unsigned) <= ROW("t"."id"::unsigned) + ROW(10::unsigned)) and ROW(true::boolean)
scan "test_space" -> "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -476,7 +476,7 @@ fn front_sql_between_with_additional_and_from_left_and_right() {
selection ROW("t"."id"::unsigned) > ROW(1::unsigned) and ROW("t"."id"::unsigned) >= ROW("t"."id"::unsigned) and ROW("t"."id"::unsigned) <= ROW("t"."id"::unsigned) + ROW(10::unsigned) and ROW(true::boolean)
scan "test_space" -> "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -498,7 +498,7 @@ fn front_sql_between_with_nested_not_from_the_left() {
selection not not (ROW(false::boolean) >= ROW(false::boolean) and ROW(false::boolean) <= ROW(true::boolean))
scan "test_space" -> "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -519,7 +519,7 @@ fn front_sql_between_with_nested_and_from_the_left() {
selection ROW(false::boolean) and ROW(true::boolean) and ROW(false::boolean) >= ROW(false::boolean) and ROW(false::boolean) <= ROW(true::boolean)
scan "test_space" -> "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -570,7 +570,7 @@ fn front_sql_check_arbitrary_utf_in_single_quote_strings() {
selection ROW("hash_testing"."product_code"::string) = ROW('«123»§#*&%@/// / // \\ ƵǖḘỺʥ ͑ ͑ ͕ΆΨѮښ ۞ܤ'::string)
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -590,7 +590,7 @@ fn front_sql_check_arbitraty_utf_in_identifiers() {
r#"projection ("&%ښ۞@ƶǖ"."id"::unsigned -> "from", "&%ښ۞@ƶǖ"."id"::unsigned -> "select", "&%ښ۞@ƶǖ"."id"::unsigned -> "123»&%ښ۞@Ƶǖselect.""''\\", "&%ښ۞@ƶǖ"."id"::unsigned -> "aц1&@$ƶǖ%^&«»§&%ښ۞@ƶǖ")
scan "test_space" -> "&%ښ۞@ƶǖ"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -611,7 +611,7 @@ fn front_sql_check_inapplicatable_symbols() {
r#"projection (ROW("TBL"."A"::unsigned) * ROW("TBL"."A"::unsigned) -> "col_1", ROW("TBL"."B"::unsigned) + ROW("TBL"."B"::unsigned) -> "col_2", ROW("TBL"."A"::unsigned) - ROW("TBL"."A"::unsigned) -> "col_3")
scan "TBL"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -629,7 +629,7 @@ fn front_projection_with_scan_specification_under_scan() {
r#"projection ("hash_testing"."identification_number"::integer -> "identification_number", "hash_testing"."product_code"::string -> "product_code", "hash_testing"."product_units"::boolean -> "product_units", "hash_testing"."sys_op"::unsigned -> "sys_op")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -654,7 +654,7 @@ fn front_projection_with_scan_specification_under_join() {
projection ("test_space"."id"::unsigned -> "id", "test_space"."sysFrom"::unsigned -> "sysFrom", "test_space"."FIRST_NAME"::string -> "FIRST_NAME", "test_space"."sys_op"::unsigned -> "sys_op")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -680,7 +680,7 @@ fn front_projection_with_scan_specification_under_join_of_subqueries() {
projection ("ts"."id"::unsigned -> "id", "ts"."sysFrom"::unsigned -> "sysFrom", "ts"."FIRST_NAME"::string -> "FIRST_NAME", "ts"."sys_op"::unsigned -> "sys_op")
scan "test_space" -> "ts"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -701,7 +701,7 @@ fn front_order_by_with_simple_select() {
projection ("test_space"."id"::unsigned -> "id", "test_space"."sysFrom"::unsigned -> "sysFrom", "test_space"."FIRST_NAME"::string -> "FIRST_NAME", "test_space"."sys_op"::unsigned -> "sys_op")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -753,7 +753,7 @@ fn front_order_by_with_order_type_specification() {
projection ("test_space"."id"::unsigned -> "id", "test_space"."sysFrom"::unsigned -> "sysFrom", "test_space"."FIRST_NAME"::string -> "FIRST_NAME", "test_space"."sys_op"::unsigned -> "sys_op")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -774,7 +774,7 @@ fn front_order_by_with_indices() {
projection ("test_space"."id"::unsigned -> "id", "test_space"."sysFrom"::unsigned -> "sysFrom", "test_space"."FIRST_NAME"::string -> "FIRST_NAME", "test_space"."sys_op"::unsigned -> "sys_op")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -796,7 +796,7 @@ fn front_order_by_ordering_by_expressions_from_projection() {
projection ("test_space"."id"::unsigned -> "my_col", "test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -837,7 +837,7 @@ fn front_order_by_over_single_distribution_must_not_add_motion() {
projection (count(("test_space"."id"::unsigned))::integer -> "count_696")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -862,7 +862,7 @@ fn front_join_with_identical_columns() {
projection ("test_space"."sysFrom"::unsigned -> "sysFrom")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -900,7 +900,7 @@ fn front_join_with_vtable_ambiguous_column_name() {
projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -921,7 +921,7 @@ fn front_case_search() {
r#"projection (case "test_space"."id"::unsigned when 1::unsigned then true::boolean end -> "col_1")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -946,7 +946,7 @@ fn front_case_simple() {
r#"projection (case when ROW(true::boolean) = ROW(true::boolean) then 'Moscow'::string when ROW(1::unsigned) <> ROW(2::unsigned) and ROW(4::unsigned) < ROW(5::unsigned) then 42::unsigned else false::boolean end -> "case_result")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -975,7 +975,7 @@ fn front_case_nested() {
r#"projection (case "test_space"."id"::unsigned when 1::unsigned then case "test_space"."sysFrom"::unsigned when 69::unsigned then true::boolean when 42::unsigned then false::boolean end when 2::unsigned then 42::unsigned else false::boolean end -> "case_result")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -999,7 +999,7 @@ scan
projection ("test_space"."id"::unsigned -> "id", "test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1135,7 +1135,7 @@ fn front_sql_join_on_bucket_id1() {
selection ROW("test_space"."id"::unsigned) = ROW(1::unsigned)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1165,7 +1165,7 @@ fn front_sql_join_on_bucket_id2() {
selection ROW("test_space"."id"::unsigned) = ROW(1::unsigned)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1189,7 +1189,7 @@ fn front_sql_groupby_on_bucket_id() {
projection ("t2"."bucket_id"::unsigned -> "b")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1217,7 +1217,7 @@ scan
projection ("test_space"."bucket_id"::unsigned -> "bucket_id", "test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1242,7 +1242,7 @@ fn front_sql_except_on_bucket_id() {
projection ("test_space"."id"::unsigned -> "id", "test_space"."bucket_id"::unsigned -> "bucket_id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1266,7 +1266,7 @@ motion [policy: full]
projection (0::unsigned -> "col_1")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1290,7 +1290,7 @@ motion [policy: full]
projection (0::unsigned -> "col_1")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1315,7 +1315,7 @@ motion [policy: full]
selection ROW("hash_testing"."identification_number"::integer) <> ROW(42::unsigned)
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1336,7 +1336,7 @@ fn front_sql_groupby() {
group by ("hash_testing"."identification_number"::integer, "hash_testing"."product_code"::string) output: ("hash_testing"."identification_number"::integer -> "identification_number", "hash_testing"."product_code"::string -> "product_code", "hash_testing"."product_units"::boolean -> "product_units", "hash_testing"."sys_op"::unsigned -> "sys_op", "hash_testing"."bucket_id"::unsigned -> "bucket_id")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1362,7 +1362,7 @@ fn front_sql_groupby_less_cols_in_proj() {
group by ("hash_testing"."identification_number"::integer, "hash_testing"."product_units"::boolean) output: ("hash_testing"."identification_number"::integer -> "identification_number", "hash_testing"."product_code"::string -> "product_code", "hash_testing"."product_units"::boolean -> "product_units", "hash_testing"."sys_op"::unsigned -> "sys_op", "hash_testing"."bucket_id"::unsigned -> "bucket_id")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1391,7 +1391,7 @@ fn front_sql_groupby_union_1() {
projection ("hash_testing"."identification_number"::integer -> "identification_number")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1425,7 +1425,7 @@ fn front_sql_groupby_union_2() {
projection ("hash_testing"."identification_number"::integer -> "identification_number")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1459,7 +1459,7 @@ fn front_sql_groupby_join_1() {
projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1488,7 +1488,7 @@ fn front_sql_join() {
projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1512,7 +1512,7 @@ vtable_max_rows = 5000
projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1541,7 +1541,7 @@ vtable_max_rows = 5000
projection (sum(("test_space"."id"::unsigned))::decimal -> "sum_1796")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1565,7 +1565,7 @@ fn front_sql_groupby_insert() {
group by ("t"."b"::unsigned, "t"."d"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1615,7 +1615,7 @@ fn front_sql_aggregates() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1636,7 +1636,7 @@ fn front_sql_avg_aggregate() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1657,7 +1657,7 @@ fn front_sql_total_aggregate() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1679,7 +1679,7 @@ fn front_sql_min_aggregate() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1701,7 +1701,7 @@ fn front_sql_max_aggregate() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1723,7 +1723,7 @@ fn front_sql_group_concat_aggregate() {
group by ("test_space"."FIRST_NAME"::string) output: ("test_space"."id"::unsigned -> "id", "test_space"."sysFrom"::unsigned -> "sysFrom", "test_space"."FIRST_NAME"::string -> "FIRST_NAME", "test_space"."sys_op"::unsigned -> "sys_op", "test_space"."bucket_id"::unsigned -> "bucket_id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1745,7 +1745,7 @@ fn front_sql_group_concat_aggregate2() {
group by ("test_space"."FIRST_NAME"::string) output: ("test_space"."id"::unsigned -> "id", "test_space"."sysFrom"::unsigned -> "sysFrom", "test_space"."FIRST_NAME"::string -> "FIRST_NAME", "test_space"."sys_op"::unsigned -> "sys_op", "test_space"."bucket_id"::unsigned -> "bucket_id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1766,7 +1766,7 @@ fn front_sql_count_asterisk1() {
projection (count((*::integer))::integer -> "count_596")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1789,7 +1789,7 @@ fn front_sql_count_asterisk2() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1828,7 +1828,7 @@ fn front_sql_aggregates_with_subexpressions() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1850,7 +1850,7 @@ fn front_sql_aggregates_with_distinct1() {
group by ("t"."b"::unsigned, "t"."a"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1874,7 +1874,7 @@ fn front_sql_aggregates_with_distinct2() {
group by ("t"."b"::unsigned, ROW("t"."a"::unsigned) + ROW("t"."b"::unsigned) + ROW(3::unsigned)) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1896,7 +1896,7 @@ fn front_sql_aggregates_with_distinct3() {
group by (ROW("t"."a"::unsigned) + ROW("t"."b"::unsigned) + ROW(3::unsigned)) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1939,14 +1939,14 @@ fn front_sql_column_outside_aggregate_no_groupby() {
#[test]
fn front_sql_option_basic() {
- let input = r#"select * from "t" option(sql_vdbe_max_steps = 1000, vtable_max_rows = 10)"#;
+ let input = r#"select * from "t" option(vdbe_max_steps = 1000, vtable_max_rows = 10)"#;
let plan = sql_to_optimized_ir(input, vec![]);
let expected_explain = String::from(
r#"projection ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d")
scan "t"
execution options:
-sql_vdbe_max_steps = 1000
+vdbe_max_steps = 1000
vtable_max_rows = 10
"#,
);
@@ -1955,14 +1955,14 @@ vtable_max_rows = 10
#[test]
fn front_sql_option_with_param() {
- let input = r#"select * from "t" option(sql_vdbe_max_steps = ?, vtable_max_rows = ?)"#;
+ let input = r#"select * from "t" option(vdbe_max_steps = ?, vtable_max_rows = ?)"#;
let plan = sql_to_optimized_ir(input, vec![Value::Unsigned(1000), Value::Unsigned(10)]);
let expected_explain = String::from(
r#"projection ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d")
scan "t"
execution options:
-sql_vdbe_max_steps = 1000
+vdbe_max_steps = 1000
vtable_max_rows = 10
"#,
);
@@ -1981,7 +1981,7 @@ fn front_sql_pg_style_params1() {
r#"projection (1000::unsigned -> "col_1", 'hi'::string -> "col_2", 1000::unsigned -> "col_3")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1990,8 +1990,7 @@ vtable_max_rows = 5000
#[test]
fn front_sql_pg_style_params2() {
- let input =
- r#"select $1, $2, $1 from "t" option(sql_vdbe_max_steps = $1, vtable_max_rows = $1)"#;
+ let input = r#"select $1, $2, $1 from "t" option(vdbe_max_steps = $1, vtable_max_rows = $1)"#;
let plan = sql_to_optimized_ir(
input,
@@ -2001,7 +2000,7 @@ fn front_sql_pg_style_params2() {
r#"projection (1000::unsigned -> "col_1", 'hi'::string -> "col_2", 1000::unsigned -> "col_3")
scan "t"
execution options:
-sql_vdbe_max_steps = 1000
+vdbe_max_steps = 1000
vtable_max_rows = 1000
"#,
);
@@ -2014,7 +2013,7 @@ fn front_sql_pg_style_params3() {
where "a" = $1
group by "a" + $1
having count("b") > $1
- option(sql_vdbe_max_steps = $1, vtable_max_rows = $1)"#;
+ option(vdbe_max_steps = $1, vtable_max_rows = $1)"#;
let plan = sql_to_optimized_ir(input, vec![Value::Unsigned(42)]);
let expected_explain = String::from(
@@ -2027,7 +2026,7 @@ fn front_sql_pg_style_params3() {
selection ROW("t"."a"::unsigned) = ROW(42::unsigned)
scan "t"
execution options:
-sql_vdbe_max_steps = 42
+vdbe_max_steps = 42
vtable_max_rows = 42
"#,
);
@@ -2071,7 +2070,7 @@ fn front_sql_option_defaults() {
selection ROW("t"."a"::unsigned) = ROW(1000::unsigned) and ROW("t"."b"::unsigned) = ROW(10::unsigned)
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2106,7 +2105,7 @@ fn front_sql_aggregate_without_groupby() {
projection (sum((ROW("t"."a"::unsigned) * ROW("t"."b"::unsigned) + ROW(1::unsigned)))::decimal -> "sum_796")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2128,7 +2127,7 @@ fn front_sql_aggregate_without_groupby2() {
projection (count(("test_space"."id"::unsigned))::integer -> "count_696")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2150,7 +2149,7 @@ fn front_sql_aggregate_on_aggregate() {
projection (count(("test_space"."id"::unsigned))::integer -> "count_696")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2178,7 +2177,7 @@ fn front_sql_union_single_left() {
projection (sum(("t"."a"::unsigned))::decimal -> "sum_1296")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2207,7 +2206,7 @@ fn front_sql_union_single_right() {
projection ("t"."a"::unsigned -> "a")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2239,7 +2238,7 @@ fn front_sql_union_single_both() {
projection (sum(("t"."a"::unsigned))::decimal -> "sum_1396")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2262,7 +2261,7 @@ fn front_sql_insert_single() {
projection (count(("t"."d"::unsigned))::integer -> "count_896", sum(("t"."b"::unsigned))::decimal -> "sum_696")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2289,7 +2288,7 @@ fn front_sql_except_single_right() {
projection (sum(("t"."a"::unsigned))::decimal -> "sum_1396", count(("t"."b"::unsigned))::integer -> "count_1596")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2314,7 +2313,7 @@ vtable_max_rows = 5000
projection (sum(("t"."a"::unsigned))::decimal -> "sum_1396", count(("t"."b"::unsigned))::integer -> "count_1596")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2341,7 +2340,7 @@ fn front_sql_except_single_left() {
projection ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2371,7 +2370,7 @@ fn front_sql_except_single_both() {
projection (sum(("t"."a"::unsigned))::decimal -> "sum_1596", sum(("t"."b"::unsigned))::decimal -> "sum_1796")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2394,7 +2393,7 @@ fn front_sql_groupby_expression() {
group by (ROW("t"."a"::unsigned) + ROW("t"."b"::unsigned)) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2418,7 +2417,7 @@ fn front_sql_groupby_expression2() {
group by ((ROW("t"."a"::unsigned) + ROW("t"."b"::unsigned))) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2441,7 +2440,7 @@ fn front_sql_groupby_expression3() {
group by (ROW("t"."a"::unsigned) + ROW("t"."b"::unsigned), (ROW("t"."c"::unsigned) * ROW("t"."d"::unsigned))) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2464,7 +2463,7 @@ fn front_sql_groupby_expression4() {
group by (ROW("t"."a"::unsigned) + ROW("t"."b"::unsigned), "t"."a"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2500,7 +2499,7 @@ fn front_sql_groupby_with_aggregates() {
group by ("t2"."g"::unsigned, "t2"."e"::unsigned) output: ("t2"."e"::unsigned -> "e", "t2"."f"::unsigned -> "f", "t2"."g"::unsigned -> "g", "t2"."h"::unsigned -> "h", "t2"."bucket_id"::unsigned -> "bucket_id")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2529,7 +2528,7 @@ fn front_sql_left_join() {
projection ("t"."b"::unsigned -> "c", "t"."d"::unsigned -> "d")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2561,7 +2560,7 @@ fn front_sql_left_join_single_left() {
projection ("test_space"."id"::unsigned -> "b")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2595,7 +2594,7 @@ fn front_sql_left_join_single_left2() {
projection ("test_space"."id"::unsigned -> "b")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2629,7 +2628,7 @@ fn front_sql_left_join_single_both() {
projection (count(("test_space"."id"::unsigned))::integer -> "count_1496")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2661,7 +2660,7 @@ motion [policy: full]
selection ROW("t1"."a"::string) in ROW($0)
scan "t1"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2686,7 +2685,7 @@ fn front_sql_having1() {
group by ("t"."a"::unsigned, "t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2710,7 +2709,7 @@ fn front_sql_having2() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2733,7 +2732,7 @@ fn front_sql_having3() {
projection (sum(("t"."a"::unsigned))::decimal -> "sum_1396")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2782,7 +2781,7 @@ motion [policy: full]
selection ROW("test_space"."sysFrom"::unsigned) = ROW(2::unsigned)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2832,7 +2831,7 @@ motion [policy: segment([ref("a"), ref("d")])]
projection ("t"."a"::unsigned -> "a", "t"."d"::unsigned -> "d")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2866,7 +2865,7 @@ scan
projection ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2888,7 +2887,7 @@ fn front_sql_unique_local_aggregates() {
projection (sum(("t"."a"::unsigned))::decimal -> "sum_696", count(("t"."a"::unsigned))::integer -> "count_896")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2914,7 +2913,7 @@ fn front_sql_unique_local_groupings() {
group by ("t"."b"::unsigned, "t"."a"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2955,7 +2954,7 @@ ON "t3"."a" = "ij"."id"
projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -2978,7 +2977,7 @@ fn front_sql_select_distinct() {
group by ("t"."a"::unsigned, ROW("t"."a"::unsigned) + ROW("t"."b"::unsigned)) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3000,7 +2999,7 @@ fn front_sql_select_distinct_asterisk() {
group by ("t"."a"::unsigned, "t"."b"::unsigned, "t"."c"::unsigned, "t"."d"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3039,7 +3038,7 @@ fn front_sql_select_distinct_with_aggr() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3059,7 +3058,7 @@ fn front_sql_select_distinct_with_aggr2() {
projection (sum(("t"."a"::unsigned))::decimal -> "sum_696")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3079,7 +3078,7 @@ fn front_sql_insert_on_conflict() {
values
value row (data=ROW(1::unsigned, 1::unsigned, 1::unsigned, 1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3093,7 +3092,7 @@ vtable_max_rows = 5000
values
value row (data=ROW(1::unsigned, 1::unsigned, 1::unsigned, 1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3114,7 +3113,7 @@ fn front_sql_insert_1() {
selection ROW("t"."a"::unsigned) = ROW(1::unsigned) and ROW("t"."b"::unsigned) = ROW(2::unsigned) or ROW("t"."a"::unsigned) = ROW(2::unsigned) and ROW("t"."b"::unsigned) = ROW(3::unsigned)
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3134,7 +3133,7 @@ fn front_sql_insert_2() {
selection ROW("t"."a"::unsigned) = ROW(1::unsigned) and ROW("t"."b"::unsigned) = ROW(2::unsigned)
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3155,7 +3154,7 @@ fn front_sql_insert_3() {
selection ROW("t"."a"::unsigned) = ROW(1::unsigned) and ROW("t"."b"::unsigned) = ROW(2::unsigned) or ROW("t"."a"::unsigned) = ROW(3::unsigned) and ROW("t"."b"::unsigned) = ROW(4::unsigned)
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3175,7 +3174,7 @@ fn front_sql_insert_4() {
selection ROW("t"."a"::unsigned) = ROW(1::unsigned) and ROW("t"."b"::unsigned) = ROW(2::unsigned)
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3195,7 +3194,7 @@ fn front_sql_insert_5() {
selection ROW("t"."a"::unsigned) = ROW(1::unsigned) and ROW("t"."b"::unsigned) = ROW(2::unsigned)
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3217,7 +3216,7 @@ fn front_sql_insert_6() {
value row (data=ROW(1::unsigned, 2::unsigned))
value row (data=ROW(3::unsigned, 4::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3251,7 +3250,7 @@ fn front_sql_insert_8() {
projection ("hash_single_testing"."identification_number"::integer -> "identification_number", "hash_single_testing"."product_code"::string -> "product_code", "hash_single_testing"."product_units"::boolean -> "product_units", "hash_single_testing"."sys_op"::unsigned -> "sys_op")
scan "hash_single_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3269,7 +3268,7 @@ fn front_sql_insert_9() {
values
value row (data=ROW(1::unsigned, 2::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3291,7 +3290,7 @@ fn front_sql_update1() {
projection (1::unsigned -> "col_0", "t"."b"::unsigned -> "col_1", "t"."c"::unsigned -> "col_2", "t"."d"::unsigned -> "col_3", "t"."a"::unsigned -> "col_4", "t"."b"::unsigned -> "col_5")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3310,7 +3309,7 @@ fn front_sql_update2() {
projection (ROW("t"."a"::unsigned) + ROW("t"."b"::unsigned) -> "col_0", "t"."b"::unsigned -> "col_1")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3330,7 +3329,7 @@ fn front_sql_update3() {
selection ROW("t"."c"::unsigned) = ROW(1::unsigned)
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3361,7 +3360,7 @@ fn front_sql_update4() {
projection ("t1"."a"::string -> "a1", "t1"."b"::integer -> "b1")
scan "t1"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3389,7 +3388,7 @@ fn front_sql_update5() {
projection ("test_space"."id"::unsigned -> "id", "test_space"."sysFrom"::unsigned -> "sysFrom", "test_space"."FIRST_NAME"::string -> "FIRST_NAME", "test_space"."sys_op"::unsigned -> "sys_op")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3418,7 +3417,7 @@ motion [policy: full]
projection (sum(("t3"."b"::integer))::decimal -> "sum_796")
scan "t3"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3437,7 +3436,7 @@ fn front_sql_not_true() {
selection not ROW(true::boolean)
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3456,7 +3455,7 @@ fn front_sql_not_equal() {
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3475,7 +3474,7 @@ fn front_sql_not_cast() {
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3494,7 +3493,7 @@ fn from_sql_not_column() {
values
value row (data=ROW(true::boolean))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3513,7 +3512,7 @@ fn front_sql_not_or() {
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3531,7 +3530,7 @@ fn front_sql_not_and_with_parentheses() {
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3550,7 +3549,7 @@ fn front_sql_not_or_with_parentheses() {
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3575,7 +3574,7 @@ scan
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3601,7 +3600,7 @@ motion [policy: full]
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3638,7 +3637,7 @@ scan
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3656,7 +3655,7 @@ fn front_sql_arithmetic_with_parentheses() {
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3674,7 +3673,7 @@ fn front_sql_to_date() {
values
value row (data=ROW('2010/10/10'::string))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
)
@@ -3696,7 +3695,7 @@ fn front_sql_current_date() {
values
value row (data=ROW('2010/10/10'::string))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
today = today.format(&format).unwrap()
@@ -3844,7 +3843,7 @@ scan
values
value row (data=ROW(2::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3866,7 +3865,7 @@ scan
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3890,7 +3889,7 @@ scan
values
value row (data=ROW(ROW($0)))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -3918,7 +3917,7 @@ scan
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/cte.rs b/sbroad-core/src/frontend/sql/ir/tests/cte.rs
index 3c97ac7754..54fa78b49a 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/cte.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/cte.rs
@@ -18,7 +18,7 @@ motion [policy: full]
projection ("test_space"."FIRST_NAME"::string -> "a")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -37,7 +37,7 @@ subquery $0:
projection ("global_t"."a"::integer -> "a")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -64,7 +64,7 @@ subquery $1:
projection ("cte1"."a"::string -> "a")
scan cte cte1($0)
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -92,7 +92,7 @@ motion [policy: full]
projection ("test_space"."FIRST_NAME"::string -> "a")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -130,7 +130,7 @@ projection ("cte"."FIRST_NAME"::string -> "a")
projection ("test_space"."FIRST_NAME"::string -> "FIRST_NAME")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -162,7 +162,7 @@ motion [policy: full]
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -190,7 +190,7 @@ motion [policy: full]
projection ("test_space"."FIRST_NAME"::string -> "a")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -213,7 +213,7 @@ motion [policy: full]
projection ("test_space"."FIRST_NAME"::string -> "a")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -242,7 +242,7 @@ scan
projection ("cte"."a"::string -> "a")
scan cte cte($0)
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -267,7 +267,7 @@ motion [policy: full]
values
value row (data=ROW('a'::string))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -300,7 +300,7 @@ motion [policy: full]
projection ("cte1"."a"::string -> "a")
scan cte cte1($0)
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -333,7 +333,7 @@ motion [policy: full]
projection ("t2"."id"::unsigned -> "id", "t2"."sysFrom"::unsigned -> "sysFrom", "t2"."FIRST_NAME"::string -> "FIRST_NAME", "t2"."sys_op"::unsigned -> "sys_op")
scan "test_space" -> "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -361,7 +361,7 @@ projection ("FIRST_NAME"::string -> "FIRST_NAME")
projection ("test_space"."FIRST_NAME"::string -> "FIRST_NAME")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -443,7 +443,7 @@ motion [policy: full]
projection ("t2"."e"::unsigned -> "E")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/funcs.rs b/sbroad-core/src/frontend/sql/ir/tests/funcs.rs
index ab865bf4c1..0d1f6e87f7 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/funcs.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/funcs.rs
@@ -12,7 +12,7 @@ fn lower_upper() {
r#"projection (upper((lower((ROW('a'::string) || ROW('B'::string)))::string))::string -> "col_1", upper(("t1"."a"::string))::string -> "col_2")
scan "t1"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/global.rs b/sbroad-core/src/frontend/sql/ir/tests/global.rs
index c2717c59c7..fb189c4a54 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/global.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/global.rs
@@ -96,7 +96,7 @@ motion [policy: full]
projection ("t"."a"::unsigned -> "a1")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -131,7 +131,7 @@ scan
projection ("t"."a"::unsigned -> "a1", "t"."b"::unsigned -> "b1")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -169,7 +169,7 @@ motion [policy: full]
projection ("t"."a"::unsigned -> "a1", "t"."b"::unsigned -> "b1")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -195,7 +195,7 @@ scan
projection ("t"."a"::unsigned -> "a1", "t"."b"::unsigned -> "b1")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -228,7 +228,7 @@ motion [policy: full]
projection ("t"."a"::unsigned -> "a1", "t"."b"::unsigned -> "b1")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -261,7 +261,7 @@ scan
projection ("global_t"."a"::integer -> "a1")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -292,7 +292,7 @@ scan
projection ("global_t"."a"::integer -> "a1")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -342,7 +342,7 @@ scan
projection (ROW("global_t"."a"::integer) * ROW(10::unsigned) -> "col_1")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -379,7 +379,7 @@ scan
projection ("global_t"."a"::integer -> "a1")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -414,7 +414,7 @@ fn front_sql_global_join1() {
projection ("t2"."e"::unsigned -> "e", "t2"."f"::unsigned -> "f", "t2"."g"::unsigned -> "g", "t2"."h"::unsigned -> "h")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -443,7 +443,7 @@ fn front_sql_global_join2() {
projection ("global_t"."a"::integer -> "a", "global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -471,7 +471,7 @@ fn front_sql_global_join3() {
projection ("global_t"."a"::integer -> "a", "global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -501,7 +501,7 @@ fn front_sql_global_join4() {
projection ("global_t"."a"::integer -> "a", "global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -531,7 +531,7 @@ fn front_sql_global_join5() {
projection (sum(("t2"."e"::unsigned))::decimal -> "sum_896")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -559,7 +559,7 @@ fn front_sql_global_join6() {
projection (ROW("t2"."e"::unsigned) * ROW("t2"."e"::unsigned) -> "e")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -587,7 +587,7 @@ fn front_sql_global_join7() {
projection ("global_t"."a"::integer -> "a", "global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -615,7 +615,7 @@ fn front_sql_global_join8() {
projection ("global_t"."a"::integer -> "a", "global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -643,7 +643,7 @@ fn front_sql_global_join9() {
projection ("global_t"."a"::integer -> "a", "global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -676,7 +676,7 @@ motion [policy: full]
projection ("t2"."e"::unsigned -> "e")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -708,7 +708,7 @@ scan
projection ("t2"."e"::unsigned -> "e", "t2"."f"::unsigned -> "f")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -727,7 +727,7 @@ fn front_sql_global_aggregate1() {
r#"projection (ROW(sum(("global_t"."a"::integer))::decimal) + ROW(avg((ROW("global_t"."b"::integer) + ROW("global_t"."b"::integer)))::decimal) -> "col_1")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -746,7 +746,7 @@ fn front_sql_global_aggregate2() {
r#"projection (ROW(sum(("global_t"."a"::integer))::decimal) + ROW(avg((ROW("global_t"."b"::integer) + ROW("global_t"."b"::integer)))::decimal) -> "col_1")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -767,7 +767,7 @@ fn front_sql_global_aggregate3() {
group by (ROW("global_t"."b"::integer) + ROW("global_t"."a"::integer)) output: ("global_t"."a"::integer -> "a", "global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -790,7 +790,7 @@ fn front_sql_global_aggregate4() {
group by (ROW("global_t"."b"::integer) + ROW("global_t"."a"::integer)) output: ("global_t"."a"::integer -> "a", "global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -822,7 +822,7 @@ scan
projection ("t2"."e"::unsigned -> "e", "t2"."f"::unsigned -> "f")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -851,7 +851,7 @@ fn front_sql_global_left_join1() {
projection ("t2"."e"::unsigned -> "e", "t2"."f"::unsigned -> "f", "t2"."g"::unsigned -> "g", "t2"."h"::unsigned -> "h")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -882,7 +882,7 @@ fn front_sql_global_left_join2() {
projection ("t2"."e"::unsigned -> "e", "t2"."f"::unsigned -> "f", "t2"."g"::unsigned -> "g", "t2"."h"::unsigned -> "h")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -912,7 +912,7 @@ fn front_sql_global_left_join3() {
projection ("t2"."e"::unsigned -> "e", "t2"."f"::unsigned -> "f", "t2"."g"::unsigned -> "g", "t2"."h"::unsigned -> "h")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -944,7 +944,7 @@ fn front_sql_global_left_join4() {
projection (ROW("t2"."e"::unsigned) + ROW(1::unsigned) -> "e")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -963,7 +963,7 @@ fn front_order_by_from_global_node_must_not_add_motion() {
projection ("global_t"."b"::integer -> "b", "global_t"."a"::integer -> "my_col")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1000,7 +1000,7 @@ fn front_sql_global_union_all1() {
projection ("t2"."e"::unsigned -> "e", "t2"."f"::unsigned -> "f")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1027,7 +1027,7 @@ fn front_sql_global_union_all2() {
projection ("t2"."e"::unsigned -> "e")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1064,7 +1064,7 @@ fn front_sql_global_union_all3() {
projection ("global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1090,7 +1090,7 @@ fn front_sql_global_union_all5() {
projection ("global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1117,7 +1117,7 @@ fn front_sql_global_union() {
projection ("global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1143,7 +1143,7 @@ fn front_sql_global_union1() {
projection ("t2"."e"::unsigned -> "e")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1170,7 +1170,7 @@ fn front_sql_global_union2() {
projection (sum(("t2"."e"::unsigned))::decimal -> "sum_996")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1206,7 +1206,7 @@ fn front_sql_union() {
projection ("t2"."f"::unsigned -> "f")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1239,7 +1239,7 @@ fn check_plan_except_global_vs_segment() {
selection ROW("global_t"."a"::integer) = ROW(1::unsigned)
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1269,7 +1269,7 @@ fn check_plan_except_global_vs_any() {
projection ("global_t"."a"::integer -> "a")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1293,7 +1293,7 @@ fn check_plan_except_global_vs_global() {
projection ("global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1319,7 +1319,7 @@ fn check_plan_except_global_vs_single() {
projection (sum(("t2"."e"::unsigned))::decimal -> "sum_996")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1345,7 +1345,7 @@ fn check_plan_except_single_vs_global() {
projection ("global_t"."a"::integer -> "a")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1370,7 +1370,7 @@ fn check_plan_except_segment_vs_global() {
projection ("global_t"."a"::integer -> "a", "global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1395,7 +1395,7 @@ fn check_plan_except_any_vs_global() {
projection ("global_t"."b"::integer -> "b")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -1444,7 +1444,7 @@ fn check_plan_except_non_trivial_global_subtree_vs_any() {
projection ("global_t"."b"::integer -> "B")
scan "global_t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/insert.rs b/sbroad-core/src/frontend/sql/ir/tests/insert.rs
index 50560bbad8..66d91ae9d6 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/insert.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/insert.rs
@@ -13,7 +13,7 @@ fn insert1() {
values
value row (data=ROW(1::integer, 'test'::string))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -32,7 +32,7 @@ fn insert2() {
values
value row (data=ROW(1::unsigned, 'test'::string))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -52,7 +52,7 @@ fn insert3() {
projection ("test_space"."id"::unsigned -> "id", "test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/join.rs b/sbroad-core/src/frontend/sql/ir/tests/join.rs
index a6271a5c9a..2c244f88f3 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/join.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/join.rs
@@ -30,7 +30,7 @@ fn milti_join1() {
projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -61,7 +61,7 @@ fn milti_join2() {
projection ("t4"."c"::string -> "c", "t4"."d"::integer -> "d")
scan "t4"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -97,7 +97,7 @@ fn milti_join3() {
projection ("t4"."c"::string -> "c", "t4"."d"::integer -> "d")
scan "t4"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -128,7 +128,7 @@ fn milti_join4() {
projection ("t3"."a"::string -> "a", "t3"."b"::integer -> "b")
scan "t3"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/like.rs b/sbroad-core/src/frontend/sql/ir/tests/like.rs
index 987488523c..bd821ea18d 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/like.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/like.rs
@@ -63,7 +63,7 @@ fn like_explain1() {
selection ROW(ROW("t1"."a"::string) || ROW('a'::string)) LIKE ROW(ROW('a'::string) || ROW('a'::string)) ESCAPE ROW('\'::string)
scan "t1"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -82,7 +82,7 @@ fn like_explain2() {
selection ROW(ROW("t1"."a"::string) || ROW('a'::string)) LIKE ROW(ROW('a'::string) || ROW('a'::string)) ESCAPE ROW('x'::string)
scan "t1"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -104,7 +104,7 @@ fn like_explain3() {
group by (ROW("t1"."a"::string) LIKE ROW("t1"."a"::string) ESCAPE ROW('\'::string)) output: ("t1"."a"::string -> "a", "t1"."bucket_id"::unsigned -> "bucket_id", "t1"."b"::integer -> "b")
scan "t1"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -138,7 +138,7 @@ motion [policy: full]
projection ('hi'::string -> "col_1")
scan "t1"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -160,7 +160,7 @@ fn ilike_explain() {
group by (ROW(lower(("t1"."a"::string))::string) LIKE ROW(lower(("t1"."a"::string))::string) ESCAPE ROW('x'::string)) output: ("t1"."a"::string -> "a", "t1"."bucket_id"::unsigned -> "bucket_id", "t1"."b"::integer -> "b")
scan "t1"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/limit.rs b/sbroad-core/src/frontend/sql/ir/tests/limit.rs
index cb962ad593..024f008fdb 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/limit.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/limit.rs
@@ -13,7 +13,7 @@ fn select() {
projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -40,7 +40,7 @@ fn union_all() {
projection ("t2"."e"::unsigned -> "e")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -61,7 +61,7 @@ fn aggregate() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -86,7 +86,7 @@ fn group_by() {
group by ("t"."b"::unsigned) output: ("t"."a"::unsigned -> "a", "t"."b"::unsigned -> "b", "t"."c"::unsigned -> "c", "t"."d"::unsigned -> "d", "t"."bucket_id"::unsigned -> "bucket_id")
scan "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -109,7 +109,7 @@ fn single_limit() {
projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -148,7 +148,7 @@ fn join() {
projection ("t4"."c"::string -> "c", "t4"."d"::integer -> "d")
scan "t4"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -165,7 +165,7 @@ fn limit_all() {
r#"projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -181,7 +181,7 @@ fn limit_null() {
r#"projection ("test_space"."id"::unsigned -> "id")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/params.rs b/sbroad-core/src/frontend/sql/ir/tests/params.rs
index 6380fd8f3e..02d30bce94 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/params.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/params.rs
@@ -150,7 +150,7 @@ fn front_param_in_cast() {
r#"projection (1::integer::int -> "col_1")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -169,7 +169,7 @@ fn front_params1() {
selection ROW("test_space"."sys_op"::unsigned) = ROW(0::integer) and ROW("test_space"."sysFrom"::unsigned) > ROW(1::integer)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -189,7 +189,7 @@ fn front_params2() {
selection ROW("test_space"."sys_op"::unsigned) = ROW(NULL::scalar) and ROW("test_space"."FIRST_NAME"::string) = ROW('hello'::string)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -210,7 +210,7 @@ fn front_params3() {
selection ROW("test_space"."sys_op"::unsigned) = ROW(NULL::scalar) and ROW("test_space"."FIRST_NAME"::string) = ROW('кириллица'::string)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -234,7 +234,7 @@ fn front_params4() {
selection ROW("test_space"."FIRST_NAME"::string) = ROW('''± !@#$%^&*()_+=-\/><";:,.`~'::string)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -266,7 +266,7 @@ motion [policy: segment([ref("sysFrom")])]
selection ROW("test_space_hist"."sys_op"::unsigned) = ROW(1::integer)
scan "test_space_hist"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -307,7 +307,7 @@ motion [policy: full]
selection ROW("test_space"."sys_op"::unsigned) = ROW(2::integer)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/trim.rs b/sbroad-core/src/frontend/sql/ir/tests/trim.rs
index 25b8ed821d..0c47295ab1 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/trim.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/trim.rs
@@ -10,7 +10,7 @@ fn trim() {
r#"projection (TRIM("test_space"."FIRST_NAME"::string) -> "col_1")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -27,7 +27,7 @@ fn trim_leading_from() {
r#"projection (TRIM(leading from "test_space"."FIRST_NAME"::string) -> "col_1")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -44,7 +44,7 @@ fn trim_both_space_from() {
r#"projection (TRIM(both ' '::string from "test_space"."FIRST_NAME"::string) -> "col_1")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/union.rs b/sbroad-core/src/frontend/sql/ir/tests/union.rs
index 46047333a3..edcc54dc38 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/union.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/union.rs
@@ -24,7 +24,7 @@ fn front_select_chaning_1() {
projection ("t3"."a"::string -> "a")
scan "t3"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -71,7 +71,7 @@ fn front_select_chaining_2() {
projection ("t3"."a"::string -> "a")
scan "t3"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -106,7 +106,7 @@ fn front_select_chaining_3() {
projection ("t2"."e"::unsigned -> "e")
scan "t2"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/ir/tests/update.rs b/sbroad-core/src/frontend/sql/ir/tests/update.rs
index c8e8412ca3..1d57af6893 100644
--- a/sbroad-core/src/frontend/sql/ir/tests/update.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests/update.rs
@@ -14,7 +14,7 @@ fn update1() {
projection ('test'::string -> "col_0", "test_space"."id"::unsigned -> "col_1")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -34,7 +34,7 @@ fn update2() {
projection ('test'::string -> "col_0", "test_space"."id"::unsigned -> "col_1")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/frontend/sql/query.pest b/sbroad-core/src/frontend/sql/query.pest
index 4ed24b96b6..6146282bfe 100644
--- a/sbroad-core/src/frontend/sql/query.pest
+++ b/sbroad-core/src/frontend/sql/query.pest
@@ -241,11 +241,11 @@ Query = { (SelectFull | Values | Insert | Update | Delete) ~ DqlOption? }
Values = { ^"values" ~ Row ~ ("," ~ Row)* }
DqlOption = _{ ^"option" ~ "(" ~ OptionParam ~ ("," ~ OptionParam)* ~ ")" }
- OptionParam = _{ SqlVdbeMaxSteps | VTableMaxRows }
+ OptionParam = _{ VdbeMaxSteps | VTableMaxRows }
Timeout = { ^"timeout" ~ "=" ~ Duration }
Duration = @{ Unsigned ~ ("." ~ Unsigned)? }
TimeoutOption = _{ ^"option" ~ "(" ~ Timeout ~ ")" }
- SqlVdbeMaxSteps = { ^"sql_vdbe_max_steps" ~ "=" ~ (Unsigned | Parameter) }
+ VdbeMaxSteps = { ^"vdbe_max_steps" ~ "=" ~ (Unsigned | Parameter) }
VTableMaxRows = { ^"vtable_max_rows" ~ "=" ~ (Unsigned | Parameter) }
Delete = { ^"delete" ~ ^"from" ~ ScanTable ~ (^"where" ~ DeleteFilter)? }
DeleteFilter = { Expr }
diff --git a/sbroad-core/src/ir.rs b/sbroad-core/src/ir.rs
index 5d08bc9067..371886a130 100644
--- a/sbroad-core/src/ir.rs
+++ b/sbroad-core/src/ir.rs
@@ -589,14 +589,14 @@ pub struct OptionSpec {
#[derive(Clone, PartialEq, Eq, Debug, Hash, Deserialize, Serialize)]
pub enum OptionKind {
- SqlVdbeMaxSteps,
+ VdbeMaxSteps,
VTableMaxRows,
}
impl Display for OptionKind {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
let s = match self {
- OptionKind::SqlVdbeMaxSteps => "sql_vdbe_max_steps",
+ OptionKind::VdbeMaxSteps => "vdbe_max_steps",
OptionKind::VTableMaxRows => "vtable_max_rows",
};
write!(f, "{s}")
@@ -625,7 +625,7 @@ impl ExecuteOptions {
#[must_use]
pub fn vdbe_max_steps(&self) -> u64 {
self.0
- .get(&OptionKind::SqlVdbeMaxSteps)
+ .get(&OptionKind::VdbeMaxSteps)
.map_or(DEFAULT_VDBE_MAX_STEPS, |v| {
if let Value::Unsigned(steps) = v {
*steps
@@ -682,7 +682,7 @@ where
impl Default for ExecuteOptions {
fn default() -> Self {
let exec_opts: HashMap<OptionKind, Value, RepeatableState> = collection!((
- OptionKind::SqlVdbeMaxSteps,
+ OptionKind::VdbeMaxSteps,
Value::Unsigned(DEFAULT_VDBE_MAX_STEPS)
));
ExecuteOptions(exec_opts)
@@ -704,7 +704,7 @@ pub struct Options {
/// if one of the storages returns `a` or more rows, the OOM will occur.
pub vtable_max_rows: u64,
/// Options passed to `box.execute` function on storages. Currently there is only one option
- /// `sql_vdbe_max_steps`.
+ /// `vdbe_max_steps`.
pub execute_options: ExecuteOptions,
}
@@ -964,7 +964,7 @@ impl Plan {
return Err(SbroadError::Invalid(Entity::OptionSpec, None));
};
match opt.kind {
- OptionKind::SqlVdbeMaxSteps => {
+ OptionKind::VdbeMaxSteps => {
if values_count.is_some() {
warn!(
Option::from("apply_options"),
diff --git a/sbroad-core/src/ir/distribution/tests.rs b/sbroad-core/src/ir/distribution/tests.rs
index 170ac1c6af..c181bbaa30 100644
--- a/sbroad-core/src/ir/distribution/tests.rs
+++ b/sbroad-core/src/ir/distribution/tests.rs
@@ -69,7 +69,7 @@ fn projection_any_dist_for_expr() {
projection (count(("test_space"."id"::unsigned))::integer -> "count_696")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/ir/explain/tests.rs b/sbroad-core/src/ir/explain/tests.rs
index e70436e4f6..c6da9ae072 100644
--- a/sbroad-core/src/ir/explain/tests.rs
+++ b/sbroad-core/src/ir/explain/tests.rs
@@ -18,7 +18,7 @@ fn simple_query_without_cond_plan() {
r#"projection ("t"."identification_number"::integer -> "c1", "t"."product_code"::string -> "product_code")
scan "hash_testing" -> "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -41,7 +41,7 @@ fn simple_query_with_cond_plan() {
selection ROW("t"."identification_number"::integer) = ROW(1::unsigned) and ROW("t"."product_code"::string) = ROW('222'::string)
scan "hash_testing" -> "t"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -68,7 +68,7 @@ fn union_query_plan() {
r#" projection ("t2"."identification_number"::integer -> "identification_number", "t2"."product_code"::string -> "product_code")"#,
r#" scan "hash_testing_hist" -> "t2""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
);
assert_eq!(expected, explain_tree.to_string());
@@ -100,7 +100,7 @@ WHERE "id" = 1"#;
selection ROW("test_space_hist"."sys_op"::unsigned) < ROW(0::unsigned)
scan "test_space_hist"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#);
@@ -152,7 +152,7 @@ scan
selection ROW("test_space_hist"."sys_op"::unsigned) < ROW(0::unsigned)
scan "test_space_hist"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#);
@@ -178,7 +178,7 @@ fn explain_except1() {
r#" projection ("hash_testing_hist"."identification_number"::integer -> "identification_number")"#,
r#" scan "hash_testing_hist""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
);
assert_eq!(expected, explain_tree.to_string());
@@ -241,7 +241,7 @@ scan
selection ROW("test_space_hist"."sys_op"::unsigned) < ROW(0::unsigned)
scan "test_space_hist"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#);
@@ -273,7 +273,7 @@ WHERE "t2"."product_code" = '123'"#;
projection ("hash_testing"."identification_number"::integer -> "identification_number", "hash_testing"."product_code"::string -> "product_code")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#);
@@ -308,7 +308,7 @@ motion [policy: segment([ref("identification_number")])]
projection ("hash_testing"."identification_number"::integer -> "identification_number")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#);
@@ -330,7 +330,7 @@ fn unary_condition_plan() {
selection ROW("test_space"."id"::unsigned) is null and not ROW("test_space"."FIRST_NAME"::string) is null
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -354,7 +354,7 @@ fn insert_plan() {
values
value row (data=ROW(1::unsigned, '123'::string))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -380,7 +380,7 @@ fn multiply_insert_plan() {
value row (data=ROW(2::unsigned, '456'::string))
value row (data=ROW(3::unsigned, '789'::string))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -405,7 +405,7 @@ SELECT "identification_number", "product_code" FROM "hash_testing""#;
projection ("hash_testing"."identification_number"::integer -> "identification_number", "hash_testing"."product_code"::string -> "product_code")
scan "hash_testing"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -429,7 +429,7 @@ fn select_value_plan() {
values
value row (data=ROW(1::unsigned))
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -451,7 +451,7 @@ fn select_cast_plan1() {
r#"projection ("test_space"."id"::unsigned::unsigned -> "b")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -474,7 +474,7 @@ fn select_cast_plan2() {
selection ROW("test_space"."id"::unsigned::int) = ROW(1::unsigned)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -496,7 +496,7 @@ fn select_cast_plan_nested() {
r#"projection ("func"(("test_space"."id"::unsigned))::integer::string -> "col_1")
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -519,7 +519,7 @@ fn select_cast_plan_nested_where() {
selection ROW("func"(("test_space"."id"::unsigned))::integer::string) = ROW(1::unsigned)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
@@ -542,7 +542,7 @@ fn select_cast_plan_nested_where2() {
selection ROW("func"((42::unsigned::string))::integer) = ROW(1::unsigned)
scan "test_space"
execution options:
-sql_vdbe_max_steps = 45000
+vdbe_max_steps = 45000
vtable_max_rows = 5000
"#,
);
diff --git a/sbroad-core/src/ir/explain/tests/concat.rs b/sbroad-core/src/ir/explain/tests/concat.rs
index e3a39c52eb..fdfb9a3d09 100644
--- a/sbroad-core/src/ir/explain/tests/concat.rs
+++ b/sbroad-core/src/ir/explain/tests/concat.rs
@@ -9,7 +9,7 @@ fn concat1_test() {
r#"projection (ROW('1'::string::string) || ROW('hello'::string) -> "col_1")"#,
r#" scan "t1""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
),
);
@@ -25,7 +25,7 @@ fn concat2_test() {
r#" selection ROW(ROW(ROW('1'::string::string) || ROW("func"(('hello'::string))::integer)) || ROW('2'::string)) = ROW(42::unsigned)"#,
r#" scan "t1""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
),
);
diff --git a/sbroad-core/src/ir/explain/tests/delete.rs b/sbroad-core/src/ir/explain/tests/delete.rs
index 44185beb19..66338f6215 100644
--- a/sbroad-core/src/ir/explain/tests/delete.rs
+++ b/sbroad-core/src/ir/explain/tests/delete.rs
@@ -11,7 +11,7 @@ fn delete1_test() {
r#" projection ("t1"."a"::string -> "pk_col_0", "t1"."b"::integer -> "pk_col_1")"#,
r#" scan "t1""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
),
);
@@ -29,7 +29,7 @@ fn delete2_test() {
r#" selection ROW("t1"."a"::string) > ROW(3::unsigned)"#,
r#" scan "t1""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
),
);
@@ -52,7 +52,7 @@ fn delete3_test() {
r#" projection ("t1"."b"::integer -> "b")"#,
r#" scan "t1""#,
r#"execution options:"#,
- r#"sql_vdbe_max_steps = 45000"#,
+ r#"vdbe_max_steps = 45000"#,
r#"vtable_max_rows = 5000"#,
),
);
diff --git a/sbroad-core/tests/artifactory/backend/sql/tree/arbitrary_projection_plan.yaml b/sbroad-core/tests/artifactory/backend/sql/tree/arbitrary_projection_plan.yaml
index dd8317d6ef..4df61d3138 100644
--- a/sbroad-core/tests/artifactory/backend/sql/tree/arbitrary_projection_plan.yaml
+++ b/sbroad-core/tests/artifactory/backend/sql/tree/arbitrary_projection_plan.yaml
@@ -220,6 +220,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/distribution/join_unite_keys.yaml b/sbroad-core/tests/artifactory/ir/distribution/join_unite_keys.yaml
index 95030453fd..f72d4dc57e 100644
--- a/sbroad-core/tests/artifactory/ir/distribution/join_unite_keys.yaml
+++ b/sbroad-core/tests/artifactory/ir/distribution/join_unite_keys.yaml
@@ -204,6 +204,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/distribution/shrink_dist_key_1.yaml b/sbroad-core/tests/artifactory/ir/distribution/shrink_dist_key_1.yaml
index 1dd3800cb4..f3666a8622 100644
--- a/sbroad-core/tests/artifactory/ir/distribution/shrink_dist_key_1.yaml
+++ b/sbroad-core/tests/artifactory/ir/distribution/shrink_dist_key_1.yaml
@@ -122,6 +122,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/distribution/shrink_dist_key_2.yaml b/sbroad-core/tests/artifactory/ir/distribution/shrink_dist_key_2.yaml
index f41e0cf0f6..2002a4c09a 100644
--- a/sbroad-core/tests/artifactory/ir/distribution/shrink_dist_key_2.yaml
+++ b/sbroad-core/tests/artifactory/ir/distribution/shrink_dist_key_2.yaml
@@ -110,6 +110,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/distribution/shuffle_dist_key.yaml b/sbroad-core/tests/artifactory/ir/distribution/shuffle_dist_key.yaml
index f05915f5f9..c35db60bae 100644
--- a/sbroad-core/tests/artifactory/ir/distribution/shuffle_dist_key.yaml
+++ b/sbroad-core/tests/artifactory/ir/distribution/shuffle_dist_key.yaml
@@ -122,6 +122,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/distribution/union_fallback_to_random.yaml b/sbroad-core/tests/artifactory/ir/distribution/union_fallback_to_random.yaml
index f34d52fb88..fa05c0ce6e 100644
--- a/sbroad-core/tests/artifactory/ir/distribution/union_fallback_to_random.yaml
+++ b/sbroad-core/tests/artifactory/ir/distribution/union_fallback_to_random.yaml
@@ -142,6 +142,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/distribution/union_preserve_dist.yaml b/sbroad-core/tests/artifactory/ir/distribution/union_preserve_dist.yaml
index d29f50673c..ca2510125a 100644
--- a/sbroad-core/tests/artifactory/ir/distribution/union_preserve_dist.yaml
+++ b/sbroad-core/tests/artifactory/ir/distribution/union_preserve_dist.yaml
@@ -142,6 +142,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/operator/join.yaml b/sbroad-core/tests/artifactory/ir/operator/join.yaml
index f18ccd7113..9e6640d7bf 100644
--- a/sbroad-core/tests/artifactory/ir/operator/join.yaml
+++ b/sbroad-core/tests/artifactory/ir/operator/join.yaml
@@ -204,6 +204,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/operator/output_aliases_duplicates.yaml b/sbroad-core/tests/artifactory/ir/operator/output_aliases_duplicates.yaml
index ebde2db8ea..a1dcd68e92 100644
--- a/sbroad-core/tests/artifactory/ir/operator/output_aliases_duplicates.yaml
+++ b/sbroad-core/tests/artifactory/ir/operator/output_aliases_duplicates.yaml
@@ -54,5 +54,5 @@ undo: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
diff --git a/sbroad-core/tests/artifactory/ir/operator/output_aliases_oor.yaml b/sbroad-core/tests/artifactory/ir/operator/output_aliases_oor.yaml
index a7ebb683c4..948b4827f5 100644
--- a/sbroad-core/tests/artifactory/ir/operator/output_aliases_oor.yaml
+++ b/sbroad-core/tests/artifactory/ir/operator/output_aliases_oor.yaml
@@ -44,5 +44,5 @@ undo: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
diff --git a/sbroad-core/tests/artifactory/ir/operator/output_aliases_unsupported_type.yaml b/sbroad-core/tests/artifactory/ir/operator/output_aliases_unsupported_type.yaml
index 8333909232..91c2d908dc 100644
--- a/sbroad-core/tests/artifactory/ir/operator/output_aliases_unsupported_type.yaml
+++ b/sbroad-core/tests/artifactory/ir/operator/output_aliases_unsupported_type.yaml
@@ -50,5 +50,5 @@ undo: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
diff --git a/sbroad-core/tests/artifactory/ir/operator/projection.yaml b/sbroad-core/tests/artifactory/ir/operator/projection.yaml
index 500d6c9a64..46434537d1 100644
--- a/sbroad-core/tests/artifactory/ir/operator/projection.yaml
+++ b/sbroad-core/tests/artifactory/ir/operator/projection.yaml
@@ -8,7 +8,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 9
+ parent: 9
position: 0
col_type: Number
- Expression:
@@ -18,7 +18,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 9
+ parent: 9
position: 1
col_type: Number
- Expression:
@@ -42,7 +42,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 9
+ parent: 9
position: 1
col_type: Number
- Expression:
@@ -94,6 +94,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/operator/scan_rel.yaml b/sbroad-core/tests/artifactory/ir/operator/scan_rel.yaml
index 5f0e54fdc8..d2fa590db8 100644
--- a/sbroad-core/tests/artifactory/ir/operator/scan_rel.yaml
+++ b/sbroad-core/tests/artifactory/ir/operator/scan_rel.yaml
@@ -94,6 +94,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/operator/selection.yaml b/sbroad-core/tests/artifactory/ir/operator/selection.yaml
index 621e1eeaed..bce06f0a6a 100644
--- a/sbroad-core/tests/artifactory/ir/operator/selection.yaml
+++ b/sbroad-core/tests/artifactory/ir/operator/selection.yaml
@@ -4,7 +4,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 9
+ parent: 9
position: 0
col_type: Number
- Expression:
@@ -14,7 +14,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 9
+ parent: 9
position: 1
col_type: Number
- Expression:
@@ -24,7 +24,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 9
+ parent: 9
position: 2
col_type: Number
- Expression:
@@ -34,7 +34,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 9
+ parent: 9
position: 3
col_type: Number
- Expression:
@@ -61,7 +61,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 23
+ parent: 23
position: 1
col_type: Number
- Expression:
@@ -81,7 +81,7 @@ nodes:
Reference:
targets:
- 0
- parent: 23
+ parent: 23
position: 0
col_type: Number
- Expression:
@@ -92,7 +92,7 @@ nodes:
Reference:
targets:
- 0
- parent: 23
+ parent: 23
position: 1
col_type: Number
- Expression:
@@ -103,7 +103,7 @@ nodes:
Reference:
targets:
- 0
- parent: 23
+ parent: 23
position: 2
col_type: Number
- Expression:
@@ -114,7 +114,7 @@ nodes:
Reference:
targets:
- 0
- parent: 23
+ parent: 23
position: 3
col_type: Number
- Expression:
@@ -176,6 +176,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/operator/selection_with_sub_query.yaml b/sbroad-core/tests/artifactory/ir/operator/selection_with_sub_query.yaml
index 5b77212a7d..06e272f0d2 100644
--- a/sbroad-core/tests/artifactory/ir/operator/selection_with_sub_query.yaml
+++ b/sbroad-core/tests/artifactory/ir/operator/selection_with_sub_query.yaml
@@ -70,7 +70,7 @@ nodes:
- 0
position: 0
parent: 15
- col_type: Integer
+ col_type: Integer
- Expression:
Alias:
name: b
@@ -92,7 +92,7 @@ nodes:
- 1
position: 0
parent: 24
- col_type: Integer
+ col_type: Integer
- Expression:
Row:
list:
@@ -104,7 +104,7 @@ nodes:
- 0
position: 0
parent: 24
- col_type: Integer
+ col_type: Integer
- Expression:
Row:
list:
@@ -121,7 +121,7 @@ nodes:
- 0
position: 0
parent: 24
- col_type: Integer
+ col_type: Integer
- Expression:
Alias:
name: a
@@ -180,6 +180,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/operator/sub_query.yaml b/sbroad-core/tests/artifactory/ir/operator/sub_query.yaml
index 8f3ced1544..a558fcefae 100644
--- a/sbroad-core/tests/artifactory/ir/operator/sub_query.yaml
+++ b/sbroad-core/tests/artifactory/ir/operator/sub_query.yaml
@@ -4,7 +4,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 5
+ parent: 5
position: 0
col_type: Number
- Expression:
@@ -14,7 +14,7 @@ nodes:
- Expression:
Reference:
targets: ~
- parent: 5
+ parent: 5
position: 1
col_type: Number
- Expression:
@@ -105,6 +105,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/plan_no_top.yaml b/sbroad-core/tests/artifactory/ir/plan_no_top.yaml
index 666a51b220..a81bbee563 100644
--- a/sbroad-core/tests/artifactory/ir/plan_no_top.yaml
+++ b/sbroad-core/tests/artifactory/ir/plan_no_top.yaml
@@ -7,7 +7,7 @@ nodes:
targets: ~
position: 0
parent: 3
- col_type: Boolean
+ col_type: Boolean
#1
- Expression:
Alias:
@@ -52,6 +52,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/plan_oor_top.yaml b/sbroad-core/tests/artifactory/ir/plan_oor_top.yaml
index b1366fb41f..1faa7dceb6 100644
--- a/sbroad-core/tests/artifactory/ir/plan_oor_top.yaml
+++ b/sbroad-core/tests/artifactory/ir/plan_oor_top.yaml
@@ -52,6 +52,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/transformation/redistribution/full_motion_less_for_sub_query.yaml b/sbroad-core/tests/artifactory/ir/transformation/redistribution/full_motion_less_for_sub_query.yaml
index 9a634f6fc3..e677e6fe42 100644
--- a/sbroad-core/tests/artifactory/ir/transformation/redistribution/full_motion_less_for_sub_query.yaml
+++ b/sbroad-core/tests/artifactory/ir/transformation/redistribution/full_motion_less_for_sub_query.yaml
@@ -231,6 +231,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/transformation/redistribution/full_motion_non_segment_outer_for_sub_query.yaml b/sbroad-core/tests/artifactory/ir/transformation/redistribution/full_motion_non_segment_outer_for_sub_query.yaml
index bb6e5dade7..3c93d6ecf5 100644
--- a/sbroad-core/tests/artifactory/ir/transformation/redistribution/full_motion_non_segment_outer_for_sub_query.yaml
+++ b/sbroad-core/tests/artifactory/ir/transformation/redistribution/full_motion_non_segment_outer_for_sub_query.yaml
@@ -237,7 +237,7 @@ relations:
positions:
- 0
engine: Vinyl
-slices:
+slices:
slices:
- slice:
- 32
@@ -251,6 +251,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/transformation/redistribution/local_sub_query.yaml b/sbroad-core/tests/artifactory/ir/transformation/redistribution/local_sub_query.yaml
index d0f08e0554..555d6ff80f 100644
--- a/sbroad-core/tests/artifactory/ir/transformation/redistribution/local_sub_query.yaml
+++ b/sbroad-core/tests/artifactory/ir/transformation/redistribution/local_sub_query.yaml
@@ -205,6 +205,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/transformation/redistribution/multiple_sub_queries.yaml b/sbroad-core/tests/artifactory/ir/transformation/redistribution/multiple_sub_queries.yaml
index 50a246fa83..0f9f290fa1 100644
--- a/sbroad-core/tests/artifactory/ir/transformation/redistribution/multiple_sub_queries.yaml
+++ b/sbroad-core/tests/artifactory/ir/transformation/redistribution/multiple_sub_queries.yaml
@@ -341,7 +341,7 @@ nodes:
policy:
Segment:
targets:
- - Reference:
+ - Reference:
0
program: [ReshardIfNeeded]
output: 53
@@ -392,6 +392,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
diff --git a/sbroad-core/tests/artifactory/ir/transformation/redistribution/segment_motion_for_sub_query.yaml b/sbroad-core/tests/artifactory/ir/transformation/redistribution/segment_motion_for_sub_query.yaml
index d28ab0cc9c..56c60035f9 100644
--- a/sbroad-core/tests/artifactory/ir/transformation/redistribution/segment_motion_for_sub_query.yaml
+++ b/sbroad-core/tests/artifactory/ir/transformation/redistribution/segment_motion_for_sub_query.yaml
@@ -242,6 +242,6 @@ pg_params_map: {}
options:
vtable_max_rows: 5000
execute_options:
- SqlVdbeMaxSteps:
+ VdbeMaxSteps:
Unsigned: 45000
version_map: {}
--
GitLab