summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/backend/pgxc/pool/execRemote.c78
-rw-r--r--src/include/pgxc/execRemote.h1
2 files changed, 31 insertions, 48 deletions
diff --git a/src/backend/pgxc/pool/execRemote.c b/src/backend/pgxc/pool/execRemote.c
index beed69527c..d6c9e7176e 100644
--- a/src/backend/pgxc/pool/execRemote.c
+++ b/src/backend/pgxc/pool/execRemote.c
@@ -363,6 +363,7 @@ CreateResponseCombiner(int node_count, CombineType combine_type)
combiner->copy_file = NULL;
combiner->errorMessage = NULL;
combiner->errorDetail = NULL;
+ combiner->errorHint = NULL;
combiner->tuple_desc = NULL;
#ifdef XCP
combiner->probing_primary = false;
@@ -987,6 +988,7 @@ HandleError(RemoteQueryState *combiner, char *msg_body, size_t len)
char *code = NULL;
char *message = NULL;
char *detail = NULL;
+ char *hint = NULL;
int offset = 0;
/*
@@ -1009,10 +1011,13 @@ HandleError(RemoteQueryState *combiner, char *msg_body, size_t len)
detail = str;
break;
+ case 'H': /* hint */
+ hint = str;
+ break;
+
/* Fields not yet in use */
case 'S': /* severity */
case 'R': /* routine */
- case 'H': /* hint */
case 'P': /* position string */
case 'p': /* position int */
case 'q': /* int query */
@@ -1050,6 +1055,8 @@ HandleError(RemoteQueryState *combiner, char *msg_body, size_t len)
memcpy(combiner->errorCode, code, 5);
if (detail)
combiner->errorDetail = pstrdup(detail);
+ if (hint)
+ combiner->errorHint = pstrdup(hint);
}
/*
@@ -1245,6 +1252,8 @@ CloseCombiner(ResponseCombiner *combiner)
pfree(combiner->errorMessage);
if (combiner->errorDetail)
pfree(combiner->errorDetail);
+ if (combiner->errorHint)
+ pfree(combiner->errorHint);
if (combiner->cursor_connections)
pfree(combiner->cursor_connections);
if (combiner->tapenodes)
@@ -4681,17 +4690,7 @@ DataNodeCopyFinish(PGXCNodeHandle** copy_connections, int primary_dn_index, Comb
if (!validate_combiner(&combiner) || error)
{
if (combiner.errorMessage)
- {
- char *code = combiner.errorCode;
- if (combiner.errorDetail)
- ereport(ERROR,
- (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner.errorMessage), errdetail("%s", combiner.errorDetail) ));
- else
- ereport(ERROR,
- (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner.errorMessage)));
- }
+ pgxc_node_report_error(&combiner);
else
ereport(ERROR,
(errcode(ERRCODE_INTERNAL_ERROR),
@@ -7571,17 +7570,7 @@ ExecRemoteQuery(RemoteQueryState *node)
errmsg("Unexpected response from data node")));
}
if (combiner->errorMessage)
- {
- char *code = combiner->errorCode;
- if (combiner->errorDetail != NULL)
- ereport(ERROR,
- (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner->errorMessage), errdetail("%s", combiner->errorDetail) ));
- else
- ereport(ERROR,
- (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner->errorMessage)));
- }
+ pgxc_node_report_error(combiner);
}
for (i = 0; i < regular_conn_count; i++)
@@ -7663,17 +7652,7 @@ ExecRemoteQuery(RemoteQueryState *node)
}
if (combiner->errorMessage)
- {
- char *code = combiner->errorCode;
- if (combiner->errorDetail != NULL)
- ereport(ERROR,
- (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner->errorMessage), errdetail("%s", combiner->errorDetail) ));
- else
- ereport(ERROR,
- (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner->errorMessage)));
- }
+ pgxc_node_report_error(combiner);
return NULL;
}
@@ -8975,17 +8954,8 @@ primary_mode_phase_two:
goto primary_mode_phase_two;
}
if (combiner->errorMessage)
- {
- char *code = combiner->errorCode;
- if (combiner->errorDetail)
- ereport(ERROR,
- (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner->errorMessage), errdetail("%s", combiner->errorDetail) ));
- else
- ereport(ERROR,
- (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner->errorMessage)));
- }
+ pgxc_node_report_error(combiner);
+
return NULL;
}
@@ -9227,14 +9197,26 @@ pgxc_node_report_error(RemoteQueryState *combiner)
if (combiner->errorMessage)
{
char *code = combiner->errorCode;
- if (combiner->errorDetail != NULL)
+ if ((combiner->errorDetail == NULL) && (combiner->errorHint == NULL))
+ ereport(ERROR,
+ (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
+ errmsg("%s", combiner->errorMessage)));
+ else if ((combiner->errorDetail != NULL) && (combiner->errorHint != NULL))
+ ereport(ERROR,
+ (errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
+ errmsg("%s", combiner->errorMessage),
+ errdetail("%s", combiner->errorDetail),
+ errhint("%s", combiner->errorHint)));
+ else if (combiner->errorDetail != NULL)
ereport(ERROR,
(errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner->errorMessage), errdetail("%s", combiner->errorDetail) ));
+ errmsg("%s", combiner->errorMessage),
+ errdetail("%s", combiner->errorDetail)));
else
ereport(ERROR,
(errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
- errmsg("%s", combiner->errorMessage)));
+ errmsg("%s", combiner->errorMessage),
+ errhint("%s", combiner->errorHint)));
}
}
diff --git a/src/include/pgxc/execRemote.h b/src/include/pgxc/execRemote.h
index d596f95efc..3f4d19e858 100644
--- a/src/include/pgxc/execRemote.h
+++ b/src/include/pgxc/execRemote.h
@@ -127,6 +127,7 @@ typedef struct RemoteQueryState
char errorCode[5]; /* error code to send back to client */
char *errorMessage; /* error message to send back to client */
char *errorDetail; /* error detail to send back to client */
+ char *errorHint; /* error hint to send back to client */
#ifdef XCP
Oid returning_node; /* returning replicated node */
RemoteDataRow currentRow; /* next data ro to be wrapped into a tuple */
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-15 23:48:09 +0000