daqbuf/daqbuffer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update scylla dependency

Browse Source
This commit is contained in:
Dominik Werder
2025-05-07 14:50:50 +02:00
parent 93c759f11f
commit 7243fff317
19 changed files with 445 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/httpret/src/channelconfig.rs
View File

@@ -68,7 +68,9 @@ autoerr::create_error_v1!(
Async(#[from] netpod::AsyncChannelError),
ChannelConfig(#[from] dbconn::channelconfig::Error),
Netpod(#[from] netpod::Error),
ScyllaQuery(#[from] scyllaconn::scylla::transport::errors::QueryError),
ScyllaExecution(#[from] scyllaconn::scylla::errors::ExecutionError),
ScyllaPagerExecution(#[from] scyllaconn::scylla::errors::PagerExecutionError),
ScyllanextRow(#[from] scyllaconn::scylla::errors::NextRowError),
ScyllaTypeCheck(#[from] scyllaconn::scylla::deserialize::TypeCheckError),
},
);

20
crates/httpret/src/pulsemap.rs
View File

@@ -894,13 +894,7 @@ pub trait ErrConv<T> {
fn err_conv(self) -> Result<T, daqbuf_err::Error>;
}
impl<T> ErrConv<T> for Result<T, scylla::transport::errors::NewSessionError> {
fn err_conv(self) -> Result<T, daqbuf_err::Error> {
self.map_err(|e| daqbuf_err::Error::with_msg_no_trace(format!("{e:?}")))
}
}
impl<T> ErrConv<T> for Result<T, scylla::transport::errors::QueryError> {
impl<T> ErrConv<T> for Result<T, scylla::errors::NewSessionError> {
fn err_conv(self) -> Result<T, daqbuf_err::Error> {
self.map_err(|e| daqbuf_err::Error::with_msg_no_trace(format!("{e:?}")))
}
@@ -912,6 +906,18 @@ impl<T> ErrConv<T> for Result<T, scylla::deserialize::TypeCheckError> {
}
}
impl<T> ErrConv<T> for Result<T, scylla::errors::PagerExecutionError> {
fn err_conv(self) -> Result<T, daqbuf_err::Error> {
self.map_err(|e| daqbuf_err::Error::with_msg_no_trace(format!("{e:?}")))
}
}
impl<T> ErrConv<T> for Result<T, scylla::errors::NextRowError> {
fn err_conv(self) -> Result<T, daqbuf_err::Error> {
self.map_err(|e| daqbuf_err::Error::with_msg_no_trace(format!("{e:?}")))
}
}
pub struct MapPulseScyllaHandler {}
impl MapPulseScyllaHandler {