rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-21 23:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: change error messages (#2379)

Browse Source 
* chore: change error messages

* chore: remove locaton in table not found error msg
This commit is contained in:
dennis zhuang
2023-09-13 16:21:03 +08:00
committed by GitHub
parent 3f97a0d285
commit 7448e975c2
6 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontend/src/delete.rs
View File

@@ -237,12 +237,19 @@ fn validate_column_count_match(requests: &RowDeleteRequests) -> Result<()> {
for request in &requests.deletes {
let rows = request.rows.as_ref().unwrap();
let column_count = rows.schema.len();
ensure!(
rows.rows.iter().all(|r| r.values.len() == column_count),
InvalidDeleteRequestSnafu {
reason: "column count mismatch"
}
)
rows.rows.iter().try_for_each(|r| {
ensure!(
r.values.len() == column_count,
InvalidDeleteRequestSnafu {
reason: format!(
"column count mismatch, columns: {}, values: {}",
column_count,
r.values.len()
)
}
);
Ok(())
})?;
}
Ok(())
}

7
src/frontend/src/error.rs
View File

@@ -176,11 +176,8 @@ pub enum Error {
#[snafu(display("Invalid system table definition: {err_msg}, at {location}"))]
InvalidSystemTableDef { err_msg: String, location: Location },
#[snafu(display("Table not found: '{}', at {location}", table_name))]
TableNotFound {
table_name: String,
location: Location,
},
#[snafu(display("Table not found: {}", table_name))]
TableNotFound { table_name: String },
#[snafu(display("Failed to join task, source: {}", source))]
JoinTask {

19
src/frontend/src/insert.rs
View File

@@ -331,12 +331,19 @@ fn validate_column_count_match(requests: &RowInsertRequests) -> Result<()> {
for request in &requests.inserts {
let rows = request.rows.as_ref().unwrap();
let column_count = rows.schema.len();
ensure!(
rows.rows.iter().all(|r| r.values.len() == column_count),
InvalidInsertRequestSnafu {
reason: "column count mismatch"
}
)
rows.rows.iter().try_for_each(|r| {
ensure!(
r.values.len() == column_count,
InvalidInsertRequestSnafu {
reason: format!(
"column count mismatch, columns: {}, values: {}",
column_count,
r.values.len()
)
}
);
Ok(())
})?;
}
Ok(())
}

19
src/frontend/src/req_convert/insert/stmt_to_region.rs
View File

@@ -65,12 +65,19 @@ impl<'a> StatementToRegion<'a> {
let sql_rows = stmt.values_body().context(MissingInsertBodySnafu)?;
let row_count = sql_rows.len();
ensure!(
sql_rows.iter().all(|row| row.len() == column_count),
InvalidSqlSnafu {
err_msg: "column count mismatch"
}
);
sql_rows.iter().try_for_each(|r| {
ensure!(
r.len() == column_count,
InvalidSqlSnafu {
err_msg: format!(
"column count mismatch, columns: {}, values: {}",
column_count,
r.len()
)
}
);
Ok(())
})?;
let mut schema = Vec::with_capacity(column_count);
let mut rows = vec![

4
tests/cases/standalone/common/insert/insert_default.result
View File

@@ -4,7 +4,7 @@ Affected Rows: 0
INSERT INTO test1 VALUES (DEFAULT);
Error: 1004(InvalidArguments), Columns and values number mismatch, columns: 3, values: 1
Error: 1004(InvalidArguments), Invalid SQL, error: column count mismatch, columns: 3, values: 1
INSERT INTO test1 VALUES (DEFAULT, DEFAULT, DEFAULT);
@@ -12,7 +12,7 @@ Error: 1004(InvalidArguments), No valid default value can be built automatically
INSERT INTO test1 VALUES (DEFAULT, DEFAULT, DEFAULT, DEFAULT);
Error: 1004(InvalidArguments), Columns and values number mismatch, columns: 3, values: 4
Error: 1004(InvalidArguments), Invalid SQL, error: column count mismatch, columns: 3, values: 4
INSERT INTO test1 VALUES (DEFAULT, 1, DEFAULT), (default, 2, default), (DeFaUlT, 3, DeFaUlT), (dEfAuLt, 4, dEfAuLt);

8
tests/cases/standalone/common/insert/insert_invalid.result
View File

@@ -28,19 +28,19 @@ Affected Rows: 1
INSERT INTO a VALUES (1);
Error: 1004(InvalidArguments), Columns and values number mismatch, columns: 2, values: 1
Error: 1004(InvalidArguments), Invalid SQL, error: column count mismatch, columns: 2, values: 1
INSERT INTO a VALUES (1,2,3);
Error: 1004(InvalidArguments), Columns and values number mismatch, columns: 2, values: 3
Error: 1004(InvalidArguments), Invalid SQL, error: column count mismatch, columns: 2, values: 3
INSERT INTO a VALUES (1,2),(3);
Error: 1004(InvalidArguments), Columns and values number mismatch, columns: 2, values: 1
Error: 1004(InvalidArguments), Invalid SQL, error: column count mismatch, columns: 2, values: 1
INSERT INTO a VALUES (1,2),(3,4,5);
Error: 1004(InvalidArguments), Columns and values number mismatch, columns: 2, values: 3
Error: 1004(InvalidArguments), Invalid SQL, error: column count mismatch, columns: 2, values: 3
DROP TABLE strings;