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

refactor: add more macro in config #1619

Merged
merged 3 commits into from
Dec 25, 2024
Merged

refactor: add more macro in config #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eafae34
fix config
baojinri Dec 25, 2024
88b3dd6
use ReadableDuration & ReadableSize in config
baojinri Dec 25, 2024
9b81345
Update src/metric_engine/src/config.rs
jiacai2050 Dec 25, 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
8 changes: 4 additions & 4 deletions src/metric_engine/src/compaction/scheduler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ impl Scheduler {
sst_path_gen,
parquet_reader,
write_props,
config.memory_limit,
config.memory_limit.0,
trigger_tx.clone(),
);

Expand All @@ -84,13 +84,13 @@ impl Scheduler {
runtime.spawn(async move {
let picker = Picker::new(
manifest,
config.ttl,
config.ttl.map(|v| v.0),
segment_duration,
config.new_sst_max_size,
config.new_sst_max_size.0,
config.input_sst_max_num,
config.input_sst_min_num,
);
Self::generate_task_loop(task_tx, trigger_rx, picker, config.schedule_interval)
Self::generate_task_loop(task_tx, trigger_rx, picker, config.schedule_interval.0)
.await;
})
};
Expand Down
33 changes: 17 additions & 16 deletions src/metric_engine/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,41 @@
// specific language governing permissions and limitations
// under the License.

use std::{collections::HashMap, time::Duration};
use std::collections::HashMap;

use common::{ReadableDuration, ReadableSize};
use parquet::basic::{Compression, Encoding, ZstdLevel};
use serde::{Deserialize, Serialize};

#[derive(Debug, Deserialize, Serialize)]
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
#[serde(default, deny_unknown_fields)]
pub struct SchedulerConfig {
pub schedule_interval: Duration,
pub schedule_interval: ReadableDuration,
pub max_pending_compaction_tasks: usize,
// Runner config
pub memory_limit: u64,
pub memory_limit: ReadableSize,
// Picker config
pub ttl: Option<Duration>,
pub new_sst_max_size: u64,
pub ttl: Option<ReadableDuration>,
pub new_sst_max_size: ReadableSize,
pub input_sst_max_num: usize,
pub input_sst_min_num: usize,
}

impl Default for SchedulerConfig {
fn default() -> Self {
Self {
schedule_interval: Duration::from_secs(10),
schedule_interval: ReadableDuration::secs(10),
max_pending_compaction_tasks: 10,
memory_limit: bytesize::gb(20_u64),
memory_limit: ReadableSize::gb(2_u64),
ttl: None,
new_sst_max_size: bytesize::gb(1_u64),
new_sst_max_size: ReadableSize::gb(1_u64),
input_sst_max_num: 30,
input_sst_min_num: 5,
}
}
}

#[derive(Debug, Default, Deserialize, Serialize)]
#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq)]
#[serde(deny_unknown_fields)]
pub enum ParquetEncoding {
#[default]
Expand All @@ -73,7 +74,7 @@ impl From<ParquetEncoding> for Encoding {
}
}

#[derive(Debug, Default, Deserialize, Serialize)]
#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq)]
#[serde(deny_unknown_fields)]
pub enum ParquetCompression {
#[default]
Expand All @@ -92,7 +93,7 @@ impl From<ParquetCompression> for Compression {
}
}

#[derive(Debug, Default, Deserialize, Serialize)]
#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq)]
#[serde(default, deny_unknown_fields)]
pub struct ColumnOptions {
pub enable_dict: Option<bool>,
Expand All @@ -101,7 +102,7 @@ pub struct ColumnOptions {
pub compression: Option<ParquetCompression>,
}

#[derive(Debug, Deserialize, Serialize)]
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
#[serde(default, deny_unknown_fields)]
pub struct WriteConfig {
pub max_row_group_size: usize,
Expand Down Expand Up @@ -131,7 +132,7 @@ impl Default for WriteConfig {
}
}

#[derive(Debug, Deserialize, Serialize)]
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
#[serde(default, deny_unknown_fields)]
pub struct ManifestConfig {
pub channel_size: usize,
Expand All @@ -153,7 +154,7 @@ impl Default for ManifestConfig {
}
}

#[derive(Debug, Default, Deserialize, Serialize)]
#[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq)]
#[serde(default, deny_unknown_fields)]
pub struct StorageConfig {
pub write: WriteConfig,
Expand All @@ -162,7 +163,7 @@ pub struct StorageConfig {
pub update_mode: UpdateMode,
}

#[derive(Debug, Default, Clone, Deserialize, Serialize)]
#[derive(Debug, Default, Clone, Deserialize, Serialize, PartialEq)]
#[serde(deny_unknown_fields)]
pub enum UpdateMode {
#[default]
Expand Down
Loading