Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ log-store = { path = "../log-store" }
mito = { path = "../mito", features = ["test"] }
object-store = { path = "../object-store" }
storage = { path = "../storage" }
tempdir = "0.3"
tempfile = "3.4.0"
tokio.workspace = true
7 changes: 5 additions & 2 deletions src/catalog/src/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ mod tests {
use storage::EngineImpl;
use table::metadata::TableType;
use table::metadata::TableType::Base;
use tempdir::TempDir;
use tempfile::TempDir;
Comment thread
evenyag marked this conversation as resolved.
Outdated

use super::*;

Expand Down Expand Up @@ -480,7 +480,10 @@ mod tests {
}

pub async fn prepare_table_engine() -> (TempDir, TableEngineRef) {
let dir = TempDir::new("system-table-test").unwrap();
let dir = tempfile::Builder::new()
.prefix("system-table-test")
.tempdir()
.unwrap();
let store_dir = dir.path().to_string_lossy();
let accessor = object_store::services::Fs::default()
.root(&store_dir)
Expand Down
3 changes: 1 addition & 2 deletions src/cmd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ toml = "0.5"
[dev-dependencies]
rexpect = "0.5"
serde.workspace = true
tempdir = "0.3"
tempfile.workspace = true
tempfile = "3.4.0"

[build-dependencies]
build-data = "0.1.3"
6 changes: 4 additions & 2 deletions src/cmd/src/toml_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ mod tests {

use serde::{Deserialize, Serialize};
use snafu::ResultExt;
use tempdir::TempDir;

use super::*;
use crate::error::Result;
Expand Down Expand Up @@ -62,7 +61,10 @@ mod tests {
host: "greptime.test".to_string(),
};

let dir = TempDir::new("test_from_file").unwrap();
let dir = tempfile::Builder::new()
.prefix("test_from_file")
.tempdir()
.unwrap();
let test_file = format!("{}/test.toml", dir.path().to_str().unwrap());

let s = toml::to_string(&config).unwrap();
Expand Down
10 changes: 7 additions & 3 deletions src/cmd/tests/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ mod tests {
use std::time::Duration;

use rexpect::session::PtyReplSession;
use tempdir::TempDir;
use tempfile::TempDir;

struct Repl {
repl: PtyReplSession,
Expand Down Expand Up @@ -48,8 +48,8 @@ mod tests {

#[test]
fn test_repl() {
let data_dir = TempDir::new_in("/tmp", "data").unwrap();
let wal_dir = TempDir::new_in("/tmp", "wal").unwrap();
let data_dir = create_tmp_dir("data");
let wal_dir = create_tmp_dir("wal");

let mut bin_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
bin_path.push("../../target/debug");
Expand Down Expand Up @@ -142,4 +142,8 @@ mod tests {

repl.read_contains("Cost");
}

fn create_tmp_dir(prefix: &str) -> TempDir {
tempfile::Builder::new().prefix(prefix).tempdir().unwrap()
}
}
2 changes: 1 addition & 1 deletion src/common/catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ snafu = { version = "0.7", features = ["backtraces"] }

[dev-dependencies]
chrono.workspace = true
tempdir = "0.3"
tempfile = "3.4.0"
Comment thread
waynexia marked this conversation as resolved.
Outdated
tokio.workspace = true
2 changes: 1 addition & 1 deletion src/common/procedure/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ uuid.workspace = true

[dev-dependencies]
futures-util.workspace = true
tempdir = "0.3"
tempfile = "3.4.0"
16 changes: 10 additions & 6 deletions src/common/procedure/src/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ impl ProcedureManager for LocalManager {
mod test_util {
use object_store::services::Fs as Builder;
use object_store::ObjectStoreBuilder;
use tempdir::TempDir;
use tempfile::TempDir;

use super::*;

Expand All @@ -430,7 +430,7 @@ mod test_util {
mod tests {
use common_error::mock::MockError;
use common_error::prelude::StatusCode;
use tempdir::TempDir;
use tempfile::TempDir;

use super::*;
use crate::error::Error;
Expand Down Expand Up @@ -540,7 +540,7 @@ mod tests {

#[test]
fn test_register_loader() {
let dir = TempDir::new("register").unwrap();
let dir = create_tmp_dir("register");
let config = ManagerConfig {
object_store: test_util::new_object_store(&dir),
};
Expand All @@ -558,7 +558,7 @@ mod tests {

#[tokio::test]
async fn test_recover() {
let dir = TempDir::new("recover").unwrap();
let dir = create_tmp_dir("recover");
let object_store = test_util::new_object_store(&dir);
let config = ManagerConfig {
object_store: object_store.clone(),
Expand Down Expand Up @@ -603,7 +603,7 @@ mod tests {

#[tokio::test]
async fn test_submit_procedure() {
let dir = TempDir::new("submit").unwrap();
let dir = create_tmp_dir("submit");
let config = ManagerConfig {
object_store: test_util::new_object_store(&dir),
};
Expand Down Expand Up @@ -649,7 +649,7 @@ mod tests {

#[tokio::test]
async fn test_state_changed_on_err() {
let dir = TempDir::new("on_err").unwrap();
let dir = create_tmp_dir("on_err");
let config = ManagerConfig {
object_store: test_util::new_object_store(&dir),
};
Expand Down Expand Up @@ -704,4 +704,8 @@ mod tests {
check_procedure(MockProcedure { panic: false }).await;
check_procedure(MockProcedure { panic: true }).await;
}

fn create_tmp_dir(prefix: &str) -> TempDir {
tempfile::Builder::new().prefix(prefix).tempdir().unwrap()
}
}
18 changes: 11 additions & 7 deletions src/common/procedure/src/local/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ mod tests {
use futures_util::future::BoxFuture;
use futures_util::{FutureExt, TryStreamExt};
use object_store::ObjectStore;
use tempdir::TempDir;
use tempfile::TempDir;

use super::*;
use crate::local::test_util;
Expand Down Expand Up @@ -511,7 +511,7 @@ mod tests {
exec_fn,
};

let dir = TempDir::new("normal").unwrap();
let dir = create_tmp_dir("normal");
let meta = normal.new_meta(ROOT_ID);
let ctx = context_without_provider(meta.id);
let object_store = test_util::new_object_store(&dir);
Expand Down Expand Up @@ -559,7 +559,7 @@ mod tests {
exec_fn,
};

let dir = TempDir::new("suspend").unwrap();
let dir = create_tmp_dir("suspend");
let meta = suspend.new_meta(ROOT_ID);
let ctx = context_without_provider(meta.id);
let object_store = test_util::new_object_store(&dir);
Expand Down Expand Up @@ -658,7 +658,7 @@ mod tests {
exec_fn,
};

let dir = TempDir::new("parent").unwrap();
let dir = create_tmp_dir("parent");
let meta = parent.new_meta(ROOT_ID);
let procedure_id = meta.id;

Expand Down Expand Up @@ -700,7 +700,7 @@ mod tests {
exec_fn,
};

let dir = TempDir::new("fail").unwrap();
let dir = create_tmp_dir("fail");
let meta = fail.new_meta(ROOT_ID);
let ctx = context_without_provider(meta.id);
let object_store = test_util::new_object_store(&dir);
Expand Down Expand Up @@ -735,7 +735,7 @@ mod tests {
exec_fn,
};

let dir = TempDir::new("retry_later").unwrap();
let dir = create_tmp_dir("retry_later");
let meta = retry_later.new_meta(ROOT_ID);
let ctx = context_without_provider(meta.id);
let object_store = test_util::new_object_store(&dir);
Expand Down Expand Up @@ -806,7 +806,7 @@ mod tests {
exec_fn,
};

let dir = TempDir::new("child_err").unwrap();
let dir = create_tmp_dir("child_err");
let meta = parent.new_meta(ROOT_ID);

let object_store = test_util::new_object_store(&dir);
Expand All @@ -824,4 +824,8 @@ mod tests {
let err = meta.state().error().unwrap().to_string();
assert!(err.contains("subprocedure failed"), "{err}");
}

fn create_tmp_dir(prefix: &str) -> TempDir {
tempfile::Builder::new().prefix(prefix).tempdir().unwrap()
}
}
14 changes: 9 additions & 5 deletions src/common/procedure/src/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ mod tests {
use async_trait::async_trait;
use object_store::services::Fs as Builder;
use object_store::ObjectStoreBuilder;
use tempdir::TempDir;
use tempfile::TempDir;

use super::*;
use crate::{Context, LockKey, Procedure, Status};
Expand Down Expand Up @@ -373,7 +373,7 @@ mod tests {

#[tokio::test]
async fn test_store_procedure() {
let dir = TempDir::new("store_procedure").unwrap();
let dir = create_tmp_dir("store_procedure");
let store = procedure_store_for_test(&dir);

let procedure_id = ProcedureId::random();
Expand All @@ -398,7 +398,7 @@ mod tests {

#[tokio::test]
async fn test_commit_procedure() {
let dir = TempDir::new("commit_procedure").unwrap();
let dir = create_tmp_dir("commit_procedure");
let store = procedure_store_for_test(&dir);

let procedure_id = ProcedureId::random();
Expand All @@ -416,7 +416,7 @@ mod tests {

#[tokio::test]
async fn test_rollback_procedure() {
let dir = TempDir::new("rollback_procedure").unwrap();
let dir = create_tmp_dir("rollback_procedure");
let store = procedure_store_for_test(&dir);

let procedure_id = ProcedureId::random();
Expand All @@ -434,7 +434,7 @@ mod tests {

#[tokio::test]
async fn test_load_messages() {
let dir = TempDir::new("load_messages").unwrap();
let dir = create_tmp_dir("load_messages");
let store = procedure_store_for_test(&dir);

// store 3 steps
Expand Down Expand Up @@ -485,4 +485,8 @@ mod tests {
let msg = messages.get(&id2).unwrap();
assert_eq!("id2-0", msg.data);
}

fn create_tmp_dir(prefix: &str) -> TempDir {
tempfile::Builder::new().prefix(prefix).tempdir().unwrap()
}
}
6 changes: 4 additions & 2 deletions src/common/procedure/src/store/state_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,15 @@ impl StateStore for ObjectStateStore {
mod tests {
use object_store::services::Fs as Builder;
use object_store::ObjectStoreBuilder;
use tempdir::TempDir;

use super::*;

#[tokio::test]
async fn test_object_state_store() {
let dir = TempDir::new("state_store").unwrap();
let dir = tempfile::Builder::new()
.prefix("state_store")
.tempdir()
.unwrap();
let store_dir = dir.path().to_str().unwrap();
let accessor = Builder::default().root(store_dir).build().unwrap();
let object_store = ObjectStore::new(accessor).finish();
Expand Down
2 changes: 1 addition & 1 deletion src/datanode/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ axum-test-helper = { git = "https://github.com/sunng87/axum-test-helper.git", br
client = { path = "../client" }
common-query = { path = "../common/query" }
datafusion-common.workspace = true
tempdir = "0.3"
tempfile = "3.4.0"
toml = "0.5"
6 changes: 4 additions & 2 deletions src/datanode/src/sql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ mod tests {
use table::error::Result as TableResult;
use table::metadata::TableInfoRef;
use table::Table;
use tempdir::TempDir;

use super::*;
use crate::error::Error;
Expand Down Expand Up @@ -218,7 +217,10 @@ mod tests {

#[tokio::test]
async fn test_statement_to_request() {
let dir = TempDir::new("setup_test_engine_and_table").unwrap();
let dir = tempfile::Builder::new()
.prefix("setup_test_engine_and_table")
.tempdir()
.unwrap();
let store_dir = dir.path().to_string_lossy();
let accessor = Builder::default().root(&store_dir).build().unwrap();
let object_store = ObjectStore::new(accessor).finish();
Expand Down
12 changes: 8 additions & 4 deletions src/datanode/src/tests/test_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use servers::Mode;
use snafu::ResultExt;
use table::engine::{EngineContext, TableEngineRef};
use table::requests::{CreateTableRequest, TableOptions};
use tempdir::TempDir;
use tempfile::TempDir;

use crate::datanode::{DatanodeOptions, FileConfig, ObjectStoreConfig, ProcedureConfig, WalConfig};
use crate::error::{CreateTableSnafu, Result};
Expand Down Expand Up @@ -55,7 +55,7 @@ impl MockInstance {

pub(crate) async fn with_procedure_enabled(name: &str) -> Self {
let (mut opts, _guard) = create_tmp_dir_and_datanode_opts(name);
let procedure_dir = TempDir::new(&format!("gt_procedure_{name}")).unwrap();
let procedure_dir = create_tmp_dir(&format!("gt_procedure_{name}"));
opts.procedure = Some(ProcedureConfig {
store: ObjectStoreConfig::File(FileConfig {
data_dir: procedure_dir.path().to_str().unwrap().to_string(),
Expand Down Expand Up @@ -87,8 +87,8 @@ struct TestGuard {
}

fn create_tmp_dir_and_datanode_opts(name: &str) -> (DatanodeOptions, TestGuard) {
let wal_tmp_dir = TempDir::new(&format!("gt_wal_{name}")).unwrap();
let data_tmp_dir = TempDir::new(&format!("gt_data_{name}")).unwrap();
let wal_tmp_dir = create_tmp_dir(&format!("gt_wal_{name}"));
let data_tmp_dir = create_tmp_dir(&format!("gt_data_{name}"));
let opts = DatanodeOptions {
wal: WalConfig {
dir: wal_tmp_dir.path().to_str().unwrap().to_string(),
Expand Down Expand Up @@ -212,3 +212,7 @@ pub async fn check_unordered_output_stream(output: Output, expected: String) {
let expected = sort_table(expected);
assert_eq!(pretty_print, expected);
}

fn create_tmp_dir(prefix: &str) -> TempDir {
tempfile::Builder::new().prefix(prefix).tempdir().unwrap()
}
2 changes: 1 addition & 1 deletion src/frontend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ datanode = { path = "../datanode" }
futures = "0.3"
meta-srv = { path = "../meta-srv", features = ["mock"] }
strfmt = "0.2"
tempdir = "0.3"
tempfile = "3.4.0"
toml = "0.5"
tower = "0.4"
Loading