Update dependencies

crates/httpret/Cargo.toml

@@ -10,20 +10,18 @@ path = "src/httpret.rs"
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-http = "0.2"
-url = "2.2"
-tokio = { version = "1.23.0", features = ["rt-multi-thread", "io-util", "net", "time", "sync", "fs"] }
+http = "0.2.9"
+url = "2.4.0"
 hyper = { version = "0.14", features = ["http1", "http2", "client", "server", "tcp", "stream"] }
-bytes = "1.3.0"
+bytes = "1.4.0"
 futures-util = "0.3.14"
 tracing = "0.1"
 tracing-futures = "0.2"
-async-channel = "1.8.0"
-itertools = "0.10.1"
+async-channel = "1.9.0"
+itertools = "0.11.0"
 chrono = "0.4.23"
-scylla = "0.8.1"
-md-5 = "0.10"
-regex = "1.7"
+md-5 = "0.10.5"
+regex = "1.9.3"
 err = { path = "../err" }
 netpod = { path = "../netpod" }
 query = { path = "../query" }

crates/httpret/src/api1.rs

@@ -60,6 +60,7 @@ use std::task::Context;
 use std::task::Poll;
 use std::time::Duration;
 use std::time::Instant;
+use taskrun::tokio;
 use tracing_futures::Instrument;
 use url::Url;
 

crates/httpret/src/api4/databuffer_tools.rs

@@ -23,6 +23,7 @@ use std::path::PathBuf;
 use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
+use taskrun::tokio;
 use url::Url;
 
 #[derive(Debug, ThisError)]

crates/httpret/src/api4/status.rs

@@ -13,6 +13,7 @@ use netpod::ServiceVersion;
 use netpod::TableSizes;
 use std::collections::VecDeque;
 use std::time::Duration;
+use taskrun::tokio;
 
 #[allow(unused)]
 async fn table_sizes(node_config: &NodeConfigCached) -> Result<TableSizes, Error> {

crates/httpret/src/channelconfig.rs

@@ -25,10 +25,7 @@ use netpod::APP_JSON;
 use nodenet::configquorum::find_config_basics_quorum;
 use query::api4::binned::BinnedQuery;
 use query::api4::events::PlainEventsQuery;
-use scylla::frame::response::cql_to_rust::FromRowError as ScyFromRowError;
-use scylla::transport::errors::NewSessionError as ScyNewSessionError;
-use scylla::transport::errors::QueryError as ScyQueryError;
-use scylla::transport::iterator::NextRowError;
+use scyllaconn::errconv::ErrConv;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::BTreeMap;
@@ -212,46 +209,6 @@ impl ChannelConfigQuorumHandler {
     }
 }
 
-trait ErrConv<T> {
-    fn err_conv(self) -> Result<T, Error>;
-}
-
-impl<T> ErrConv<T> for Result<T, ScyQueryError> {
-    fn err_conv(self) -> Result<T, Error> {
-        match self {
-            Ok(k) => Ok(k),
-            Err(e) => Err(Error::with_msg_no_trace(format!("{e:?}"))),
-        }
-    }
-}
-
-impl<T> ErrConv<T> for Result<T, ScyNewSessionError> {
-    fn err_conv(self) -> Result<T, Error> {
-        match self {
-            Ok(k) => Ok(k),
-            Err(e) => Err(Error::with_msg_no_trace(format!("{e:?}"))),
-        }
-    }
-}
-
-impl<T> ErrConv<T> for Result<T, ScyFromRowError> {
-    fn err_conv(self) -> Result<T, Error> {
-        match self {
-            Ok(k) => Ok(k),
-            Err(e) => Err(Error::with_msg_no_trace(format!("{e:?}"))),
-        }
-    }
-}
-
-impl<T> ErrConv<T> for Result<T, NextRowError> {
-    fn err_conv(self) -> Result<T, Error> {
-        match self {
-            Ok(k) => Ok(k),
-            Err(e) => Err(Error::with_msg_no_trace(format!("{e:?}"))),
-        }
-    }
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ConfigsHisto {
     scalar_types: Vec<(ScalarType, Vec<(Shape, u32)>)>,
@@ -937,7 +894,7 @@ impl GenerateScyllaTestData {
             .err_conv()?;
         let mut it = it.into_typed::<(i64,)>();
         while let Some(row) = it.next().await {
-            let row = row.err_conv()?;
+            let row = row.map_err(|e| Error::with_msg_no_trace(e.to_string()))?;
             let values = (series as i64, row.0);
             scy.query("delete from events_scalar_f64 where series = ? and ts_msp = ?", values)
                 .await

crates/httpret/src/download.rs

@@ -11,6 +11,7 @@ use netpod::log::*;
 use netpod::DiskIoTune;
 use netpod::FromUrl;
 use netpod::NodeConfigCached;
+use taskrun::tokio;
 use url::Url;
 
 #[derive(Clone, Debug)]

crates/httpret/src/err.rs

@@ -1,6 +1,7 @@
 use serde::Deserialize;
 use serde::Serialize;
 use std::fmt;
+use taskrun::tokio;
 
 #[derive(Serialize, Deserialize)]
 pub struct Error(pub err::Error);

crates/httpret/src/gather.rs

@@ -18,6 +18,7 @@ use serde_json::Value as JsonValue;
 use std::future::Future;
 use std::pin::Pin;
 use std::time::Duration;
+use taskrun::tokio;
 use tokio::time::sleep;
 use url::Url;
 

crates/httpret/src/httpret.rs

@@ -55,6 +55,7 @@ use std::task;
 use std::time::SystemTime;
 use task::Context;
 use task::Poll;
+use taskrun::tokio;
 
 pub const PSI_DAQBUFFER_SERVICE_MARK: &'static str = "PSI-Daqbuffer-Service-Mark";
 pub const PSI_DAQBUFFER_SEEN_URL: &'static str = "PSI-Daqbuffer-Seen-Url";

crates/httpret/src/proxy.rs

@@ -51,6 +51,7 @@ use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
 use std::time::Duration;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::io::AsyncRead;
 use tokio::io::ReadBuf;

crates/httpret/src/pulsemap.rs

@@ -24,6 +24,7 @@ use netpod::HasBackend;
 use netpod::HasTimeout;
 use netpod::NodeConfigCached;
 use netpod::DATETIME_FMT_9MS;
+use scyllaconn::scylla;
 use serde::Deserialize;
 use serde::Serialize;
 use std::collections::BTreeMap;
@@ -41,6 +42,7 @@ use std::task::Poll;
 use std::time::Duration;
 use std::time::Instant;
 use std::time::SystemTime;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 use tokio::io::AsyncSeekExt;