Skip to content

Commit 303f4d1

Browse files
peterepetere
committed
Assorted message fixes and improvements
1 parent d85e7fa commit 303f4d1

File tree

11 files changed

+24
-22
lines changed

11 files changed

+24
-22
lines changed

‎contrib/test_decoding/expected/ddl.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ERROR: replication slot "regression_slot" already exists
1212
-- fail because of an invalid name
1313
SELECT 'init' FROM pg_create_logical_replication_slot('Invalid Name', 'test_decoding');
1414
ERROR: replication slot name "Invalid Name" contains invalid character
15-
HINT: Replication slot names may only contain letters, numbers and the underscore character.
15+
HINT: Replication slot names may only contain letters, numbers, and the underscore character.
1616
-- fail twice because of an invalid parameter values
1717
SELECT 'init' FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', 'frakbar');
1818
ERROR: could not parse value "frakbar" for parameter "include-xids"

‎src/backend/access/heap/rewriteheap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ heap_xlog_logical_rewrite(XLogRecPtr lsn, XLogRecord *r)
11611161
if (lseek(fd, xlrec->offset, SEEK_SET) != xlrec->offset)
11621162
ereport(ERROR,
11631163
(errcode_for_file_access(),
1164-
errmsg("could not seek to the end of file \"%s\": %m",
1164+
errmsg("could not seek to end of file \"%s\": %m",
11651165
path)));
11661166

11671167
data = XLogRecGetData(r) + sizeof(*xlrec);
@@ -1255,7 +1255,7 @@ CheckPointLogicalRewriteHeap(void)
12551255
if (unlink(path) < 0)
12561256
ereport(ERROR,
12571257
(errcode_for_file_access(),
1258-
errmsg("could not unlink file \"%s\": %m", path)));
1258+
errmsg("could not remove file \"%s\": %m", path)));
12591259
}
12601260
else
12611261
{

‎src/backend/commands/dbcommands.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -841,8 +841,10 @@ dropdb(const char *dbname, bool missing_ok)
841841
(errcode(ERRCODE_OBJECT_IN_USE),
842842
errmsg("database \"%s\" is used by a logical decoding slot",
843843
dbname),
844-
errdetail("There are %d slot(s), %d of them active",
845-
nslots, nslots_active)));
844+
errdetail_plural("There is %d slot, %d of them active.",
845+
"There are %d slots, %d of them active.",
846+
nslots,
847+
nslots, nslots_active)));
846848

847849
/*
848850
* Check for other backends in the target database. (Because we hold the

‎src/backend/commands/matview.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
689689
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
690690
errmsg("cannot refresh materialized view \"%s\" concurrently",
691691
matviewname),
692-
errhint("Create a UNIQUE index with no WHERE clause on one or more columns of the materialized view.")));
692+
errhint("Create a unique index with no WHERE clause on one or more columns of the materialized view.")));
693693

694694
appendStringInfoString(&querybuf,
695695
" AND newdata OPERATOR(pg_catalog.*=) mv) "

‎src/backend/commands/tablecmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9424,7 +9424,7 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt)
94249424
!ConditionalLockRelationOid(relOid, AccessExclusiveLock))
94259425
ereport(ERROR,
94269426
(errcode(ERRCODE_OBJECT_IN_USE),
9427-
errmsg("aborting due to \"%s\".\"%s\" --- lock not available",
9427+
errmsg("aborting because lock on relation \"%s\".\"%s\" is not available",
94289428
get_namespace_name(relForm->relnamespace),
94299429
NameStr(relForm->relname))));
94309430
else

‎src/backend/executor/nodeWindowAgg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,13 +344,13 @@ advance_windowaggregate(WindowAggState *winstate,
344344
winstate->curaggcontext = NULL;
345345

346346
/*
347-
* Moving-aggregate transition functions must not return NULL, see
347+
* Moving-aggregate transition functions must not return null, see
348348
* advance_windowaggregate_base().
349349
*/
350350
if (fcinfo->isnull && OidIsValid(peraggstate->invtransfn_oid))
351351
ereport(ERROR,
352352
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
353-
errmsg("moving-aggregate transition function must not return NULL")));
353+
errmsg("moving-aggregate transition function must not return null")));
354354

