Skip to content

Commit bf00f8b

Browse files
committed
session: rename do_query -> run_request_once
1 parent ef80cd9 commit bf00f8b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

scylla/src/transport/session.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,7 +1931,7 @@ where
19311931
statement_info: RoutingInfo<'a>,
19321932
statement_config: &'a StatementConfig,
19331933
execution_profile: Arc<ExecutionProfileInner>,
1934-
do_query: impl Fn(Arc<Connection>, Consistency, &ExecutionProfileInner) -> QueryFut,
1934+
run_request_once: impl Fn(Arc<Connection>, Consistency, &ExecutionProfileInner) -> QueryFut,
19351935
request_span: &'a RequestSpan,
19361936
) -> Result<RunRequestResult<ResT>, QueryError>
19371937
where
@@ -2008,7 +2008,7 @@ where
20082008

20092009
self.run_request_speculative_fiber(
20102010
&shared_query_plan,
2011-
&do_query,
2011+
&run_request_once,
20122012
&execution_profile,
20132013
ExecuteRequestContext {
20142014
is_idempotent: statement_config.is_idempotent,
@@ -2043,7 +2043,7 @@ where
20432043
});
20442044
self.run_request_speculative_fiber(
20452045
query_plan,
2046-
&do_query,
2046+
&run_request_once,
20472047
&execution_profile,
20482048
ExecuteRequestContext {
20492049
is_idempotent: statement_config.is_idempotent,
@@ -2086,15 +2086,15 @@ where
20862086
result
20872087
}
20882088

2089-
/// Executes the closure `do_query`, provided the load balancing plan and some information
2089+
/// Executes the closure `run_request_once`, provided the load balancing plan and some information
20902090
/// about the request, including retry session.
20912091
/// If request fails, retry session is used to perform retries.
20922092
///
20932093
/// Returns None, if provided plan is empty.
20942094
async fn run_request_speculative_fiber<'a, QueryFut, ResT>(
20952095
&'a self,
20962096
query_plan: impl Iterator<Item = (NodeRef<'a>, Shard)>,
2097-
do_query: impl Fn(Arc<Connection>, Consistency, &ExecutionProfileInner) -> QueryFut,
2097+
run_request_once: impl Fn(Arc<Connection>, Consistency, &ExecutionProfileInner) -> QueryFut,
20982098
execution_profile: &ExecutionProfileInner,
20992099
mut context: ExecuteRequestContext<'a>,
21002100
) -> Option<Result<RunRequestResult<ResT>, QueryError>>
@@ -2137,7 +2137,7 @@ where
21372137
let attempt_id: Option<history::AttemptId> =
21382138
context.log_attempt_start(connection.get_connect_address());
21392139
let query_result: Result<ResT, QueryError> =
2140-
do_query(connection, current_consistency, execution_profile)
2140+
run_request_once(connection, current_consistency, execution_profile)
21412141
.instrument(span.clone())
21422142
.await;
21432143

0 commit comments

Comments
 (0)