rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-07 05:42:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: partition column with mixed quoted and unquoted idents (#4491)

Browse Source 
* fix: partition column with mixed quoted and unquoted idents

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* update error message

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

---------

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2024-08-02 17:06:31 +08:00
committed by GitHub
parent ded874da04
commit fe1cfbf2b3
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/sql/src/parsers/create_parser.rs
View File

@@ -950,7 +950,7 @@ fn ensure_exprs_are_binary(exprs: &[Expr], columns: &[&Column]) -> Result<()> {
ensure_one_expr(right, columns)?; ensure_one_expr(right, columns)?;
} else { } else {
return error::InvalidSqlSnafu { return error::InvalidSqlSnafu {
msg: format!("Partition rule expr {:?} is not a binary expr!", expr), msg: format!("Partition rule expr {:?} is not a binary expr", expr),
} }
.fail(); .fail();
} }
@@ -974,7 +974,7 @@ fn ensure_one_expr(expr: &Expr, columns: &[&Column]) -> Result<()> {
columns.iter().any(|c| &c.name().value == column_name), columns.iter().any(|c| &c.name().value == column_name),
error::InvalidSqlSnafu { error::InvalidSqlSnafu {
msg: format!( msg: format!(
"Column {:?} in rule expr is not referenced in PARTITION ON!", "Column {:?} in rule expr is not referenced in PARTITION ON",
column_name column_name
), ),
} }
@@ -987,7 +987,7 @@ fn ensure_one_expr(expr: &Expr, columns: &[&Column]) -> Result<()> {
Ok(()) Ok(())
} }
_ => error::InvalidSqlSnafu { _ => error::InvalidSqlSnafu {
msg: format!("Partition rule expr {:?} is not a binary expr!", expr), msg: format!("Partition rule expr {:?} is not a binary expr", expr),
} }
.fail(), .fail(),
} }
@@ -1002,13 +1002,14 @@ fn ensure_partition_columns_defined<'a>(
.column_list .column_list
.iter() .iter()
.map(|x| { .map(|x| {
let x = ParserContext::canonicalize_identifier(x.clone());
// Normally the columns in "create table" won't be too many, // Normally the columns in "create table" won't be too many,
// a linear search to find the target every time is fine. // a linear search to find the target every time is fine.
columns columns
.iter() .iter()
.find(|c| c.name() == x) .find(|c| *c.name().value == x.value)
.context(error::InvalidSqlSnafu { .context(error::InvalidSqlSnafu {
msg: format!("Partition column {:?} not defined!", x.value), msg: format!("Partition column {:?} not defined", x.value),
}) })
}) })
.collect::<Result<Vec<&Column>>>() .collect::<Result<Vec<&Column>>>()
@@ -1320,7 +1321,7 @@ ENGINE=mito";
assert!(result assert!(result
.unwrap_err() .unwrap_err()
.to_string() .to_string()
.contains("Partition column \"x\" not defined!")); .contains("Partition column \"x\" not defined"));
} }
#[test] #[test]
@@ -1447,6 +1448,30 @@ ENGINE=mito";
} }
} }
#[test]
fn test_parse_create_table_with_quoted_partitions() {
let sql = r"
CREATE TABLE monitor (
`host_id` INT,
idc STRING,
ts TIMESTAMP,
cpu DOUBLE DEFAULT 0,
memory DOUBLE,
TIME INDEX (ts),
PRIMARY KEY (host),
)
PARTITION ON COLUMNS(IdC, host_id) (
idc <= 'hz' AND host_id < 1000,
idc > 'hz' AND idc <= 'sh' AND host_id < 2000,
idc > 'sh' AND host_id < 3000,
idc > 'sh' AND host_id >= 3000,
)";
let result =
ParserContext::create_with_dialect(sql, &GreptimeDbDialect {}, ParseOptions::default())
.unwrap();
assert_eq!(result.len(), 1);
}
#[test] #[test]
fn test_parse_create_table_with_timestamp_index() { fn test_parse_create_table_with_timestamp_index() {
let sql1 = r" let sql1 = r"
@@ -1728,7 +1753,7 @@ ENGINE=mito";
ParserContext::create_with_dialect(sql, &GreptimeDbDialect {}, ParseOptions::default()); ParserContext::create_with_dialect(sql, &GreptimeDbDialect {}, ParseOptions::default());
assert_eq!( assert_eq!(
result.unwrap_err().output_msg(), result.unwrap_err().output_msg(),
"Invalid SQL, error: Column \"b\" in rule expr is not referenced in PARTITION ON!" "Invalid SQL, error: Column \"b\" in rule expr is not referenced in PARTITION ON"
); );
} }
@@ -1744,7 +1769,7 @@ ENGINE=mito";
ParserContext::create_with_dialect(sql, &GreptimeDbDialect {}, ParseOptions::default()); ParserContext::create_with_dialect(sql, &GreptimeDbDialect {}, ParseOptions::default());
assert_eq!( assert_eq!(
result.unwrap_err().output_msg(), result.unwrap_err().output_msg(),
"Invalid SQL, error: Partition rule expr Identifier(Ident { value: \"b\", quote_style: None }) is not a binary expr!" "Invalid SQL, error: Partition rule expr Identifier(Ident { value: \"b\", quote_style: None }) is not a binary expr"
); );
} }