Skip to content

feat(client): support AllowDirect responses in cursor_prep_exec #5

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

Open
Tawxyn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(client): support AllowDirect responses in cursor_prep_exec #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 16 additions & 6 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ pub use cancellation::CancellationToken;
pub use config::*;
pub(crate) use connection::*;
pub use cursor::{
Cursor, CursorConcurrencyOptions, CursorHandle, CursorOpenOptions, CursorScrollOptions, Fetch,
PreparedCursor,
Cursor, CursorConcurrencyOptions, CursorHandle, CursorOpenOptions, CursorPrepExecOutcome,
CursorScrollOptions, DirectResultSet, DirectResults, Fetch, PreparedCursor,
};
pub use prepared::{PreparedHandle, PreparedStatement};
pub use rpc_response::OutputValue;
Expand Down Expand Up @@ -541,21 +541,31 @@ impl<S: AsyncRead + AsyncWrite + Unpin + Send> Client<S> {
///
/// `param_defs` follows the same format as [`prepare`](Self::prepare);
/// pass an empty string when the statement has no parameters.
///
/// The return value is a [`CursorPrepExecOutcome`]: usually the server
/// opens a cursor ([`Cursor`](CursorPrepExecOutcome::Cursor)), but when the
/// statement is opened read-only with
/// [`CursorConcurrencyOptions::AllowDirect`] the server may take the
/// *AllowDirect* fast path — preparing the statement but skipping the
/// cursor and streaming the result sets inline
/// ([`Direct`](CursorPrepExecOutcome::Direct)). Either way the prepared
/// handle must be released (via [`PreparedCursor::unprepare`] or
/// [`DirectResults::unprepare`]).
pub async fn cursor_prep_exec<'a>(
&mut self,
sql: impl Into<Cow<'a, str>>,
options: cursor::CursorOpenOptions,
param_defs: impl Into<Cow<'a, str>>,
params: &[&'a dyn ToSql],
) -> crate::Result<PreparedCursor> {
) -> crate::Result<CursorPrepExecOutcome> {
self.connection.flush_stream().await?;
let rpc_params =
cursor::build_cursorprepexec_params(sql.into(), options, param_defs.into(), params);
self.send_rpc(RpcProcId::CursorPrepExec, rpc_params).await?;

let (outputs, _status, metadata) =
rpc_response::collect_rpc_outputs_with_metadata(&mut self.connection).await?;
cursor::prepared_cursor_from_outputs(&outputs, metadata)
let (result_sets, outputs, _status) =
rpc_response::collect_rpc_result_sets(&mut self.connection).await?;
cursor::cursor_prep_exec_outcome(&outputs, result_sets)
}

/// Prepare and execute a SQL statement in a single round trip. Returns
Expand Down
Loading