review: move make_client

Author: zeeshanlakhani

oximeter/db/src/bin/oxdb/main.rs

@@ -14,7 +14,7 @@ use oximeter::{
     types::{Cumulative, Sample},
     Metric, Target,
 };
-use oximeter_db::{query, shells::make_client, Client, DbWrite};
+use oximeter_db::{make_client, query, Client, DbWrite};
 use slog::{debug, info, o, Drain, Level, Logger};
 use std::net::IpAddr;
 use uuid::Uuid;

oximeter/db/src/lib.rs

@@ -7,6 +7,7 @@
 // Copyright 2024 Oxide Computer Company
 
 use crate::query::StringFieldSelector;
+use anyhow::Context as _;
 use chrono::DateTime;
 use chrono::Utc;
 use dropshot::EmptyScanParams;
@@ -23,9 +24,12 @@ pub use oximeter::Sample;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
+use slog::Logger;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::io;
+use std::net::IpAddr;
+use std::net::SocketAddr;
 use std::num::NonZeroU32;
 use std::path::PathBuf;
 use thiserror::Error;
@@ -242,6 +246,22 @@ pub struct TimeseriesPageSelector {
     pub offset: NonZeroU32,
 }
 
+/// Create a client to the timeseries database, and ensure the database exists.
+#[cfg(any(feature = "oxql", feature = "sql", feature = "oxdb", test))]
+pub async fn make_client(
+    address: IpAddr,
+    port: u16,
+    log: &Logger,
+) -> Result<Client, anyhow::Error> {
+    let address = SocketAddr::new(address, port);
+    let client = Client::new(address, &log);
+    client
+        .init_single_node_db()
+        .await
+        .context("Failed to initialize timeseries database")?;
+    Ok(client)
+}
+
 pub(crate) type TimeseriesKey = u64;
 
 // TODO-cleanup: Add the timeseries version in to the computation of the key.

oximeter/db/src/shells/mod.rs

@@ -7,14 +7,9 @@
 // Copyright 2024 Oxide Computer Company
 
 use crate::Client;
-use crate::DbWrite as _;
-use anyhow::Context as _;
 use dropshot::EmptyScanParams;
 use dropshot::WhichPage;
 use oximeter::TimeseriesSchema;
-use slog::Logger;
-use std::net::IpAddr;
-use std::net::SocketAddr;
 
 #[cfg(any(feature = "oxql", test))]
 pub mod oxql;
@@ -130,21 +125,6 @@ pub async fn describe_timeseries(
     Ok(())
 }
 
-/// Create a client to the timeseries database, and ensure the database exists.
-pub async fn make_client(
-    address: IpAddr,
-    port: u16,
-    log: &Logger,
-) -> Result<Client, anyhow::Error> {
-    let address = SocketAddr::new(address, port);
-    let client = Client::new(address, &log);
-    client
-        .init_single_node_db()
-        .await
-        .context("Failed to initialize timeseries database")?;
-    Ok(client)
-}
-
 /// Prepare the columns for a timeseries or virtual table.
 pub(crate) fn prepare_columns(
     schema: &TimeseriesSchema,

oximeter/db/src/shells/oxql.rs

@@ -6,8 +6,8 @@
 
 // Copyright 2024 Oxide Computer
 
-use super::{list_timeseries, make_client, prepare_columns};
-use crate::{oxql::Table, Client, OxqlResult};
+use super::{list_timeseries, prepare_columns};
+use crate::{make_client, oxql::Table, Client, OxqlResult};
 use clap::Args;
 use crossterm::style::Stylize;
 use reedline::DefaultPrompt;

oximeter/db/src/shells/sql.rs

@@ -6,9 +6,9 @@
 
 // Copyright 2024 Oxide Computer Company
 
-use super::{make_client, prepare_columns};
+use super::prepare_columns;
 use crate::sql::{function_allow_list, QueryResult, Table};
-use crate::{Client, QuerySummary};
+use crate::{make_client, Client, QuerySummary};
 use clap::Args;
 use dropshot::EmptyScanParams;
 use dropshot::WhichPage;