diff --git a/crates/scyllaconn/Cargo.toml b/crates/scyllaconn/Cargo.toml index a442fdf..0a1953e 100644 --- a/crates/scyllaconn/Cargo.toml +++ b/crates/scyllaconn/Cargo.toml @@ -12,6 +12,7 @@ futures-util = "0.3.24" pin-project = "1" async-channel = "2.3.1" scylla = "0.15.0" +autoerr = "0.0.3" daqbuf-err = { path = "../../../daqbuf-err" } netpod = { path = "../../../daqbuf-netpod", package = "daqbuf-netpod" } query = { path = "../../../daqbuf-query", package = "daqbuf-query" } diff --git a/crates/scyllaconn/src/accounting/toplist.rs b/crates/scyllaconn/src/accounting/toplist.rs index a98a875..66ab645 100644 --- a/crates/scyllaconn/src/accounting/toplist.rs +++ b/crates/scyllaconn/src/accounting/toplist.rs @@ -1,23 +1,23 @@ +use crate::log::*; use daqbuf_err as err; use err::thiserror; use err::ThisError; -use futures_util::StreamExt; use futures_util::TryStreamExt; -use netpod::log::*; use netpod::ttl::RetentionTime; use netpod::TsMs; use netpod::EMIT_ACCOUNTING_SNAP; use scylla::prepared_statement::PreparedStatement; use scylla::Session as ScySession; -#[derive(Debug, ThisError)] -#[cstm(name = "AccountingToplist")] -pub enum Error { - ScyllaQuery(#[from] scylla::transport::errors::QueryError), - ScyllaNextRow(#[from] scylla::transport::iterator::NextRowError), - ScyllaTypeCheck(#[from] scylla::deserialize::TypeCheckError), - UsageDataMalformed, -} +autoerr::create_error_v1!( + name(Error, "AccountingToplist"), + enum variants { + ScyllaQuery(#[from] scylla::transport::errors::QueryError), + ScyllaNextRow(#[from] scylla::transport::iterator::NextRowError), + ScyllaTypeCheck(#[from] scylla::deserialize::TypeCheckError), + UsageDataMalformed, + }, +); #[derive(Debug)] pub struct UsageData { @@ -103,6 +103,7 @@ pub async fn read_ts(ks: &str, rt: RetentionTime, ts: TsMs, scy: &ScySession) -> } async fn read_ts_inner(ks: &str, rt: RetentionTime, ts: TsMs, scy: &ScySession) -> Result { + trace!("read_ts_inner"); type RowType = (i64, i64, i64); let cql = format!( concat!( diff --git a/crates/scyllaconn/src/scyllaconn.rs b/crates/scyllaconn/src/scyllaconn.rs index 0a07fc3..5da9244 100644 --- a/crates/scyllaconn/src/scyllaconn.rs +++ b/crates/scyllaconn/src/scyllaconn.rs @@ -12,6 +12,10 @@ pub mod worker; pub use daqbuf_series::SeriesId; pub use scylla; +mod log { + pub use netpod::log::*; +} + pub async fn test_log() { use netpod::log::*; error!("------");