Update dependencies

crates/commonio/Cargo.toml

@@ -8,17 +8,14 @@ edition = "2021"
 path = "src/commonio.rs"
 
 [dependencies]
-tokio = { version = "1.21.1", features = ["io-util", "net", "time", "fs"] }
 tracing = "0.1"
-futures-core = "0.3.15"
 futures-util = "0.3.15"
 bytes = "1"
 serde = { version = "1", features = ["derive"] }
-serde_derive = "1"
 serde_json = "1"
 chrono = "0.4"
-async-channel = "1.8.0"
-parking_lot = "0.11"
+async-channel = "1.9.0"
+parking_lot = "0.12"
 crc32fast = "1.2"
 err = { path = "../err" }
 taskrun = { path = "../taskrun" }

crates/commonio/src/commonio.rs

@@ -24,6 +24,7 @@ use std::path::PathBuf;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 use std::time::Instant;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::fs::OpenOptions;
 use tokio::io::AsyncReadExt;

crates/commonio/src/ringbuf.rs

@@ -1,8 +1,12 @@
-use crate::{read, seek, StatsChannel};
+use crate::read;
+use crate::seek;
+use crate::StatsChannel;
 use err::Error;
 use netpod::log::*;
+use std::borrow::BorrowMut;
 use std::fmt;
