Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sqlite: fix inconsistent read-after-write #3354

Merged
merged 5 commits into from
Aug 1, 2024
Merged

sqlite: fix inconsistent read-after-write #3354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86bb083
sqlite: fix inconsistent read-after-write
ckampfe Jul 18, 2024
6e0f5be
try pushing fetch_optional early-return into worker
ckampfe Jul 23, 2024
04be563
run cargo fmt
ckampfe Jul 23, 2024
f188f70
fix "it_can_execute_multiple_statements" test failure
ckampfe Jul 23, 2024
b95a256
use Option<usize> instead of bespoke enum for rows returned
ckampfe Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sqlx-sqlite/src/any.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl AnyConnectionBackend for SqliteConnection {

Box::pin(
self.worker
.execute(query, args, self.row_channel_size, persistent)
.execute(query, args, self.row_channel_size, persistent, None)
.map_ok(flume::Receiver::into_stream)
.try_flatten_stream()
.map(
Expand All @@ -107,7 +107,7 @@ impl AnyConnectionBackend for SqliteConnection {
Box::pin(async move {
let stream = self
.worker
.execute(query, args, self.row_channel_size, persistent)
.execute(query, args, self.row_channel_size, persistent, Some(1))
.map_ok(flume::Receiver::into_stream)
.await?;
futures_util::pin_mut!(stream);
Expand Down
4 changes: 2 additions & 2 deletions sqlx-sqlite/src/connection/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl<'c> Executor<'c> for &'c mut SqliteConnection {

Box::pin(
self.worker
.execute(sql, arguments, self.row_channel_size, persistent)
.execute(sql, arguments, self.row_channel_size, persistent, None)
.map_ok(flume::Receiver::into_stream)
.try_flatten_stream(),
)
Expand All @@ -58,7 +58,7 @@ impl<'c> Executor<'c> for &'c mut SqliteConnection {
Box::pin(async move {
let stream = self
.worker
.execute(sql, arguments, self.row_channel_size, persistent)
.execute(sql, arguments, self.row_channel_size, persistent, Some(1))
.map_ok(flume::Receiver::into_stream)
.try_flatten_stream();

Expand Down
36 changes: 32 additions & 4 deletions sqlx-sqlite/src/connection/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ enum Command {
arguments: Option<SqliteArguments<'static>>,
persistent: bool,
tx: flume::Sender<Result<Either<SqliteQueryResult, SqliteRow>, Error>>,
limit: Option<usize>,
},
Begin {
tx: rendezvous_oneshot::Sender<Result<(), Error>>,
Expand Down Expand Up @@ -136,6 +137,7 @@ impl ConnectionWorker {
arguments,
persistent,
tx,
limit
} => {
let iter = match execute::iter(&mut conn, &query, arguments, persistent)
{
Expand All @@ -146,10 +148,34 @@ impl ConnectionWorker {
}
};

for res in iter {
if tx.send(res).is_err() {
break;
}
match limit {
None => {
for res in iter {
if tx.send(res).is_err() {
break;
}
}
},
Some(limit) => {
let mut iter = iter;
let mut rows_returned = 0;

while let Some(res) = iter.next() {
if let Ok(ok) = &res {
if ok.is_right() {
rows_returned += 1;
if rows_returned >= limit {
drop(iter);
let _ = tx.send(res);
break;
}
}
}
if tx.send(res).is_err() {
break;
}
}
},
}

update_cached_statements_size(&conn, &shared.cached_statements_size);
Expand Down Expand Up @@ -284,6 +310,7 @@ impl ConnectionWorker {
args: Option<SqliteArguments<'_>>,
chan_size: usize,
persistent: bool,
limit: Option<usize>,
) -> Result<flume::Receiver<Result<Either<SqliteQueryResult, SqliteRow>, Error>>, Error> {
let (tx, rx) = flume::bounded(chan_size);

Expand All @@ -294,6 +321,7 @@ impl ConnectionWorker {
arguments: args.map(SqliteArguments::into_static),
persistent,
tx,
limit,
},
Span::current(),
))
Expand Down