Skip to content

fix(pgwire): classify the streamed and DDL shaping failures #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
EnRaiha wants to merge 1 commit into from
Closed

fix(pgwire): classify the streamed and DDL shaping failures #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions nodedb/src/control/server/pgwire/handler/stream_response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use crate::control::state::SharedState;
use crate::data::executor::response_codec::{decode_payload_to_json, decode_payload_value};

use super::super::ddl_encode::col_type_to_field_with_format;
use super::super::types::{error_to_sqlstate, text_field};
use super::super::types::{error_to_sqlstate, shaping_error_message, text_field};
use super::shape_encode::{encode_shaped_row, shaped_query_response};

/// The per-request plumbing a lazily-streamed pgwire response owns for its
Expand Down Expand Up @@ -215,10 +215,13 @@ pub(crate) fn streaming_shaped_response(
}

let value = decode_payload_value(&batch.payload).map_err(|e| {
let (severity, code, message) = error_to_sqlstate(&e);
let message =
shaping_error_message(crate::error_classify::classify(&e).code(), message);
PgWireError::UserError(Box::new(ErrorInfo::new(
"ERROR".to_owned(),
"XX000".to_owned(),
format!("failed to decode streamed batch: {e}"),
severity.to_owned(),
code.to_owned(),
format!("failed to decode streamed batch: {message}"),
)))
})?;
// Resolved once before the first batch was pulled; this only
Expand All @@ -233,10 +236,13 @@ pub(crate) fn streaming_shaped_response(
None,
)
.map_err(|e| {
let (severity, code, message) = error_to_sqlstate(&e);
let message =
shaping_error_message(crate::error_classify::classify(&e).code(), message);
PgWireError::UserError(Box::new(ErrorInfo::new(
"ERROR".to_owned(),
"XX000".to_owned(),
format!("failed to shape streamed batch: {e}"),
severity.to_owned(),
code.to_owned(),
format!("failed to shape streamed batch: {message}"),
)))
})?;
for row in &shaped.rows {
Expand Down Expand Up @@ -349,10 +355,13 @@ pub(crate) async fn streaming_star_response(
) {
Ok(s) => s,
Err(e) => {
let (severity, code, message) = error_to_sqlstate(&e);
let message =
shaping_error_message(crate::error_classify::classify(&e).code(), message);
return single_pgwire_error(PgWireError::UserError(Box::new(ErrorInfo::new(
"ERROR".to_owned(),
"XX000".to_owned(),
format!("failed to shape streamed batch: {e}"),
severity.to_owned(),
code.to_owned(),
format!("failed to shape streamed batch: {message}"),
))));
}
};
Expand Down
11 changes: 9 additions & 2 deletions nodedb/src/control/server/shared/ddl/neutral/collection/dml/parse/dispatch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ use crate::control::security::audit::ArcAuditEmitter;
use crate::control::security::identity::{AuthenticatedIdentity, Permission};
use crate::control::security::request_scope::RequestAuthScope;
use crate::control::sequence::SessionSequenceAccess;
use crate::control::server::pgwire::types::error_to_sqlstate;
use crate::control::server::pgwire::types::{
error_to_sqlstate, numeric_code_to_sqlstate, shaping_error_message,
};
use crate::control::server::response_shape::compose::{ShapeOutcome, shape_response_materialized};
use crate::control::server::response_shape::redaction::QueryRedaction;
use crate::control::server::response_shape::request::MaterializedShapeRequest;
Expand Down Expand Up @@ -443,7 +445,12 @@ pub(in crate::control::server::shared::ddl::neutral::collection) async fn plan_a
redaction: Some(redaction.ctx(&state.redaction)),
sequences: Some(&sequences),
})
.map_err(|error| ddl_err("XX000", error.message().to_string()))?;
.map_err(|error| {
ddl_err(
numeric_code_to_sqlstate(error.code()),
shaping_error_message(error.code(), error.message()),
)
})?;
// Folded rather than pushed: a statement is ONE result set, however
// many tasks it planned to.
if let ShapeOutcome::Rows(shaped) = outcome {
Expand Down
Loading