fix: config test failed and use similar_asserts::assert_eq to repla…

…ce `assert_eq` for long string compare (#4731) * fix: config test failed and use 'similar_asserts::assert_eq' to replace 'assert_eq' for long string compare * Update Cargo.toml Co-authored-by: Yingwen <realevenyag@gmail.com> * Update src/cmd/tests/load_config_test.rs Co-authored-by: Yingwen <realevenyag@gmail.com> --------- Co-authored-by: Ruihang Xia <waynestxia@gmail.com> Co-authored-by: Yingwen <realevenyag@gmail.com>
GreptimeTeam · Sep 18, 2024 · 0847ff3 · 0847ff3
1 parent c014e87
commit 0847ff3
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -169,6 +169,7 @@ shadow-rs = "0.31"
 smallvec = { version = "1", features = ["serde"] }
 snafu = "0.8"
 sysinfo = "0.30"
+similar-asserts = "1.6.0"
 # on branch v0.44.x
 sqlparser = { git = "https://github.com/GreptimeTeam/sqlparser-rs.git", rev = "54a267ac89c09b11c0c88934690530807185d3e7", features = [
  "visitor",

diff --git a/src/cmd/Cargo.toml b/src/cmd/Cargo.toml
@@ -70,6 +70,7 @@ serde.workspace = true
 serde_json.workspace = true
 servers.workspace = true
 session.workspace = true
+similar-asserts.workspace = true
 snafu.workspace = true
 store-api.workspace = true
 substrait.workspace = true

diff --git a/src/cmd/tests/load_config_test.rs b/src/cmd/tests/load_config_test.rs
@@ -16,12 +16,10 @@ use std::time::Duration;
 
 use cmd::options::GreptimeOptions;
 use cmd::standalone::StandaloneOptions;
-use common_base::readable_size::ReadableSize;
 use common_config::Configurable;
 use common_grpc::channel_manager::{
  DEFAULT_MAX_GRPC_RECV_MESSAGE_SIZE, DEFAULT_MAX_GRPC_SEND_MESSAGE_SIZE,
 };
-use common_runtime::global::RuntimeOptions;
 use common_telemetry::logging::{LoggingOptions, DEFAULT_OTLP_ENDPOINT};
 use common_wal::config::raft_engine::RaftEngineConfig;
 use common_wal::config::DatanodeWalConfig;
@@ -45,10 +43,6 @@ fn test_load_datanode_example_config() {
  .unwrap();
 
  let expected = GreptimeOptions::<DatanodeOptions> {
- runtime: RuntimeOptions {
- global_rt_size: 8,
- compact_rt_size: 4,
- },
  component: DatanodeOptions {
  node_id: Some(42),
  meta_client: Some(MetaClientOptions {
@@ -76,8 +70,6 @@ fn test_load_datanode_example_config() {
  RegionEngineConfig::Mito(MitoConfig {
  auto_flush_interval: Duration::from_secs(3600),
  scan_parallelism: 0,
- global_write_buffer_reject_size: ReadableSize::gb(2),
- max_background_jobs: 4,
  experimental_write_cache_ttl: Some(Duration::from_secs(60 * 60 * 8)),
  ..Default::default()
  }),
@@ -102,9 +94,10 @@ fn test_load_datanode_example_config() {
  rpc_max_send_message_size: Some(DEFAULT_MAX_GRPC_SEND_MESSAGE_SIZE),
  ..Default::default()
  },
+ ..Default::default()
  };
 
- assert_eq!(options, expected);
+ similar_asserts::assert_eq!(options, expected);
 }
 
 #[test]
@@ -114,10 +107,6 @@ fn test_load_frontend_example_config() {
  GreptimeOptions::<FrontendOptions>::load_layered_options(example_config.to_str(), "")
  .unwrap();
  let expected = GreptimeOptions::<FrontendOptions> {
- runtime: RuntimeOptions {
- global_rt_size: 8,
- compact_rt_size: 4,
- },
  component: FrontendOptions {
  default_timezone: Some("UTC".to_string()),
  meta_client: Some(MetaClientOptions {
@@ -150,8 +139,9 @@ fn test_load_frontend_example_config() {
  },
  ..Default::default()
  },
+ ..Default::default()
  };
- assert_eq!(options, expected);
+ similar_asserts::assert_eq!(options, expected);
 }
 
 #[test]
@@ -161,10 +151,6 @@ fn test_load_metasrv_example_config() {
  GreptimeOptions::<MetasrvOptions>::load_layered_options(example_config.to_str(), "")
  .unwrap();
  let expected = GreptimeOptions::<MetasrvOptions> {
- runtime: RuntimeOptions {
- global_rt_size: 8,
- compact_rt_size: 4,
- },
  component: MetasrvOptions {
  selector: SelectorType::default(),
  data_home: "/tmp/metasrv/".to_string(),
@@ -182,8 +168,9 @@ fn test_load_metasrv_example_config() {
  },
  ..Default::default()
  },
+ ..Default::default()
  };
- assert_eq!(options, expected);
+ similar_asserts::assert_eq!(options, expected);
 }
 
 #[test]
@@ -193,10 +180,6 @@ fn test_load_standalone_example_config() {
  GreptimeOptions::<StandaloneOptions>::load_layered_options(example_config.to_str(), "")
  .unwrap();
  let expected = GreptimeOptions::<StandaloneOptions> {
- runtime: RuntimeOptions {
- global_rt_size: 8,
- compact_rt_size: 4,
- },
  component: StandaloneOptions {
  default_timezone: Some("UTC".to_string()),
  wal: DatanodeWalConfig::RaftEngine(RaftEngineConfig {
@@ -208,11 +191,8 @@ fn test_load_standalone_example_config() {
  region_engine: vec![
  RegionEngineConfig::Mito(MitoConfig {
  auto_flush_interval: Duration::from_secs(3600),
- scan_parallelism: 0,
- global_write_buffer_reject_size: ReadableSize::gb(2),
- sst_meta_cache_size: ReadableSize::mb(128),
- max_background_jobs: 4,
  experimental_write_cache_ttl: Some(Duration::from_secs(60 * 60 * 8)),
+ scan_parallelism: 0,
  ..Default::default()
  }),
  RegionEngineConfig::File(EngineConfig {}),
@@ -234,6 +214,7 @@ fn test_load_standalone_example_config() {
  },
  ..Default::default()
  },
+ ..Default::default()
  };
- assert_eq!(options, expected);
+ similar_asserts::assert_eq!(options, expected);
 }
diff --git a/tests-integration/Cargo.toml b/tests-integration/Cargo.toml
@@ -60,6 +60,7 @@ rstest_reuse.workspace = true
 serde_json.workspace = true
 servers = { workspace = true, features = ["testing"] }
 session.workspace = true
+similar-asserts.workspace = true
 snafu.workspace = true
 sql.workspace = true
 sqlx = { version = "0.6", features = [

diff --git a/tests-integration/tests/http.rs b/tests-integration/tests/http.rs
@@ -888,7 +888,7 @@ write_interval = "30s"
  .trim()
  .to_string();
  let body_text = drop_lines_with_inconsistent_results(res_get.text().await);
- assert_eq!(body_text, expected_toml_str);
+ similar_asserts::assert_eq!(body_text, expected_toml_str);
 }
 
 fn drop_lines_with_inconsistent_results(input: String) -> String {