Refactor and unify

dbconn/src/dbconn.rs

@@ -5,12 +5,12 @@ pub mod search;
 pub mod pg {
     pub use tokio_postgres::{Client, Error};
 }
-
 use err::Error;
 use netpod::log::*;
-use netpod::{Channel, Database, NodeConfigCached};
+use netpod::{Channel, Database, NodeConfigCached, ScyllaConfig};
 use scylla::frame::response::cql_to_rust::FromRowError as ScyFromRowError;
 use scylla::transport::errors::{NewSessionError as ScyNewSessionError, QueryError as ScyQueryError};
+use scylla::Session as ScySession;
 use std::time::Duration;
 use tokio_postgres::{Client, NoTls};
 
@@ -92,6 +92,16 @@ pub async fn create_connection(db_config: &Database) -> Result<Client, Error> {
     Ok(cl)
 }
 
+pub async fn create_scylla_connection(scyconf: &ScyllaConfig) -> Result<ScySession, Error> {
+    let scy = scylla::SessionBuilder::new()
+        .known_nodes(&scyconf.hosts)
+        .use_keyspace(&scyconf.keyspace, true)
+        .build()
+        .await
+        .err_conv()?;
+    Ok(scy)
+}
+
 pub async fn channel_exists(channel: &Channel, node_config: &NodeConfigCached) -> Result<bool, Error> {
     let cl = create_connection(&node_config.node_config.cluster.database).await?;
     let rows = cl