-use std::{borrow::BorrowMut, io::SeekFrom};
+use std::io::SeekFrom;
+use taskrun::tokio;
 use tokio::fs::File;
 
 pub struct RingBuf<F> {

crates/dbconn/Cargo.toml

@@ -10,17 +10,14 @@ path = "src/dbconn.rs"
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.23.0", features = ["time"] }
-tokio-postgres = { version = "0.7.7", features = ["with-chrono-0_4", "with-serde_json-1"] }
-tracing = "0.1.37"
+tokio-postgres = { version = "0.7.9", features = ["with-chrono-0_4", "with-serde_json-1"] }
 crc32fast = "1.3.2"
 byteorder = "1.4"
 futures-util = "0.3.25"
-bytes = "1.3"
+bytes = "1.4.0"
 pin-project = "1"
 #dashmap = "3"
-scylla = "0.8.1"
-async-channel = "1.8.0"
+async-channel = "1.9.0"
 chrono = "0.4"
 regex = "1.7.0"
 err = { path = "../err" }

crates/dbconn/src/dbconn.rs

@@ -4,7 +4,9 @@ pub mod scan;
 pub mod search;
 
 pub mod pg {
-    pub use tokio_postgres::{Client, Error, NoTls};
+    pub use tokio_postgres::Client;
+    pub use tokio_postgres::Error;
+    pub use tokio_postgres::NoTls;
 }
 
 use err::anyhow;
@@ -13,13 +15,18 @@ use err::Error;
 use err::Res2;
 use err::ThisError;
 use netpod::log::*;
+use netpod::Database;
+use netpod::NodeConfigCached;
+use netpod::ScalarType;
+use netpod::SfDbChannel;
+use netpod::Shape;
 use netpod::TableSizes;
-use netpod::{Database, NodeConfigCached, SfDbChannel};
-use netpod::{ScalarType, Shape};
-use pg::{Client as PgClient, NoTls};
+use pg::Client as PgClient;
+use pg::NoTls;
 use serde::Serialize;
 use std::sync::Arc;
 use std::time::Duration;
+use taskrun::tokio;
 
 trait ErrConv<T> {
     fn err_conv(self) -> Result<T, Error>;

crates/dbconn/src/scan.rs

@@ -25,6 +25,7 @@ use std::sync::Arc;
 use std::sync::RwLock;
 use std::task::Context;
 use std::task::Poll;
+use taskrun::tokio;
 use tokio::fs::DirEntry;
 use tokio::fs::ReadDir;
 use tokio_postgres::Client;

crates/disk/Cargo.toml

@@ -13,25 +13,24 @@ serde_json = "1.0"
 serde_cbor = "0.11.1"
 http = "0.2"
 chrono = { version = "0.4.19", features = ["serde"] }
-tokio = { version = "1.21.2", features = ["rt-multi-thread", "io-util", "net", "time", "sync", "fs"] }
 tokio-stream = {version = "0.1.5", features = ["fs"]}
 hyper = { version = "0.14", features = ["http1", "http2", "client", "server", "tcp", "stream"] }
-async-channel = "1.8.0"
+async-channel = "1.9.0"
 crossbeam = "0.8"
-bytes = "1.0.1"
+bytes = "1.4.0"
 crc32fast = "1.3.2"
 arrayref = "0.3.6"
 byteorder = "1.4.3"
 futures-util = "0.3.14"
 async-stream = "0.3.0"
 tracing = "0.1.25"
-tracing-futures = { version = "0.2.5", features = ["futures-01", "futures-03", "std-future"] }
+tracing-futures = { version = "0.2.5", features = ["futures-03", "std-future"] }
 fs2 = "0.4.3"
 libc = "0.2.93"
 hex = "0.4.3"
 num-traits = "0.2.14"
-num-derive = "0.3"
-url = "2.2.2"
+num-derive = "0.4.0"
+url = "2.4.0"
 tiny-keccak = { version = "2.0", features = ["sha3"] }
 err = { path = "../err" }
 taskrun = { path = "../taskrun" }

crates/disk/src/cache.rs

@@ -14,6 +14,7 @@ use std::io;
 use std::path::PathBuf;
 use std::time::Duration;
 use std::time::Instant;
+use taskrun::tokio;
 use tiny_keccak::Hasher;
 
 // For file-based caching, this determined the node where the cache file is located.

crates/disk/src/dataopen.rs

@@ -12,6 +12,7 @@ use netpod::TsNano;
 use std::fmt;
 use std::path::PathBuf;
 use std::time::Instant;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::fs::OpenOptions;
 use tokio::io::AsyncReadExt;

crates/disk/src/disk.rs

@@ -54,6 +54,7 @@ use streams::dtflags::BIG_ENDIAN;
 use streams::dtflags::COMPRESSION;
 use streams::dtflags::SHAPE;
 use streams::filechunkread::FileChunkRead;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::fs::OpenOptions;
 use tokio::io::AsyncRead;

crates/disk/src/gen.rs

@@ -17,6 +17,7 @@ use netpod::Shape;
 use netpod::TsNano;
 use std::path::Path;
 use std::path::PathBuf;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::fs::OpenOptions;
 use tokio::io::AsyncWriteExt;

crates/disk/src/index.rs

@@ -4,6 +4,7 @@ use netpod::log::*;
 use netpod::range::evrange::NanoRange;
 use netpod::TsNano;
 use std::mem::size_of;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 use tokio::io::AsyncSeekExt;

crates/disk/src/paths.rs

@@ -6,6 +6,7 @@ use netpod::Node;
 use netpod::SfChFetchInfo;
 use netpod::TsNano;
 use std::path::PathBuf;
+use taskrun::tokio;
 
 pub fn datapath_for_keyspace(ks: u32, node: &Node) -> PathBuf {
     node.sf_databuffer

crates/disk/src/raw/generated.rs

@@ -16,6 +16,7 @@ use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
 use std::time::Duration;
+use taskrun::tokio;
 
 pub trait TypedGenerator {
     type RustScalar;

crates/disk/src/read3.rs

@@ -5,6 +5,7 @@ use std::os::unix::prelude::RawFd;
 use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
 use std::sync::Once;
 use std::time::{Duration, Instant};
+use taskrun::tokio;
 use tokio::sync::{mpsc, oneshot};
 
 const DO_TRACE: bool = false;

crates/disk/src/read4.rs

@@ -2,9 +2,13 @@ use bytes::BytesMut;
 use err::Error;
 use netpod::log::*;
 use std::os::unix::prelude::RawFd;
-use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
+use std::sync::atomic::AtomicPtr;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
 use std::sync::Once;
-use std::time::{Duration, Instant};
+use std::time::Duration;
+use std::time::Instant;
+use taskrun::tokio;
 use tokio::sync::mpsc;
 
 static READ4: AtomicPtr<Read4> = AtomicPtr::new(std::ptr::null_mut());

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;

crates/nodenet/Cargo.toml

@@ -9,18 +9,14 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_cbor = "0.11.1"
 chrono = { version = "0.4.19", features = ["serde"] }
-tokio = { version = "1.21.2", features = ["io-util", "net", "time", "sync"] }
-#tokio-stream = {version = "0.1.5", features = ["fs"]}
-async-channel = "1.8.0"
-bytes = "1.0.1"
+async-channel = "1.9.0"
+bytes = "1.4.0"
 crc32fast = "1.2.1"
 arrayref = "0.3.6"
 byteorder = "1.4.3"
 futures-util = "0.3.14"
 tracing = "0.1.25"
 hex = "0.4.3"
-scylla = "0.8.1"
-tokio-postgres = "0.7.7"
 err = { path = "../err" }
 netpod = { path = "../netpod" }
 query = { path = "../query" }

crates/nodenet/src/configquorum.rs

@@ -12,6 +12,7 @@ use netpod::SfChFetchInfo;
 use netpod::SfDbChannel;
 use std::collections::BTreeMap;
 use std::time::Duration;
+use taskrun::tokio;
 
 fn decide_sf_ch_config_quorum(inp: Vec<ChannelConfigResponse>) -> Result<Option<ChannelTypeConfigGen>, Error> {
     let mut histo = BTreeMap::new();

crates/nodenet/src/conn.rs

@@ -33,6 +33,7 @@ use streams::generators::GenerateF64V00;
 use streams::generators::GenerateI32V00;
 use streams::generators::GenerateI32V01;
 use streams::transform::build_event_transform;
+use taskrun::tokio;
 use tokio::io::AsyncWriteExt;
 use tokio::net::tcp::OwnedWriteHalf;
 use tokio::net::TcpStream;

crates/nodenet/src/conn/test.rs

@@ -34,6 +34,7 @@ use query::api4::events::EventsSubQuerySettings;
 use query::transform::TransformQuery;
 use streams::frames::inmem::InMemoryFrameStream;
 use streams::frames::inmem::TcpReadAsBytes;
+use taskrun::tokio;
 use tokio::io::AsyncWriteExt;
 use tokio::net::TcpListener;
 use tokio::net::TcpStream;

crates/nodenet/src/scylla.rs

@@ -11,6 +11,7 @@ use netpod::NodeConfigCached;
 use netpod::ScyllaConfig;
 use query::api4::events::EventsSubQuery;
 use std::pin::Pin;
+use taskrun::tokio;
 
 pub async fn scylla_channel_event_stream(
     evq: EventsSubQuery,

crates/scyllaconn/Cargo.toml

@@ -10,7 +10,7 @@ path = "src/scyllaconn.rs"
 [dependencies]
 futures-util = "0.3.24"
 async-channel = "1.9.0"
-scylla = "0.8.2"
+scylla = "0.9.0"
 err = { path = "../err" }
 netpod = { path = "../netpod" }
 query = { path = "../query" }

crates/scyllaconn/src/scyllaconn.rs

@@ -3,6 +3,8 @@ pub mod errconv;
 pub mod events;
 pub mod status;
 
+pub use scylla;
+
 use err::Error;
 use errconv::ErrConv;
 use netpod::range::evrange::SeriesRange;

crates/taskrun/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 path = "src/taskrun.rs"
 
 [dependencies]
-tokio = { version = "1.29.1", features = ["full", "tracing"] }
+tokio = { version = "1.32.0", features = ["full", "tracing", "time"] }
 futures-util = "0.3.28"
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.17", features = ["fmt", "time"] }