fix: add missing error display message (#2791)

* fix: add missing error display message

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

* update sqlness result

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

---------

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2023-11-23 10:59:49 +08:00
committed by GitHub
parent 4c76d4d97e
commit 56fc77e573
30 changed files with 136 additions and 186 deletions

View File

@@ -180,7 +180,7 @@ pub enum Error {
source: table::error::Error,
},
#[snafu(display(""))]
#[snafu(display("Internal error"))]
Internal {
location: Location,
source: BoxedError,
@@ -216,7 +216,7 @@ pub enum Error {
#[snafu(display("Illegal access to catalog: {} and schema: {}", catalog, schema))]
QueryAccessDenied { catalog: String, schema: String },
#[snafu(display(""))]
#[snafu(display("DataFusion error"))]
Datafusion {
#[snafu(source)]
error: DataFusionError,

View File

@@ -44,7 +44,7 @@ pub enum Error {
source: common_meta::error::Error,
},
#[snafu(display(""))]
#[snafu(display("External error"))]
External {
location: Location,
source: BoxedError,
@@ -170,7 +170,7 @@ pub enum Error {
source: query::error::Error,
},
#[snafu(display(""))]
#[snafu(display("Operation to region server failed"))]
InvokeRegionServer {
location: Location,
source: servers::error::Error,

View File

@@ -25,7 +25,7 @@ use snafu::{Location, Snafu};
#[snafu(visibility(pub))]
#[stack_trace_debug]
pub enum InnerError {
#[snafu(display(""))]
#[snafu(display("DataFusion error"))]
Datafusion {
#[snafu(source)]
error: DataFusionError,

View File

@@ -121,7 +121,7 @@ pub enum Error {
location: Location,
},
#[snafu(display(""))]
#[snafu(display("DataFusion error"))]
DataFusion {
#[snafu(source)]
error: DataFusionError,
@@ -140,7 +140,7 @@ pub enum Error {
source: sql::error::Error,
},
#[snafu(display(""))]
#[snafu(display("Failed to plan SQL"))]
PlanSql {
#[snafu(source)]
error: DataFusionError,

View File

@@ -76,7 +76,7 @@ pub enum Error {
error: ArrowError,
},
#[snafu(display(""))]
#[snafu(display("DataFusion error"))]
DataFusion {
location: SnafuLocation,
#[snafu(source)]

View File

@@ -339,8 +339,12 @@ pub enum Error {
source: crate::http::pprof::nix::Error,
},
#[snafu(display(""))]
Metrics { source: BoxedError },
#[snafu(display("Failed to update jemalloc metrics"))]
UpdateJemallocMetrics {
#[snafu(source)]
error: tikv_jemalloc_ctl::Error,
location: Location,
},
#[snafu(display("DataFrame operation error"))]
DataFrame {
@@ -408,7 +412,8 @@ impl ErrorExt for Error {
| TcpIncoming { .. }
| CatalogError { .. }
| GrpcReflectionService { .. }
| BuildHttpResponse { .. } => StatusCode::Internal,
| BuildHttpResponse { .. }
| UpdateJemallocMetrics { .. } => StatusCode::Internal,
CollectRecordbatch { .. } => StatusCode::EngineExecuteQuery,
@@ -479,8 +484,6 @@ impl ErrorExt for Error {
#[cfg(feature = "pprof")]
DumpPprof { source, .. } => source.status_code(),
Metrics { source } => source.status_code(),
ConvertScalarValue { source, .. } => source.status_code(),
ToJson { .. } => StatusCode::Internal,

View File

@@ -12,10 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
mod error;
use common_telemetry::error;
use error::UpdateJemallocMetricsSnafu;
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
use prometheus::*;
@@ -23,6 +20,8 @@ use snafu::ResultExt;
use tikv_jemalloc_ctl::stats::{allocated_mib, resident_mib};
use tikv_jemalloc_ctl::{epoch, epoch_mib, stats};
use crate::error::UpdateJemallocMetricsSnafu;
lazy_static! {
pub static ref SYS_JEMALLOC_RESIDEN: IntGauge = register_int_gauge!(
"sys_jemalloc_resident",

View File

@@ -1,52 +0,0 @@
// Copyright 2023 Greptime Team
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
use std::any::Any;
use common_error::ext::{BoxedError, ErrorExt};
use common_error::status_code::StatusCode;
use common_macro::stack_trace_debug;
use snafu::{Location, Snafu};
#[derive(Snafu)]
#[snafu(visibility(pub))]
#[stack_trace_debug]
pub enum Error {
#[snafu(display("Failed to update jemalloc metrics"))]
UpdateJemallocMetrics {
#[snafu(source)]
error: tikv_jemalloc_ctl::Error,
location: Location,
},
}
impl ErrorExt for Error {
fn status_code(&self) -> StatusCode {
match self {
Error::UpdateJemallocMetrics { .. } => StatusCode::Internal,
}
}
fn as_any(&self) -> &dyn Any {
self
}
}
impl From<Error> for crate::error::Error {
fn from(e: Error) -> Self {
Self::Metrics {
source: BoxedError::new(e),
}
}
}

View File

@@ -30,7 +30,7 @@ pub type Result<T> = std::result::Result<T, Error>;
#[snafu(visibility(pub))]
#[stack_trace_debug]
pub enum Error {
#[snafu(display(""))]
#[snafu(display("DataFusion error"))]
Datafusion {
#[snafu(source)]
error: DataFusionError,