Skip to content

Commit 0636468

Browse files
committed
chore(query): make user setting depend on a lightweight UserSettingValue instead of DataValue
1 parent 0642ce1 commit 0636468

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

src/query/datavalues/tests/it/types/viewer.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,9 @@ fn test_constant_viewer() -> Result<()> {
7070
}
7171

7272
#[test]
73-
fn test_json() {
74-
73+
fn test_json() {
7574
let value = DataValue::Int64(53);
7675
let ss = serde_json::to_vec(&value).unwrap();
7776
println!("{:?}", ss);
78-
println!("{:?}", unsafe { std::str::from_utf8_unchecked(&ss) } );
77+
println!("{:?}", unsafe { std::str::from_utf8_unchecked(&ss) });
7978
}

src/query/management/tests/it/setting.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ async fn test_set_setting() -> Result<()> {
6969

7070
// Get settings.
7171
{
72-
let expect = vec![UserSetting::create("max_threads", UserSettingValue::UInt64(1))];
72+
let expect = vec![UserSetting::create(
73+
"max_threads",
74+
UserSettingValue::UInt64(1),
75+
)];
7376
let actual = mgr.get_settings().await?;
7477
assert_eq!(actual, expect);
7578
}

src/query/settings/src/lib.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,9 @@ impl Settings {
577577
Ok(())
578578
}
579579

580-
pub fn get_setting_values(&self) -> Vec<(String, UserSettingValue, UserSettingValue, String, String)> {
580+
pub fn get_setting_values(
581+
&self,
582+
) -> Vec<(String, UserSettingValue, UserSettingValue, String, String)> {
581583
let settings = self.settings.read();
582584

583585
let mut result = vec![];
@@ -625,11 +627,11 @@ impl Settings {
625627
let mut settings = self.settings.write();
626628
let values = changed_settings.get_setting_values();
627629
for value in values.into_iter() {
628-
let key = value.0;
629-
let mut val = settings.get_mut(&key).ok_or_else(|| {
630-
ErrorCode::UnknownVariable(format!("Unknown variable: {:?}", key))
631-
})?;
632-
val.user_setting.value = value.1.clone();
630+
let key = value.0;
631+
let mut val = settings.get_mut(&key).ok_or_else(|| {
632+
ErrorCode::UnknownVariable(format!("Unknown variable: {:?}", key))
633+
})?;
634+
val.user_setting.value = value.1.clone();
633635
}
634636
Ok(())
635637
}

src/query/storages/preludes/src/system/settings_table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl SyncSystemTable for SettingsTable {
6262
let typename = match vals.2 {
6363
common_meta_types::UserSettingValue::UInt64(_) => "UInt64",
6464
common_meta_types::UserSettingValue::String(_) => "String",
65-
_ => unreachable!()
65+
_ => unreachable!(),
6666
};
6767
// Types.
6868
types.push(typename.to_string());

0 commit comments

Comments
 (0)