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

fix(query): escape record_delimiter when displaying #6417

Merged
merged 2 commits into from
Jul 4, 2022
Merged

fix(query): escape record_delimiter when displaying #6417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75da747
improvement: escape record_delimiter when displaying
Veeupup Jul 3, 2022
e833db1
fix test
Veeupup Jul 4, 2022
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
17 changes: 17 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions query/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ serfig = "0.0.2"
sha1 = "0.10.1"
sha2 = "0.10.2"
smallvec = { version = "1.8.0", features = ["write"] }
snailquote = "0.3.1"
strum = "0.24.1"
strum_macros = "0.24.0"
tempfile = { version = "3.3.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion query/src/sessions/session_settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ impl Settings {
default_value: DataValue::String("\n".as_bytes().to_vec()),
user_setting: UserSetting::create("record_delimiter", DataValue::String("\n".as_bytes().to_vec())),
level: ScopeLevel::Session,
desc: "Format record_delimiter, default value: \n",
desc: "Format record_delimiter, default value: \"\\n\"",
},
SettingValue {
default_value: DataValue::String(",".as_bytes().to_vec()),
Expand Down
5 changes: 3 additions & 2 deletions query/src/storages/system/settings_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use common_exception::Result;
use common_meta_app::schema::TableIdent;
use common_meta_app::schema::TableInfo;
use common_meta_app::schema::TableMeta;
use snailquote::escape;

use crate::sessions::QueryContext;
use crate::storages::system::table::SyncOneBlockSystemTable;
Expand Down Expand Up @@ -51,9 +52,9 @@ impl SyncSystemTable for SettingsTable {
// Name.
names.push(format!("{:?}", vals[0]));
// Value.
values.push(format!("{:?}", vals[1]));
values.push(escape(format!("{:?}", vals[1]).as_str()).to_string());
// Default Value.
defaults.push(format!("{:?}", vals[2]));
defaults.push(escape(format!("{:?}", vals[2]).as_str()).to_string());
// Scope level.
levels.push(format!("{:?}", vals[3]));
// Desc.
Expand Down
3 changes: 1 addition & 2 deletions query/tests/it/storages/system/settings_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ async fn test_settings_table() -> Result<()> {
"+--------------------------------+---------+---------+---------+----------------------------------------------------------------------------------------------------+--------+",
"| name | value | default | level | description | type |",
"+--------------------------------+---------+---------+---------+----------------------------------------------------------------------------------------------------+--------+",
"| | | | | | |",
"| enable_async_insert | 0 | 0 | SESSION | Whether the client open async insert mode, default value: 0 | UInt64 |",
"| compression | None | None | SESSION | Format compression, default value: None | String |",
"| empty_as_default | 1 | 1 | SESSION | Format empty_as_default, default value: 1 | UInt64 |",
Expand All @@ -44,7 +43,7 @@ async fn test_settings_table() -> Result<()> {
"| group_by_two_level_threshold | 10000 | 10000 | SESSION | The threshold of keys to open two-level aggregation, default value: 10000 | UInt64 |",
"| max_block_size | 10000 | 10000 | SESSION | Maximum block size for reading | UInt64 |",
"| max_threads | 2 | 16 | SESSION | The maximum number of threads to execute the request. By default, it is determined automatically. | UInt64 |",
"| record_delimiter | | | SESSION | Format record_delimiter, default value: | String |",
"| record_delimiter | \"\\n\" | \"\\n\" | SESSION | Format record_delimiter, default value: \"\\n\" | String |",
"| skip_header | 0 | 0 | SESSION | Whether to skip the input header, default value: 0 | UInt64 |",
"| storage_read_buffer_size | 1048576 | 1048576 | SESSION | The size of buffer in bytes for buffered reader of dal. By default, it is 1MB. | UInt64 |",
"| timezone | UTC | UTC | SESSION | Timezone, default value: UTC, | String |",
Expand Down
2 changes: 1 addition & 1 deletion tests/suites/0_stateless/06_show/06_0003_show_settings.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ flight_client_timeout 60 60 SESSION Max duration the flight client request is al
group_by_two_level_threshold 10000 10000 SESSION The threshold of keys to open two-level aggregation, default value: 10000 UInt64
max_block_size 10000 10000 SESSION Maximum block size for reading UInt64
max_threads 11 16 SESSION The maximum number of threads to execute the request. By default, it is determined automatically. UInt64
record_delimiter \n \n SESSION Format record_delimiter, default value: \n String
record_delimiter "\\n" "\\n" SESSION Format record_delimiter, default value: "\\n" String
skip_header 0 0 SESSION Whether to skip the input header, default value: 0 UInt64
storage_read_buffer_size 1048576 1048576 SESSION The size of buffer in bytes for buffered reader of dal. By default, it is 1MB. UInt64
timezone UTC UTC SESSION Timezone, default value: UTC, String
Expand Down
2 changes: 1 addition & 1 deletion tests/suites/0_stateless/06_show/06_0003_show_settings_v2.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ flight_client_timeout 60 60 SESSION Max duration the flight client request is al
group_by_two_level_threshold 10000 10000 SESSION The threshold of keys to open two-level aggregation, default value: 10000 UInt64
max_block_size 10000 10000 SESSION Maximum block size for reading UInt64
max_threads 11 16 SESSION The maximum number of threads to execute the request. By default, it is determined automatically. UInt64
record_delimiter \n \n SESSION Format record_delimiter, default value: \n String
record_delimiter "\\n" "\\n" SESSION Format record_delimiter, default value: "\\n" String
skip_header 0 0 SESSION Whether to skip the input header, default value: 0 UInt64
storage_read_buffer_size 1048576 1048576 SESSION The size of buffer in bytes for buffered reader of dal. By default, it is 1MB. UInt64
timezone UTC UTC SESSION Timezone, default value: UTC, String
Expand Down