mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-24 18:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Assorted message fixes and improvements

Browse Source
This commit is contained in:
Peter Eisentraut 2014-09-05 01:20:33 -04:00
parent d85e7fac41
commit 303f4d1012
11 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/test_decoding/expected/ddl.out
View File

@ -12,7 +12,7 @@ ERROR: replication slot "regression_slot" already exists
-- fail because of an invalid name
SELECT 'init' FROM pg_create_logical_replication_slot('Invalid Name', 'test_decoding');
ERROR: replication slot name "Invalid Name" contains invalid character
HINT: Replication slot names may only contain letters, numbers and the underscore character.
HINT: Replication slot names may only contain letters, numbers, and the underscore character.
-- fail twice because of an invalid parameter values
SELECT 'init' FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', 'frakbar');
ERROR: could not parse value "frakbar" for parameter "include-xids"

4
src/backend/access/heap/rewriteheap.c
View File

@ -1161,7 +1161,7 @@ heap_xlog_logical_rewrite(XLogRecPtr lsn, XLogRecord *r)
if (lseek(fd, xlrec->offset, SEEK_SET) != xlrec->offset)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not seek to the end of file \"%s\": %m",
errmsg("could not seek to end of file \"%s\": %m",
path)));
data = XLogRecGetData(r) + sizeof(*xlrec);
@ -1255,7 +1255,7 @@ CheckPointLogicalRewriteHeap(void)
if (unlink(path) < 0)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not unlink file \"%s\": %m", path)));
errmsg("could not remove file \"%s\": %m", path)));
}
else
{

6
src/backend/commands/dbcommands.c
View File

@ -841,8 +841,10 @@ dropdb(const char *dbname, bool missing_ok)
(errcode(ERRCODE_OBJECT_IN_USE),
errmsg("database \"%s\" is used by a logical decoding slot",
dbname),
errdetail("There are %d slot(s), %d of them active",
nslots, nslots_active)));
errdetail_plural("There is %d slot, %d of them active.",
"There are %d slots, %d of them active.",
nslots,
nslots, nslots_active)));
/*
* Check for other backends in the target database. (Because we hold the

2
src/backend/commands/matview.c
View File

@ -689,7 +689,7 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("cannot refresh materialized view \"%s\" concurrently",
matviewname),
errhint("Create a UNIQUE index with no WHERE clause on one or more columns of the materialized view.")));
errhint("Create a unique index with no WHERE clause on one or more columns of the materialized view.")));
appendStringInfoString(&querybuf,
" AND newdata OPERATOR(pg_catalog.*=) mv) "

2
src/backend/commands/tablecmds.c
View File

@ -9424,7 +9424,7 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt)
!ConditionalLockRelationOid(relOid, AccessExclusiveLock))
ereport(ERROR,
(errcode(ERRCODE_OBJECT_IN_USE),
errmsg("aborting due to \"%s\".\"%s\" --- lock not available",
errmsg("aborting because lock on relation \"%s\".\"%s\" is not available",
get_namespace_name(relForm->relnamespace),
NameStr(relForm->relname))));
else

4
src/backend/executor/nodeWindowAgg.c
View File

@ -344,13 +344,13 @@ advance_windowaggregate(WindowAggState *winstate,
winstate->curaggcontext = NULL;
/*
* Moving-aggregate transition functions must not return NULL, see
* Moving-aggregate transition functions must not return null, see
* advance_windowaggregate_base().
*/
if (fcinfo->isnull && OidIsValid(peraggstate->invtransfn_oid))
ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("moving-aggregate transition function must not return NULL")));
errmsg("moving-aggregate transition function must not return null")));
/*
* We must track the number of rows included in transValue, since to

4
src/backend/replication/logical/reorderbuffer.c
View File

@ -2350,7 +2350,7 @@ ReorderBufferRestoreCleanup(ReorderBuffer *rb, ReorderBufferTXN *txn)
if (unlink(path) != 0 && errno != ENOENT)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not unlink file \"%s\": %m", path)));
errmsg("could not remove file \"%s\": %m", path)));
}
}
@ -2407,7 +2407,7 @@ StartupReorderBuffer(void)
if (unlink(path) != 0)
ereport(PANIC,
(errcode_for_file_access(),
errmsg("could not unlink file \"%s\": %m",
errmsg("could not remove file \"%s\": %m",
path)));
}
}

6
src/backend/replication/logical/snapbuild.c
View File

@ -1506,7 +1506,7 @@ SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn)
if (unlink(tmppath) != 0 && errno != ENOENT)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not unlink file \"%s\": %m", path)));
errmsg("could not remove file \"%s\": %m", path)));
needed_length = sizeof(SnapBuildOnDisk) +
sizeof(TransactionId) * builder->running.xcnt_space +
@ -1857,7 +1857,7 @@ CheckPointSnapBuild(void)
if (sscanf(snap_de->d_name, "%X-%X.snap", &hi, &lo) != 2)
{
ereport(LOG,
(errmsg("could not parse filename \"%s\"", path)));
(errmsg("could not parse file name \"%s\"", path)));
continue;
}
@ -1877,7 +1877,7 @@ CheckPointSnapBuild(void)
{
ereport(LOG,
(errcode_for_file_access(),
errmsg("could not unlink file \"%s\": %m",
errmsg("could not remove file \"%s\": %m",
path)));
continue;
}

8
src/backend/replication/slot.c
View File

@ -183,7 +183,7 @@ ReplicationSlotValidateName(const char *name, int elevel)
(errcode(ERRCODE_INVALID_NAME),
errmsg("replication slot name \"%s\" contains invalid character",
name),
errhint("Replication slot names may only contain letters, numbers and the underscore character.")));
errhint("Replication slot names may only contain letters, numbers, and the underscore character.")));
return false;
}
}
@ -454,7 +454,7 @@ ReplicationSlotDropAcquired(void)
ereport(fail_softly ? WARNING : ERROR,
(errcode_for_file_access(),
errmsg("could not rename \"%s\" to \"%s\": %m",
errmsg("could not rename file \"%s\" to \"%s\": %m",
path, tmppath)));
}
@ -1041,7 +1041,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
{
ereport(elevel,
(errcode_for_file_access(),
errmsg("could not rename \"%s\" to \"%s\": %m",
errmsg("could not rename file \"%s\" to \"%s\": %m",
tmppath, path)));
return;
}
@ -1092,7 +1092,7 @@ RestoreSlotFromDisk(const char *name)
if (unlink(path) < 0 && errno != ENOENT)
ereport(PANIC,
(errcode_for_file_access(),
errmsg("could not unlink file \"%s\": %m", path)));
errmsg("could not remove file \"%s\": %m", path)));
sprintf(path, "pg_replslot/%s/state", name);

6
src/backend/storage/ipc/dsm_impl.c
View File

@ -332,7 +332,7 @@ dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
ereport(elevel,
(errcode_for_dynamic_shared_memory(),
errmsg("could not resize shared memory segment %s to %zu bytes: %m",
errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
name, request_size)));
return false;
}
@ -875,7 +875,7 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size request_size,
ereport(elevel,
(errcode_for_dynamic_shared_memory(),
errmsg("could not resize shared memory segment %s to %zu bytes: %m",
errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
name, request_size)));
return false;
}
@ -923,7 +923,7 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size request_size,
ereport(elevel,
(errcode_for_dynamic_shared_memory(),
errmsg("could not resize shared memory segment %s to %zu bytes: %m",
errmsg("could not resize shared memory segment \"%s\" to %zu bytes: %m",
name, request_size)));
return false;
}

2
src/test/regress/expected/matview.out
View File

@ -247,7 +247,7 @@ SELECT * FROM tvvm;
REFRESH MATERIALIZED VIEW tmm;
REFRESH MATERIALIZED VIEW CONCURRENTLY tvmm;
ERROR: cannot refresh materialized view "public.tvmm" concurrently
HINT: Create a UNIQUE index with no WHERE clause on one or more columns of the materialized view.
HINT: Create a unique index with no WHERE clause on one or more columns of the materialized view.
REFRESH MATERIALIZED VIEW tvmm;
REFRESH MATERIALIZED VIEW tvvm;
EXPLAIN (costs off)