From f06156da18f67bc2c904c0a76b70dafcb14ca7c2 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 16 May 2023 11:47:25 +0200 Subject: [PATCH] Mark internal messages as no longer translatable The problem that these messages protect against can only occur because a corrupted hash spill file was written, i.e., a Postgres bug. There's no reason to have them as translatable. Backpatch to 15, where these messages were changed by commit c4649cce39a4. Reviewed-by: Daniel Gustafsson Discussion: https://postgr.es/m/20230510175407.dwa5v477pw62ikyx@alvherre.pgsql --- src/backend/executor/nodeAgg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index d1ec337b30..2229c7a756 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -3003,8 +3003,8 @@ hashagg_batch_read(HashAggBatch *batch, uint32 *hashp) if (nread != sizeof(uint32)) ereport(ERROR, (errcode_for_file_access(), - errmsg("unexpected EOF for tape %p: requested %zu bytes, read %zu bytes", - tape, sizeof(uint32), nread))); + errmsg_internal("unexpected EOF for tape %p: requested %zu bytes, read %zu bytes", + tape, sizeof(uint32), nread))); if (hashp != NULL) *hashp = hash; @@ -3012,8 +3012,8 @@ hashagg_batch_read(HashAggBatch *batch, uint32 *hashp) if (nread != sizeof(uint32)) ereport(ERROR, (errcode_for_file_access(), - errmsg("unexpected EOF for tape %p: requested %zu bytes, read %zu bytes", - tape, sizeof(uint32), nread))); + errmsg_internal("unexpected EOF for tape %p: requested %zu bytes, read %zu bytes", + tape, sizeof(uint32), nread))); tuple = (MinimalTuple) palloc(t_len); tuple->t_len = t_len; @@ -3024,8 +3024,8 @@ hashagg_batch_read(HashAggBatch *batch, uint32 *hashp) if (nread != t_len - sizeof(uint32)) ereport(ERROR, (errcode_for_file_access(), - errmsg("unexpected EOF for tape %p: requested %zu bytes, read %zu bytes", - tape, t_len - sizeof(uint32), nread))); + errmsg_internal("unexpected EOF for tape %p: requested %zu bytes, read %zu bytes", + tape, t_len - sizeof(uint32), nread))); return tuple; }