Skip to content

Commit 98b382d

Browse files
committed
iterator: rename RowIteratorWorker to PagerWorker
Not to use legacy naming, (SingleConnection)RowIteratorWorker is renamed to (SingleConnection)PagerWorker.
1 parent f1e7e02 commit 98b382d

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

scylla/src/transport/iterator.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ use checked_channel_sender::{ProvingSender, SendAttemptedProof};
127127

128128
type PageSendAttemptedProof = SendAttemptedProof<Result<ReceivedPage, QueryError>>;
129129

130-
// RowIteratorWorker works in the background to fetch pages
131-
// RowIterator receives them through a channel
132-
struct RowIteratorWorker<'a, QueryFunc, SpanCreatorFunc> {
130+
// PagerWorker works in the background to fetch pages
131+
// QueryPager receives them through a channel
132+
struct PagerWorker<'a, QueryFunc, SpanCreatorFunc> {
133133
sender: ProvingSender<Result<ReceivedPage, QueryError>>,
134134

135135
// Closure used to perform a single page query
@@ -153,7 +153,7 @@ struct RowIteratorWorker<'a, QueryFunc, SpanCreatorFunc> {
153153
span_creator: SpanCreatorFunc,
154154
}
155155

156-
impl<QueryFunc, QueryFut, SpanCreator> RowIteratorWorker<'_, QueryFunc, SpanCreator>
156+
impl<QueryFunc, QueryFut, SpanCreator> PagerWorker<'_, QueryFunc, SpanCreator>
157157
where
158158
QueryFunc: Fn(Arc<Connection>, Consistency, PagingState) -> QueryFut,
159159
QueryFut: Future<Output = Result<QueryResponse, UserRequestError>>,
@@ -260,7 +260,7 @@ where
260260
}
261261
}
262262

263-
// Send last_error to RowIterator - query failed fully
263+
// Send last_error to QueryPager - query failed fully
264264
self.log_query_error(&last_error);
265265
let (proof, _) = self.sender.send(Err(last_error)).await;
266266
proof
@@ -333,10 +333,10 @@ where
333333

334334
let received_page = ReceivedPage { rows, tracing_id };
335335

336-
// Send next page to RowIterator
336+
// Send next page to QueryPager
337337
let (proof, res) = self.sender.send(Ok(received_page)).await;
338338
if res.is_err() {
339-
// channel was closed, RowIterator was dropped - should shutdown
339+
// channel was closed, QueryPager was dropped - should shutdown
340340
return Ok(ControlFlow::Break(proof));
341341
}
342342

@@ -469,15 +469,15 @@ where
469469
}
470470
}
471471

472-
/// A massively simplified version of the RowIteratorWorker. It does not have
472+
/// A massively simplified version of the PagerWorker. It does not have
473473
/// any complicated logic related to retries, it just fetches pages from
474474
/// a single connection.
475-
struct SingleConnectionRowIteratorWorker<Fetcher> {
475+
struct SingleConnectionPagerWorker<Fetcher> {
476476
sender: ProvingSender<Result<ReceivedPage, QueryError>>,
477477
fetcher: Fetcher,
478478
}
479479

480-
impl<Fetcher, FetchFut> SingleConnectionRowIteratorWorker<Fetcher>
480+
impl<Fetcher, FetchFut> SingleConnectionPagerWorker<Fetcher>
481481
where
482482
Fetcher: Fn(PagingState) -> FetchFut + Send + Sync,
483483
FetchFut: Future<Output = Result<QueryResponse, UserRequestError>> + Send,
@@ -508,7 +508,7 @@ where
508508
.await;
509509

510510
if send_result.is_err() {
511-
// channel was closed, RowIterator was dropped - should shutdown
511+
// channel was closed, QueryPager was dropped - should shutdown
512512
return Ok(proof);
513513
}
514514

@@ -742,7 +742,7 @@ impl QueryPager {
742742
span
743743
};
744744

745-
let worker = RowIteratorWorker {
745+
let worker = PagerWorker {
746746
sender: sender.into(),
747747
page_query,
748748
statement_info: routing_info,
@@ -860,7 +860,7 @@ impl QueryPager {
860860
span
861861
};
862862

863-
let worker = RowIteratorWorker {
863+
let worker = PagerWorker {
864864
sender: sender.into(),
865865
page_query,
866866
statement_info,
@@ -894,7 +894,7 @@ impl QueryPager {
894894
let page_size = query.get_validated_page_size();
895895

896896
let worker_task = async move {
897-
let worker = SingleConnectionRowIteratorWorker {
897+
let worker = SingleConnectionPagerWorker {
898898
sender: sender.into(),
899899
fetcher: |paging_state| {
900900
connection.query_raw_with_consistency(
@@ -924,7 +924,7 @@ impl QueryPager {
924924
let page_size = prepared.get_validated_page_size();
925925

926926
let worker_task = async move {
927-
let worker = SingleConnectionRowIteratorWorker {
927+
let worker = SingleConnectionPagerWorker {
928928
sender: sender.into(),
929929
fetcher: |paging_state| {
930930
connection.execute_raw_with_consistency(

0 commit comments

Comments
 (0)