Mark internal messages as no longer translatable
authorAlvaro Herrera <alvherre@alvh.no-ip.org>
Tue, 16 May 2023 09:47:25 +0000 (11:47 +0200)
committerAlvaro Herrera <alvherre@alvh.no-ip.org>
Tue, 16 May 2023 09:47:25 +0000 (11:47 +0200)
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 <daniel@yesql.se>
Discussion: https://postgr.es/m/20230510175407.dwa5v477pw62ikyx@alvherre.pgsql

src/backend/executor/nodeAgg.c

index a8a57b70633b4d51d6934a2f54ab973be46590b8..ad81a675aa3d2cb0bc0dde6452c69cddd6082669 100644 (file)
@@ -3022,8 +3022,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;
 
@@ -3031,8 +3031,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;
@@ -3043,8 +3043,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;
 }