Skip to content

Commit

Permalink
fix: sqlness tests
Browse files Browse the repository at this point in the history
  • Loading branch information
v0y4g3r committed Mar 26, 2023
1 parent 8e0fdb0 commit 34324e1
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
6 changes: 3 additions & 3 deletions src/common/datasource/src/lister.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ impl Lister {
let file_full_path = format!("{}{}", self.path, filename);
let _ = self.object_store.stat(&file_full_path).await.context(
error::ListObjectsSnafu {
path: file_full_path,
path: &file_full_path,
},
);
Ok(vec![Entry::new(&self.path)])
)?;
Ok(vec![Entry::new(&file_full_path)])
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/datanode/src/sql/copy_table_from.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ impl SqlHandler {
build_backend(&req.location, req.connection).context(error::BuildBackendSnafu)?;

let (dir, filename) = find_dir_and_filename(&path);

let regex = req
.pattern
.as_ref()
Expand Down
23 changes: 13 additions & 10 deletions src/object-store/tests/object_store_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,28 +53,31 @@ async fn test_object_crud(store: &ObjectStore) -> Result<()> {
async fn test_object_list(store: &ObjectStore) -> Result<()> {
// Create some object handlers.
// Write something
store.write("test_file1", "Hello, object1!").await?;
store.write("test_file2", "Hello, object2!").await?;
store.write("test_file3", "Hello, object3!").await?;
let p1 = "test_file1";
let p2 = "test_file2";
let p3 = "test_file3";
store.write(p1, "Hello, object1!").await?;
store.write(p2, "Hello, object2!").await?;
store.write(p3, "Hello, object3!").await?;

// List objects
let lister = store.list("/").await?;
let entries = util::collect(lister).await?;
assert_eq!(3, entries.len());

store.delete(entries.get(0).unwrap().path()).await?;
store.delete(entries.get(2).unwrap().path()).await?;
store.delete(p1).await?;
store.delete(p3).await?;

// List obejcts again
// List objects again
// Only o2 is exists
let entries = util::collect(store.list("/").await?).await?;
assert_eq!(1, entries.len());
assert_eq!(p2, entries.get(0).unwrap().path());

// Only o2 is exists
let o2 = entries.get(0).unwrap();
let content = store.read(o2.path()).await?;
let content = store.read(p2).await?;
assert_eq!("Hello, object2!", String::from_utf8(content)?);

store.delete(o2.path()).await?;
store.delete(p2).await?;
let entries = util::collect(store.list("/").await?).await?;
assert!(entries.is_empty());
Ok(())
Expand Down
2 changes: 1 addition & 1 deletion src/storage/src/test_util/config_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use std::sync::Arc;
use log_store::raft_engine::log_store::RaftEngineLogStore;
use log_store::LogConfig;
use object_store::services::Fs as Builder;
use object_store::{ObjectStore};
use object_store::ObjectStore;

use crate::background::JobPoolImpl;
use crate::compaction::noop::NoopCompactionScheduler;
Expand Down
2 changes: 1 addition & 1 deletion src/table-procedure/src/test_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use log_store::NoopLogStore;
use mito::config::EngineConfig;
use mito::engine::MitoEngine;
use object_store::services::Fs;
use object_store::{ObjectStore};
use object_store::ObjectStore;
use storage::compaction::noop::NoopCompactionScheduler;
use storage::config::EngineConfig as StorageEngineConfig;
use storage::EngineImpl;
Expand Down

0 comments on commit 34324e1

Please sign in to comment.