database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files

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);