355355
/*
356356
* We must track the number of rows included in transValue, since to

‎src/backend/replication/logical/reorderbuffer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2350,7 +2350,7 @@ ReorderBufferRestoreCleanup(ReorderBuffer *rb, ReorderBufferTXN *txn)
23502350
if (unlink(path) != 0 && errno != ENOENT)
23512351
ereport(ERROR,
23522352
(errcode_for_file_access(),
2353-
errmsg("could not unlink file \"%s\": %m", path)));
2353+
errmsg("could not remove file \"%s\": %m", path)));
23542354
}
23552355
}
23562356

@@ -2407,7 +2407,7 @@ StartupReorderBuffer(void)
24072407
if (unlink(path) != 0)
24082408
ereport(PANIC,
24092409
(errcode_for_file_access(),
2410-
errmsg("could not unlink file \"%s\": %m",
2410+
errmsg("could not remove file \"%s\": %m",
24112411
path)));
24122412
}
24132413
}

‎src/backend/replication/logical/snapbuild.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,7 @@ SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn)
15061506
if (unlink(tmppath) != 0 && errno != ENOENT)
15071507
ereport(ERROR,
15081508
(errcode_for_file_access(),
1509-
errmsg("could not unlink file \"%s\": %m", path)));
1509+
errmsg("could not remove file \"%s\": %m", path)));
15101510

15111511
needed_length = sizeof(SnapBuildOnDisk) +
15121512
sizeof(TransactionId) * builder->running.xcnt_space +
@@ -1857,7 +1857,7 @@ CheckPointSnapBuild(void)
18571857
if (sscanf(snap_de->d_name, "%X-%X.snap", &hi, &lo) != 2)
18581858
{
18591859
ereport(LOG,
1860-
(errmsg("could not parse filename \"%s\"", path)));
1860+
(errmsg("could not parse file name \"%s\"", path)));
18611861
continue;
18621862
}
18631863

@@ -1877,7 +1877,7 @@ CheckPointSnapBuild(void)
18771877
{
18781878
ereport(LOG,
18791879
(errcode_for_file_access(),
1880-
errmsg("could not unlink file \"%s\": %m",
1880+
errmsg("could not remove file \"%s\": %m",
18811881
path)));
18821882
continue;
18831883
}

‎src/backend/replication/slot.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ ReplicationSlotValidateName(const char *name, int elevel)
183183
(errcode(ERRCODE_INVALID_NAME),
184184
errmsg("replication slot name \"%s\" contains invalid character",
185185
name),
186-
errhint("Replication slot names may only contain letters, numbers and the underscore character.")));
186+
errhint("Replication slot names may only contain letters, numbers, and the underscore character.")));
187187
return false;
188188
}
189189
}
@@ -454,7 +454,7 @@ ReplicationSlotDropAcquired(void)
454454

455455
ereport(fail_softly ? WARNING : ERROR,
456456
(errcode_for_file_access(),
457-
errmsg("could not rename \"%s\" to \"%s\": %m",
457+
errmsg("could not rename file \"%s\" to \"%s\": %m",
458458
path, tmppath)));
459459
}
460460

@@ -1041,7 +1041,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
10411041
{
10421042
ereport(elevel,
10431043
(errcode_for_file_access(),
1044-
errmsg("could not rename \"%s\" to \"%s\": %m",
1044+
errmsg("could not rename file \"%s\" to \"%s\": %m",
10451045
tmppath, path)));
10461046
return;
10471047
}
@@ -1092,7 +1092,7 @@ RestoreSlotFromDisk(const char *name)
10921092
if (unlink(path) < 0 && errno != ENOENT)
10931093
ereport(PANIC,
10941094
(errcode_for_file_access(),
1095-
errmsg("could not unlink file \"%s\": %m", path)));
1095+
errmsg("could not remove file \"%s\": %m", path)));
10961096

10971097
sprintf(path, "pg_replslot/%s/state", name);
10981098

‎src/backend/storage/ipc/dsm_impl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
332332

333333
ereport(elevel,
334334
(errcode_for_dynamic_shared_memory(),
335-
errmsg("could not resize shared memory segment %s to %zu bytes: %m",
335+
errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
336336
name, request_size)));
337337
return false;
338338
}
@@ -875,7 +875,7 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size request_size,
875875

876876
ereport(elevel,
877877
(errcode_for_dynamic_shared_memory(),
878-
errmsg("could not resize shared memory segment %s to %zu bytes: %m",
878+
errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
879879
name, request_size)));
880880
return false;
881881
}
@@ -923,7 +923,7 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size request_size,
923923

924924
ereport(elevel,
925925
(errcode_for_dynamic_shared_memory(),
926-
errmsg("could not resize shared memory segment %s to %zu bytes: %m",
926+
errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
927927
name, request_size)));
928928
return false;
929929
}

‎src/test/regress/expected/matview.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ SELECT * FROM tvvm;
247247
REFRESH MATERIALIZED VIEW tmm;
248248
REFRESH MATERIALIZED VIEW CONCURRENTLY tvmm;
249249
ERROR: cannot refresh materialized view "public.tvmm" concurrently
250-
HINT: Create a UNIQUE index with no WHERE clause on one or more columns of the materialized view.
250+
HINT: Create a unique index with no WHERE clause on one or more columns of the materialized view.
251251
REFRESH MATERIALIZED VIEW tvmm;
252252
REFRESH MATERIALIZED VIEW tvvm;
253253
EXPLAIN (costs off)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy