refactor: adjust outermost error message (#859)

* refactor: adjust outermost error message

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

* fix clippy

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

* preserve tonic status code

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

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2023-01-10 17:28:27 +08:00
committed by GitHub
parent 5fb417ec7c
commit 32d51947a4
9 changed files with 49 additions and 24 deletions

View File

@@ -24,13 +24,13 @@ select 4 + 0.5;
select "a";
Failed to do Flight get, addr: 127.0.0.1:4001, code: 3000, err_msg: Failed to execute sql statement, source: Failed to execute sql, source: Failure during query planning, source: Cannot plan SQL: SELECT "a", source: Schema error: No field named 'a'. Valid fields are .
Error: 3000(PlanQuery), Schema error: No field named 'a'. Valid fields are .
select "A";
Failed to do Flight get, addr: 127.0.0.1:4001, code: 3000, err_msg: Failed to execute sql statement, source: Failed to execute sql, source: Failure during query planning, source: Cannot plan SQL: SELECT "A", source: Schema error: No field named 'A'. Valid fields are .
Error: 3000(PlanQuery), Schema error: No field named 'A'. Valid fields are .
select * where "a" = "A";
Failed to do Flight get, addr: 127.0.0.1:4001, code: 3000, err_msg: Failed to execute sql statement, source: Failed to execute sql, source: Failure during query planning, source: Cannot plan SQL: SELECT * WHERE "a" = "A", source: Schema error: No field named 'a'. Valid fields are .
Error: 3000(PlanQuery), Schema error: No field named 'a'. Valid fields are .

View File

@@ -8,6 +8,7 @@ license.workspace = true
async-trait = "0.1"
client = { path = "../../src/client" }
common-base = { path = "../../src/common/base" }
common-error = { path = "../../src/common/error" }
common-grpc = { path = "../../src/common/grpc" }
common-query = { path = "../../src/common/query" }
sqlness = "0.1"

View File

@@ -20,6 +20,8 @@ use std::time::Duration;
use async_trait::async_trait;
use client::{Client, Database as DB, Error as ClientError};
use common_error::ext::ErrorExt;
use common_error::snafu::ErrorCompat;
use common_query::Output;
use sqlness::{Database, EnvController};
use tokio::process::{Child, Command};
@@ -140,7 +142,15 @@ impl Display for ResultDisplayer {
}
Output::Stream(_) => unreachable!(),
},
Err(e) => write!(f, "{e}"),
Err(e) => {
let status_code = e.status_code();
let root_cause = e.iter_chain().last().unwrap();
write!(
f,
"Error: {}({status_code}), {root_cause}",
status_code as u32
)
}
}
}
}