summaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/executor/execReplication.c2
-rw-r--r--src/backend/replication/logical/worker.c4
-rw-r--r--src/backend/utils/adt/uuid.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index 68184f5d671..da0cbf41d6f 100644
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -582,7 +582,7 @@ RelationFindDeletedTupleInfoSeq(Relation rel, TupleTableSlot *searchslot,
* IsIndexUsableForFindingDeletedTuple), a full table scan becomes
* necessary. In such cases, comparing the entire tuple is not required,
* since the remote tuple might not include all column values. Instead,
- * the indexed columns alone are suffcient to identify the target tuple
+ * the indexed columns alone are sufficient to identify the target tuple
* (see logicalrep_rel_mark_updatable).
*/
indexbitmap = RelationGetIndexAttrBitmap(rel,
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c
index 59b6ae7719a..8e343873454 100644
--- a/src/backend/replication/logical/worker.c
+++ b/src/backend/replication/logical/worker.c
@@ -2923,7 +2923,7 @@ apply_handle_update_internal(ApplyExecutionData *edata,
/*
* Detecting whether the tuple was recently deleted or never existed
- * is crucial to avoid misleading the user during confict handling.
+ * is crucial to avoid misleading the user during conflict handling.
*/
if (FindDeletedTupleInLocalRel(localrel, localindexoid, remoteslot,
&conflicttuple.xmin,
@@ -3392,7 +3392,7 @@ apply_handle_tuple_routing(ApplyExecutionData *edata,
/*
* Detecting whether the tuple was recently deleted or
* never existed is crucial to avoid misleading the user
- * during confict handling.
+ * during conflict handling.
*/
if (FindDeletedTupleInLocalRel(partrel,
part_entry->localindexoid,
diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c
index 7413239f7af..e5f27ff892b 100644
--- a/src/backend/utils/adt/uuid.c
+++ b/src/backend/utils/adt/uuid.c
@@ -748,7 +748,7 @@ uuid_extract_timestamp(PG_FUNCTION_ARGS)
+ (((uint64) uuid->data[0]) << 40);
/* convert ms to us, then adjust */
- ts = (TimestampTz) (tms * NS_PER_US) -
+ ts = (TimestampTz) (tms * US_PER_MS) -
(POSTGRES_EPOCH_JDATE - UNIX_EPOCH_JDATE) * SECS_PER_DAY * USECS_PER_SEC;
PG_RETURN_TIMESTAMPTZ(ts);