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

8
crates/httpret/Cargo.toml
View File

@@ -15,8 +15,8 @@ http = "1.2.0"
http-body-util = { version = "0.1.2" }
hyper = { version = "1.6.0", features = ["http1", "http2", "client", "server"] }
hyper-util = { version = "0.1.10", features = ["http1", "http2", "client", "server"] }
h3 = { version = "0.0.6", optional = true }
h3-quinn = { version = "0.0.7", optional = true }
h3 = { version = "0.0.8", optional = true }
h3-quinn = { version = "0.0.10", optional = true }
quinn = { version = "0.11.6", optional = true, default-features = false, features = ["log", "platform-verifier", "runtime-tokio", "rustls-ring"] }
rustls = { version = "0.23.22", optional = true, default-features = false, features = ["logging", "std", "ring"] }
rustls-pki-types = { version = "1.11.0", optional = true }
@@ -26,7 +26,7 @@ futures-util = "0.3.31"
tracing = "0.1"
tracing-futures = "0.2"
async-channel = "2.3.1"
itertools = "0.13.0"
itertools = "0.14.0"
time = "0.3.37"
chrono = "0.4.39"
md-5 = "0.10.6"
@@ -34,7 +34,7 @@ regex = "1.11.1"
rand = "0.9.0"
ciborium = "0.2.2"
flate2 = "1"
brotli = "7.0.0"
brotli = "8.0.1"
autoerr = "0.0.3"
daqbuf-err = { path = "../../../daqbuf-err" }
netpod = { path = "../../../daqbuf-netpod", package = "daqbuf-netpod" }

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 {