Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
picodata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
picodata
Commits
c6c3b541
Commit
c6c3b541
authored
Jun 17, 2024
by
Егор Ивков
Browse files
Options
Downloads
Patches
Plain Diff
feat: rename proc execute to proc_sql_execute
parent
67ae2d92
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!1414
sbroad import
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
sbroad-cartridge/src/api/exec_query.rs
+1
-1
1 addition, 1 deletion
sbroad-cartridge/src/api/exec_query.rs
sbroad-cartridge/src/rust.lua
+1
-1
1 addition, 1 deletion
sbroad-cartridge/src/rust.lua
sbroad-core/src/core-router.lua
+4
-4
4 additions, 4 deletions
sbroad-core/src/core-router.lua
with
6 additions
and
6 deletions
sbroad-cartridge/src/api/exec_query.rs
+
1
−
1
View file @
c6c3b541
...
...
@@ -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
)))
}
...
...
This diff is collapsed.
Click to expand it.
sbroad-cartridge/src/rust.lua
+
1
−
1
View file @
c6c3b541
...
...
@@ -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`
...
...
This diff is collapsed.
Click to expand it.
sbroad-core/src/core-router.lua
+
4
−
4
View file @
c6c3b541
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment