Skip to content

Commit 05157d8

Browse files
authored
Merge branch 'main' into fix_topk
2 parents 8d48d47 + ae9720f commit 05157d8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/query/pipeline/sources/src/processors/sources/input_formats/impls/input_format_tsv.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ pub struct InputFormatTSV {}
3737
impl InputFormatTSV {
3838
#[allow(clippy::too_many_arguments)]
3939
fn read_row(
40+
field_delimiter: u8,
4041
field_decoder: &FieldDecoderTSV,
4142
buf: &[u8],
4243
deserializers: &mut Vec<common_datavalues::TypeDeserializerImpl>,
@@ -53,7 +54,7 @@ impl InputFormatTSV {
5354
let mut err_msg = None;
5455
let buf_len = buf.len();
5556
while pos <= buf_len {
56-
if pos == buf_len || buf[pos] == b'\t' {
57+
if pos == buf_len || buf[pos] == field_delimiter {
5758
let col_data = &buf[field_start..pos];
5859
if col_data.is_empty() {
5960
deserializers[column_index].de_default();
@@ -156,6 +157,7 @@ impl InputFormatTextBase for InputFormatTSV {
156157
for (i, end) in batch.row_ends.iter().enumerate() {
157158
let buf = &batch.data[start..*end]; // include \n
158159
Self::read_row(
160+
builder.ctx.field_delimiter,
159161
field_decoder,
160162
buf,
161163
columns,

src/query/service/src/servers/mysql/mysql_federated.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,14 @@ impl MySQLFederated {
242242
None,
243243
),
244244
("(?i)^(/\\* ApplicationName=(.*)SHOW VARIABLES(.*))", None),
245-
// pt-toolkit
246-
("(?i)^(/\\*!40101 SET(.*) \\*/)$", None),
247245
// mysqldump 5.7.16
248246
("(?i)^(/\\*!40100 SET(.*) \\*/)$", None),
249247
("(?i)^(/\\*!40103 SET(.*) \\*/)$", None),
250248
("(?i)^(/\\*!40111 SET(.*) \\*/)$", None),
251249
("(?i)^(/\\*!40101 SET(.*) \\*/)$", None),
252250
("(?i)^(/\\*!40014 SET(.*) \\*/)$", None),
253251
("(?i)^(/\\*!40000 SET(.*) \\*/)$", None),
252+
("(?i)^(/\\*!40000 ALTER(.*) \\*/)$", None),
254253
];
255254

256255
FederatedHelper::block_match_rule(query, rules)

0 commit comments

Comments
 (0)