From c6c3b541b21ba08da3843396878f26e49fc65a2b Mon Sep 17 00:00:00 2001
From: Egor Ivkov <e.ivkov@picodata.io>
Date: Mon, 17 Jun 2024 18:29:38 +0300
Subject: [PATCH] feat: rename proc execute to proc_sql_execute
---
sbroad-cartridge/src/api/exec_query.rs | 2 +-
sbroad-cartridge/src/rust.lua | 2 +-
sbroad-core/src/core-router.lua | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sbroad-cartridge/src/api/exec_query.rs b/sbroad-cartridge/src/api/exec_query.rs
index 81a491e485..bd06a4b435 100644
--- a/sbroad-cartridge/src/api/exec_query.rs
+++ b/sbroad-cartridge/src/api/exec_query.rs
@@ -57,7 +57,7 @@ fn dispatch_query_inner(args: &RawBytes) -> anyhow::Result<RawProcResult> {
}
#[tarantool::proc(packed_args)]
-fn execute(args: &RawBytes) -> RetResult<RawProcResult, String> {
+fn proc_sql_execute(args: &RawBytes) -> RetResult<RawProcResult, String> {
RetResult(wrap_proc_result(Some("execute_query"), execute_inner(args)))
}
diff --git a/sbroad-cartridge/src/rust.lua b/sbroad-cartridge/src/rust.lua
index 35721d3494..4acb47c5f8 100644
--- a/sbroad-cartridge/src/rust.lua
+++ b/sbroad-cartridge/src/rust.lua
@@ -8,7 +8,7 @@ local rust_funcs = {
"invalidate_segment_cache",
"invalidate_coordinator_cache",
"dispatch_query",
- "execute"
+ "proc_sql_execute",
}
--- Generates convenient wrappers over `box.lib`
diff --git a/sbroad-core/src/core-router.lua b/sbroad-core/src/core-router.lua
index a79d65a316..9687f4a565 100644
--- a/sbroad-core/src/core-router.lua
+++ b/sbroad-core/src/core-router.lua
@@ -218,7 +218,7 @@ _G.dql_on_some = function(uuid_to_args, is_readonly, waiting_timeout, vtable_max
local result
local call_opts = { is_async = true }
- local exec_fn = helper.proc_fn_name("execute")
+ local exec_fn = helper.proc_fn_name("proc_sql_execute")
if #uuid_to_args == 1 then
-- When read request is executed only on one
-- storage, we don't care about bucket rebalancing.
@@ -268,7 +268,7 @@ end
_G.dql_on_all = function(required, optional, waiting_timeout, vtable_max_rows)
local replicasets = vshard.router.routeall()
- local exec_fn = helper.proc_fn_name("execute")
+ local exec_fn = helper.proc_fn_name("proc_sql_execute")
local uuid_to_args = {}
for uuid, _ in pairs(replicasets) do
uuid_to_args[uuid] = { required = required, optional = optional }
@@ -290,7 +290,7 @@ end
_G.dml_on_some = function(tbl_rs_ir, is_readonly, waiting_timeout)
local result = nil
- local exec_fn = helper.proc_fn_name("execute")
+ local exec_fn = helper.proc_fn_name("proc_sql_execute")
local futures = {}
for rs_uuid, map in pairs(tbl_rs_ir) do
@@ -345,7 +345,7 @@ _G.dml_on_all = function(required, optional, is_readonly, waiting_timeout)
local replicas = vshard.router.routeall()
local result = nil
local futures = {}
- local exec_fn = helper.proc_fn_name("execute")
+ local exec_fn = helper.proc_fn_name("proc_sql_execute")
for _, replica in pairs(replicas) do
if is_readonly then
--
GitLab