Skip to content

Commit 608f08a

Browse files
authored
Merge branch 'main' into union-all
2 parents 4b0556a + ca7d1d9 commit 608f08a

3 files changed

Lines changed: 2 additions & 4 deletions

File tree

src/query/ast/tests/it/testdata/stmt-error.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ error:
9696
1 | create table a (c1 decimal(38), c2 int) partition by ();
9797
| ------ ^
9898
| | |
99-
| | expecting `<LiteralString>`, '<LiteralCodeString>', '<LiteralInteger>', '<LiteralFloat>', 'TRUE', 'FALSE', or more ...
99+
| | unexpected `)`, expecting <Ident>, <LiteralString>, `IDENTIFIER`, <LiteralCodeString>, <LiteralInteger>, <LiteralFloat>, <MySQLLiteralHex>, <PGLiteralHex>, `TRUE`, `FALSE`, or `NULL`
100100
| | while parsing expression
101101
| while parsing `CREATE [OR REPLACE] TABLE [IF NOT EXISTS] [<database>.]<table> [<source>] [<table_options>]`
102102

src/query/expression/src/filter/volnitsky.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl<'a> VolnitskyBase<'a> {
5555
let hash = if !fallback {
5656
let mut hash = Box::new([0; HASH_SIZE]);
5757
for i in (0..=needle_size - mem::size_of::<NGram>()).rev() {
58-
let ngram = Self::to_ngram(&needle[i..i + 1]);
58+
let ngram = Self::to_ngram(&needle[i..i + mem::size_of::<NGram>()]);
5959
Self::put_ngram(hash.as_mut(), ngram, i as u8 + 1);
6060
}
6161
Some(hash)

tests/suites/1_stateful/02_query/02_0011_explain_analyze_part_info.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@
3030

3131
for sql in prepare_sqls:
3232
mycursor.execute(sql)
33-
res = mycursor.fetchall()
3433

3534
for i in range(10):
3635
mycursor.execute(f"insert into test_explain_analyze_0011_1 values ({i})")
37-
res = mycursor.fetchall()
3836

3937
def explain_output(res):
4038
cnt = 0

0 commit comments

Comments
 (0)