This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 9db96b0c4b8 Fix compile errors for utils/error
9db96b0c4b8 is described below
commit 9db96b0c4b8787ae333e5c3c935632090e71cc1f
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Oct 6 17:29:18 2025 +0800
Fix compile errors for utils/error
---
src/backend/utils/error/assert.c | 7 +++----
src/backend/utils/error/elog.c | 11 -----------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 288f8036fbe..d25086020f7 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -38,8 +38,7 @@ ExceptionalCondition(const char *conditionName,
{
/* CDB: Try to tell the QD or client what happened. */
if (!PointerIsValid(conditionName)
- || !PointerIsValid(fileName)
- || !PointerIsValid(errorType))
+ || !PointerIsValid(fileName))
ereport(FATAL,
errFatalReturn(gp_reraise_signal),
errmsg("TRAP: ExceptionalCondition: bad
arguments"));
@@ -47,8 +46,8 @@ ExceptionalCondition(const char *conditionName,
ereport(FATAL,
errFatalReturn(gp_reraise_signal),
errmsg("Unexpected internal error"),
- errdetail("%s(\"%s\", File: \"%s\", Line:
%d)\n",
- errorType, conditionName,
fileName, lineNumber));
+ errdetail("(\"%s\", File: \"%s\", Line: %d)\n",
+ conditionName, fileName,
lineNumber));
/* Usually this shouldn't be needed, but make sure the msg went out */
fflush(stderr);
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 0ae505131c9..4dba38666c0 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -247,9 +247,6 @@ ignore_returned_result(long long int result)
(void) result;
}
-static void setup_formatted_log_time(void);
-static void setup_formatted_start_time(void);
-
/*
* is_log_level_output -- is elevel logically >= log_min_level?
@@ -4838,13 +4835,6 @@ write_pipe_chunks(char *data, int len, int dest)
p.hdr.log_format = (dest == LOG_DESTINATION_CSVLOG ? 'c' : 't');
p.hdr.is_segv_msg = 'f';
p.hdr.next = -1;
- p.proto.flags = 0;
- if (dest == LOG_DESTINATION_STDERR)
- p.proto.flags |= PIPE_PROTO_DEST_STDERR;
- else if (dest == LOG_DESTINATION_CSVLOG)
- p.proto.flags |= PIPE_PROTO_DEST_CSVLOG;
- else if (dest == LOG_DESTINATION_JSONLOG)
- p.proto.flags |= PIPE_PROTO_DEST_JSONLOG;
/* write all but the last chunk */
while (len > PIPE_MAX_PAYLOAD)
@@ -4877,7 +4867,6 @@ write_pipe_chunks(char *data, int len, int dest)
#endif
memcpy(p.data, data, len);
ignore_returned_result(write(fd, &p, PIPE_HEADER_SIZE + len));
- p.proto.flags |= PIPE_PROTO_IS_LAST;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
