Update deps, wip on bin read index

crates/httpret/src/api4.rs

@@ -1,6 +1,7 @@
 pub mod accounting;
 pub mod backend;
 pub mod binned;
+pub mod binned_v2;
 pub mod binwriteindex;
 pub mod databuffer_tools;
 pub mod docs;

crates/httpret/src/api4/binned_v2.rs

@@ -0,0 +1,302 @@
+use crate::bodystream::response;
+use crate::channelconfig::ch_conf_from_binned;
+use crate::requests::accepts_cbor_framed;
+use crate::requests::accepts_json_framed;
+use crate::requests::accepts_json_or_all;
+use crate::requests::accepts_octets;
+use crate::ServiceSharedResources;
+use daqbuf_err as err;
+use dbconn::worker::PgQueue;
+use futures_util::StreamExt;
+use futures_util::TryStreamExt;
+use http::header::CONTENT_TYPE;
+use http::request::Parts;
+use http::Method;
+use http::StatusCode;
+use httpclient::bad_request_response;
+use httpclient::body_empty;
+use httpclient::body_stream;
+use httpclient::error_response;
+use httpclient::error_status_response;
+use httpclient::not_found_response;
+use httpclient::IntoBody;
+use httpclient::Requ;
+use httpclient::StreamResponse;
+use httpclient::ToJsonBody;
+use netpod::log;
+use netpod::req_uri_to_url;
+use netpod::timeunits::SEC;
+use netpod::ttl::RetentionTime;
+use netpod::ChannelTypeConfigGen;
+use netpod::FromUrl;
+use netpod::NodeConfigCached;
+use netpod::ReqCtx;
+use netpod::APP_CBOR_FRAMED;
+use netpod::APP_JSON;
+use netpod::APP_JSON_FRAMED;
+use netpod::HEADER_NAME_REQUEST_ID;
+use nodenet::client::OpenBoxedBytesViaHttp;
+use nodenet::scylla::ScyllaEventReadProvider;
+use query::api4::binned::BinWriteIndexQuery;
+use query::api4::binned::BinnedQuery;
+use scyllaconn::worker::ScyllaQueue;
+use series::msp::PrebinnedPartitioning;
+use series::SeriesId;
+use std::pin::Pin;
+use std::sync::Arc;
+use streams::eventsplainreader::DummyCacheReadProvider;
+use streams::eventsplainreader::SfDatabufferEventReadProvider;
+use streams::streamtimeout::StreamTimeout2;
+use streams::timebin::cached::reader::EventsReadProvider;
+use streams::timebin::CacheReadProvider;
+use tracing::Instrument;
+use tracing::Span;
+use url::Url;
+
+macro_rules! error { ($($arg:expr),*) => ( if true { log::error!($($arg),*); } ); }
+macro_rules! info { ($($arg:expr),*) => ( if true { log::info!($($arg),*); } ); }
+macro_rules! debug { ($($arg:expr),*) => ( if true { log::debug!($($arg),*); } ); }
+macro_rules! trace { ($($arg:expr),*) => ( if true { log::trace!($($arg),*); } ); }
+
+autoerr::create_error_v1!(
+    name(Error, "Api4BinnedV2"),
+    enum variants {
+        ChannelNotFound,
+        BadQuery(String),
+        HttpLib(#[from] http::Error),
+        ChannelConfig(crate::channelconfig::Error),
+        Retrieval(#[from] crate::RetrievalError),
+        EventsCbor(#[from] streams::plaineventscbor::Error),
+        EventsJson(#[from] streams::plaineventsjson::Error),
+        ServerError,
+        BinnedStream(err::Error),
+        TimebinnedJson(#[from] streams::timebinnedjson::Error),
+        ReadAllCoarse(#[from] scyllaconn::binwriteindex::read_all_coarse::Error),
+    },
+);
+
+impl From<crate::channelconfig::Error> for Error {
+    fn from(value: crate::channelconfig::Error) -> Self {
+        use crate::channelconfig::Error::*;
+        match value {
+            NotFound(_) => Self::ChannelNotFound,
+            _ => Self::ChannelConfig(value),
+        }
+    }
+}
+
+impl From<Error> for crate::RetrievalError {
+    fn from(value: Error) -> Self {
+        crate::RetrievalError::TextError(value.to_string())
+    }
+}
+
+pub struct BinnedV2Handler {}
+
+impl BinnedV2Handler {
+    pub fn handler(req: &Requ) -> Option<Self> {
+        if req.uri().path() == "/api/4/private/binnedv2" {
+            Some(Self {})
+        } else {
+            None
+        }
+    }
+
+    pub async fn handle(
+        &self,
+        req: Requ,
+        ctx: &ReqCtx,
+        shared_res: &ServiceSharedResources,
+        ncc: &NodeConfigCached,
+    ) -> Result<StreamResponse, Error> {
+        if req.method() != Method::GET {
+            return Ok(response(StatusCode::METHOD_NOT_ALLOWED).body(body_empty())?);
+        }
+        match handle_request(req, ctx, &shared_res.pgqueue, shared_res.scyqueue.clone(), ncc).await {
+            Ok(ret) => Ok(ret),
+            Err(e) => match e {
+                Error::ChannelNotFound => {
+                    let res = not_found_response("channel not found".into(), ctx.reqid());
+                    Ok(res)
+                }
+                Error::BadQuery(msg) => {
+                    let res = bad_request_response(msg, ctx.reqid());
+                    Ok(res)
+                }
+                _ => {
+                    error!("EventsHandler sees: {}", e);
+                    Ok(error_response(e.to_string(), ctx.reqid()))
+                }
+            },
+        }
+    }
+}
+
+async fn handle_request(
+    req: Requ,
+    ctx: &ReqCtx,
+    pgqueue: &PgQueue,
+    scyqueue: Option<ScyllaQueue>,
+    ncc: &NodeConfigCached,
+) -> Result<StreamResponse, Error> {
+    let url = req_uri_to_url(req.uri()).map_err(|e| Error::BadQuery(e.to_string()))?;
+    if req
+        .uri()
+        .path_and_query()
+        .map_or(false, |x| x.as_str().contains("DOERR"))
+    {
+        Err(Error::ServerError)?;
+    }
+    let reqid = ctx.reqid();
+    let (head, _body) = req.into_parts();
+    let query = BinnedQuery::from_url(&url).map_err(|e| {
+        error!("handle_request: {}", e);
+        Error::BadQuery(e.to_string())
+    })?;
+    info!("{:?}", query);
+    let logspan = if query.log_level() == "trace" {
+        trace!("enable trace for handler");
+        tracing::span!(tracing::Level::INFO, "log_span_trace")
+    } else if query.log_level() == "debug" {
+        debug!("enable debug for handler");
+        tracing::span!(tracing::Level::INFO, "log_span_debug")
+    } else {
+        tracing::Span::none()
+    };
+    let span1 = tracing::span!(
+        tracing::Level::INFO,
+        "binwriteindex",
+        reqid,
+        beg = query.range().beg_u64() / SEC,
+        end = query.range().end_u64() / SEC,
+        ch = query.channel().name(),
+    );
+    span1.in_scope(|| {
+        debug!("binned begin  {:?}", query);
+    });
+    binned_instrumented(head, ctx, url, query, pgqueue, scyqueue, ncc, logspan.clone())
+        .instrument(logspan)
+        .instrument(span1)
+        .await
+}
+
+async fn binned_instrumented(
+    head: Parts,
+    ctx: &ReqCtx,
+    url: Url,
+    query: BinnedQuery,
+    pgqueue: &PgQueue,
+    scyqueue: Option<ScyllaQueue>,
+    ncc: &NodeConfigCached,
+    logspan: Span,
+) -> Result<StreamResponse, Error> {
+    let res2 = HandleRes2::new(ctx, logspan, url, query.clone(), pgqueue, scyqueue, ncc).await?;
+    if accepts_json_framed(&head.headers) {
+        Ok(binned_json_framed(res2, ctx, ncc).await?)
+    } else {
+        let ret = error_response(format!("unsupported accept: {:?}", &head.headers), ctx.reqid());
+        Ok(ret)
+    }
+}
+
+fn make_read_provider(
+    chname: &str,
+    scyqueue: Option<ScyllaQueue>,
+    open_bytes: Pin<Arc<OpenBoxedBytesViaHttp>>,
+    ctx: &ReqCtx,
+    ncc: &NodeConfigCached,
+) -> (Arc<dyn EventsReadProvider>, Arc<dyn CacheReadProvider>) {
+    let events_read_provider = if chname.starts_with("unittest") {
+        let x = streams::teststream::UnitTestStream::new();
+        Arc::new(x)
+    } else if ncc.node_config.cluster.scylla_lt().is_some() {
+        scyqueue
+            .clone()
+            .map(|qu| ScyllaEventReadProvider::new(qu))
+            .map(|x| Arc::new(x) as Arc<dyn EventsReadProvider>)
+            .expect("scylla queue")
+    } else if ncc.node.sf_databuffer.is_some() {
+        // TODO do not clone the request. Pass an Arc up to here.
+        let x = SfDatabufferEventReadProvider::new(Arc::new(ctx.clone()), open_bytes);
+        Arc::new(x)
+    } else {
+        panic!("unexpected backend")
+    };
+    let cache_read_provider = if ncc.node_config.cluster.scylla_lt().is_some() {
+        scyqueue
+            .clone()
+            .map(|qu| scyllaconn::bincache::ScyllaPrebinnedReadProvider::new(qu))
+            .map(|x| Arc::new(x) as Arc<dyn CacheReadProvider>)
+            .expect("scylla queue")
+    } else if ncc.node.sf_databuffer.is_some() {
+        let x = DummyCacheReadProvider::new();
+        Arc::new(x)
+    } else {
+        panic!("unexpected backend")
+    };
+    (events_read_provider, cache_read_provider)
+}
+
+async fn binned_json_framed(
+    res2: HandleRes2<'_>,
+    ctx: &ReqCtx,
+    _ncc: &NodeConfigCached,
+) -> Result<StreamResponse, Error> {
+    let series = SeriesId::new(res2.ch_conf.series().unwrap());
+    let range = res2.query.range().to_time().unwrap();
+    let scyqueue = res2.scyqueue.as_ref().unwrap();
+    let res = scyllaconn::binwriteindex::read_all_coarse::read_all_coarse(series, range, scyqueue).await?;
+    let mut strings = Vec::new();
+    for e in res {
+        strings.push(format!("{:?}", e));
+    }
+    let ret = response(StatusCode::OK)
+        .header(CONTENT_TYPE, APP_JSON)
+        .header(HEADER_NAME_REQUEST_ID, ctx.reqid())
+        .body(ToJsonBody::from(&strings).into_body())?;
+    Ok(ret)
+}
+
+struct HandleRes2<'a> {
+    logspan: Span,
+    url: Url,
+    query: BinnedQuery,
+    ch_conf: ChannelTypeConfigGen,
+    events_read_provider: Arc<dyn EventsReadProvider>,
+    cache_read_provider: Arc<dyn CacheReadProvider>,
+    timeout_provider: Box<dyn StreamTimeout2>,
+    pgqueue: &'a PgQueue,
+    scyqueue: Option<ScyllaQueue>,
+}
+
+impl<'a> HandleRes2<'a> {
+    async fn new(
+        ctx: &ReqCtx,
+        logspan: Span,
+        url: Url,
+        query: BinnedQuery,
+        pgqueue: &'a PgQueue,
+        scyqueue: Option<ScyllaQueue>,
+        ncc: &NodeConfigCached,
+    ) -> Result<Self, Error> {
+        let ch_conf = ch_conf_from_binned(&query, ctx, pgqueue, ncc)
+            .await?
+            .ok_or_else(|| Error::ChannelNotFound)?;
+        let open_bytes = Arc::pin(OpenBoxedBytesViaHttp::new(ncc.node_config.cluster.clone()));
+        let (events_read_provider, cache_read_provider) =
+            make_read_provider(ch_conf.name(), scyqueue.clone(), open_bytes, ctx, ncc);
+        let timeout_provider = streamio::streamtimeout::StreamTimeout::boxed();
+        let ret = Self {
+            logspan,
+            url,
+            query,
+            ch_conf,
+            events_read_provider,
+            cache_read_provider,
+            timeout_provider,
+            pgqueue,
+            scyqueue,
+        };
+        Ok(ret)
+    }
+}

crates/httpret/src/channelconfig.rs

@@ -68,6 +68,7 @@ autoerr::create_error_v1!(
         Async(#[from] netpod::AsyncChannelError),
         ChannelConfig(#[from] dbconn::channelconfig::Error),
         Netpod(#[from] netpod::Error),
+        ScyllaConn(#[from] scyllaconn::conn::Error),
         ScyllaExecution(#[from] scyllaconn::scylla::errors::ExecutionError),
         ScyllaPagerExecution(#[from] scyllaconn::scylla::errors::PagerExecutionError),
         ScyllanextRow(#[from] scyllaconn::scylla::errors::NextRowError),
@@ -484,9 +485,7 @@ impl ScyllaChannelsActive {
             .cluster
             .scylla_st()
             .ok_or_else(|| Error::ExpectScyllaBackend)?;
-        let scy = scyllaconn::conn::create_scy_session(scyco)
-            .await
-            .map_err(other_err_error)?;
+        let scy = scyllaconn::conn::create_scy_session(scyco).await?;
         // Database stores tsedge/ts_msp in units of (10 sec), and we additionally map to the grid.
         let tsedge = q.tsedge / 10 / (6 * 2) * (6 * 2);
         info!(
@@ -875,9 +874,7 @@ impl GenerateScyllaTestData {
 
     async fn process(&self, node_config: &NodeConfigCached) -> Result<(), Error> {
         let scyconf = node_config.node_config.cluster.scylla_st().unwrap();
-        let scy = scyllaconn::conn::create_scy_session(scyconf)
-            .await
-            .map_err(other_err_error)?;
+        let scy = scyllaconn::conn::create_scy_session(scyconf).await?;
         let series: u64 = 42001;
         // TODO query `ts_msp` for all MSP values und use that to delete from event table first.
         // Only later delete also from the `ts_msp` table.

crates/httpret/src/err.rs

@@ -115,3 +115,4 @@ impl Convable for query::api4::Error {}
 impl Convable for query::api4::events::Error {}
 impl Convable for netpod::Error {}
 impl Convable for crate::http3::Error {}
+impl Convable for scyllaconn::conn::Error {}

crates/httpret/src/httpret.rs

@@ -381,6 +381,8 @@ async fn http_service_inner(
         }
     } else if let Some(h) = api4::binwriteindex::BinWriteIndexHandler::handler(&req) {
         Ok(h.handle(req, ctx, &shared_res, &node_config).await?)
+    } else if let Some(h) = api4::binned_v2::BinnedV2Handler::handler(&req) {
+        Ok(h.handle(req, ctx, &shared_res, &node_config).await?)
     } else if let Some(h) = api4::eventdata::EventDataHandler::handler(&req) {
         Ok(h.handle(req, ctx, &node_config, shared_res)
             .await