Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: extract common test code for creating table #117

Merged
merged 3 commits into from
Sep 13, 2024
Merged

refactor: extract common test code for creating table #117

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44077ba
feat: support external config hudi-defaults.conf
gohalo Aug 21, 2024
363cec8
refactor: change the test
gohalo Sep 10, 2024
328db23
fix path concat
xushiyan Sep 13, 2024
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
92 changes: 26 additions & 66 deletions crates/core/src/table/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,8 @@ impl Table {
mod tests {
use std::collections::HashSet;
use std::fs::canonicalize;
use std::path::Path;
use std::path::PathBuf;
use std::{env, panic};

use url::Url;

use hudi_tests::{assert_not, TestTable};
Expand All @@ -330,6 +329,24 @@ mod tests {
use crate::storage::utils::join_url_segments;
use crate::table::Table;

/// Test helper to create a new `Table` instance without validating the configuration.
///
/// # Arguments
///
/// * `table_dir_name` - Name of the table root directory; all under `crates/core/tests/data/`.
async fn get_test_table_without_validation(table_dir_name: &str) -> Table {
let base_url = Url::from_file_path(
canonicalize(PathBuf::from("tests").join("data").join(table_dir_name)).unwrap(),
)
.unwrap();
Table::new_with_options(
base_url.as_str(),
[("hoodie.internal.skip.config.validation", "true")],
)
.await
.unwrap()
}

#[tokio::test]
async fn hudi_table_get_schema() {
let base_url = TestTable::V6Nonpartitioned.url();
Expand Down Expand Up @@ -473,15 +490,7 @@ mod tests {

#[tokio::test]
async fn validate_invalid_table_props() {
let base_url =
Url::from_file_path(canonicalize(Path::new("tests/data/table_props_invalid")).unwrap())
.unwrap();
let table = Table::new_with_options(
base_url.as_str(),
[("hoodie.internal.skip.config.validation", "true")],
)
.await
.unwrap();
let table = get_test_table_without_validation("table_props_invalid").await;
let configs = table.configs;
assert!(
configs.validate(BaseFileFormat).is_err(),
Expand Down Expand Up @@ -529,15 +538,7 @@ mod tests {

#[tokio::test]
async fn get_invalid_table_props() {
let base_url =
Url::from_file_path(canonicalize(Path::new("tests/data/table_props_invalid")).unwrap())
.unwrap();
let table = Table::new_with_options(
base_url.as_str(),
[("hoodie.internal.skip.config.validation", "true")],
)
.await
.unwrap();
let table = get_test_table_without_validation("table_props_invalid").await;
let configs = table.configs;
assert!(configs.get(BaseFileFormat).is_err());
assert!(configs.get(Checksum).is_err());
Expand All @@ -558,15 +559,7 @@ mod tests {

#[tokio::test]
async fn get_default_for_invalid_table_props() {
let base_url =
Url::from_file_path(canonicalize(Path::new("tests/data/table_props_invalid")).unwrap())
.unwrap();
let table = Table::new_with_options(
base_url.as_str(),
[("hoodie.internal.skip.config.validation", "true")],
)
.await
.unwrap();
let table = get_test_table_without_validation("table_props_invalid").await;
let configs = table.configs;
assert!(panic::catch_unwind(|| configs.get_or_default(BaseFileFormat)).is_err());
assert!(panic::catch_unwind(|| configs.get_or_default(Checksum)).is_err());
Expand All @@ -593,15 +586,7 @@ mod tests {

#[tokio::test]
async fn get_valid_table_props() {
let base_url =
Url::from_file_path(canonicalize(Path::new("tests/data/table_props_valid")).unwrap())
.unwrap();
let table = Table::new_with_options(
base_url.as_str(),
[("hoodie.internal.skip.config.validation", "true")],
)
.await
.unwrap();
let table = get_test_table_without_validation("table_props_valid").await;
let configs = table.configs;
assert_eq!(
configs.get(BaseFileFormat).unwrap().to::<String>(),
Expand Down Expand Up @@ -638,15 +623,7 @@ mod tests {
#[tokio::test]
async fn get_global_table_props() {
// Without the environment variable HUDI_CONF_DIR
let base_url =
Url::from_file_path(canonicalize(Path::new("tests/data/table_props_partial")).unwrap())
.unwrap();
let table = Table::new_with_options(
base_url.as_str(),
[("hoodie.internal.skip.config.validation", "true")],
)
.await
.unwrap();
let table = get_test_table_without_validation("table_props_partial").await;
let configs = table.configs;
assert!(configs.get(DatabaseName).is_err());
assert!(configs.get(TableType).is_err());
Expand All @@ -656,15 +633,7 @@ mod tests {
let base_path = env::current_dir().unwrap();
let hudi_conf_dir = base_path.join("random/wrong/dir");
env::set_var(HUDI_CONF_DIR, hudi_conf_dir.as_os_str());
let base_url =
Url::from_file_path(canonicalize(Path::new("tests/data/table_props_partial")).unwrap())
.unwrap();
let table = Table::new_with_options(
base_url.as_str(),
[("hoodie.internal.skip.config.validation", "true")],
)
.await
.unwrap();
let table = get_test_table_without_validation("table_props_partial").await;
let configs = table.configs;
assert!(configs.get(DatabaseName).is_err());
assert!(configs.get(TableType).is_err());
Expand All @@ -674,16 +643,7 @@ mod tests {
let base_path = env::current_dir().unwrap();
let hudi_conf_dir = base_path.join("tests/data/hudi_conf_dir");
env::set_var(HUDI_CONF_DIR, hudi_conf_dir.as_os_str());

let base_url =
Url::from_file_path(canonicalize(Path::new("tests/data/table_props_partial")).unwrap())
.unwrap();
let table = Table::new_with_options(
base_url.as_str(),
[("hoodie.internal.skip.config.validation", "true")],
)
.await
.unwrap();
let table = get_test_table_without_validation("table_props_partial").await;
let configs = table.configs;
assert_eq!(configs.get(DatabaseName).unwrap().to::<String>(), "tmpdb");
assert_eq!(
Expand Down
Loading