Hi Nisha.
Some review comments about v74-0001
======
src/backend/replication/slot.c
1.
/* Maximum number of invalidation causes */
-#define RS_INVAL_MAX_CAUSES RS_INVAL_WAL_LEVEL
-
-StaticAssertDecl(lengthof(SlotInvalidationCauses) == (RS_INVAL_MAX_CAUSES + 1),
- "array length mismatch");
+#define RS_INVAL_MAX_CAUSES (lengthof(InvalidationCauses)-1)
The static assert was here to protect against dev mistakes in keeping
the lookup table up-to-date with the enum of slot.h. So it's not a
good idea to remove it...
IMO the RS_INVAL_MAX_CAUSES should be relocated to slot.h where the
enum is defined and where the devs know exactly how many invalidation
types there are. Then this static assert can be put back in to do its
job of ensuring the integrity properly again for this lookup table.
~~~
InvalidatePossiblyObsoleteSlot:
2.
+ if (possible_causes & RS_INVAL_IDLE_TIMEOUT)
+ {
+ /*
+ * Assign the current time here to avoid system call overhead
+ * while holding the spinlock in subsequent code.
+ */
+ now = GetCurrentTimestamp();
+ }
+
I felt that any minuscule benefit gained from having this conditional
'now' assignment is outweighed by the subsequent confusion/doubt
caused by passing around a 'now' to other functions where it may or
may not still be zero depending on different processing. IMO we should
just remove all doubts and always assign it so that "now always means
now".
~~~
3.
+ if (possible_causes & RS_INVAL_IDLE_TIMEOUT)
IMO every bitwise check like this should also be checking
(invalidation_cause == RS_INVAL_NONE). Maybe you omitted it here
because this is the first but I think it will be safer anyhow in case
the code gets shuffled around in future and the extra condition gets
overlooked.
~~~
4.
+ if (possible_causes & RS_INVAL_WAL_REMOVED)
+ {
+ if (initial_restart_lsn != InvalidXLogRecPtr &&
+ initial_restart_lsn < oldestLSN)
+ invalidation_cause = RS_INVAL_WAL_REMOVED;
+ }
+ if (invalidation_cause == RS_INVAL_NONE &&
+ (possible_causes & RS_INVAL_HORIZON))
+ {
+ if (SlotIsLogical(s) &&
+ /* invalid DB oid signals a shared relation */
+ (dboid == InvalidOid || dboid == s->data.database) &&
+ TransactionIdIsValid(initial_effective_xmin) &&
+ TransactionIdPrecedesOrEquals(initial_effective_xmin,
+ snapshotConflictHorizon))
+ invalidation_cause = RS_INVAL_HORIZON;
+ else if (TransactionIdIsValid(initial_catalog_effective_xmin) &&
+ TransactionIdPrecedesOrEquals(initial_catalog_effective_xmin,
+ snapshotConflictHorizon))
+ invalidation_cause = RS_INVAL_HORIZON;
+ }
+ if (invalidation_cause == RS_INVAL_NONE &&
I suggest adding blank lines where the bit conditions are to delineate
each of the different invalidation checks.
~~~
InvalidateObsoleteReplicationSlots:
5
- Assert(cause != RS_INVAL_HORIZON ||
TransactionIdIsValid(snapshotConflictHorizon));
- Assert(cause != RS_INVAL_WAL_REMOVED || oldestSegno > 0);
- Assert(cause != RS_INVAL_NONE);
+ Assert(!(possible_causes & RS_INVAL_HORIZON) ||
TransactionIdIsValid(snapshotConflictHorizon));
+ Assert(!(possible_causes & RS_INVAL_WAL_REMOVED) || oldestSegno > 0);
+ Assert(!(possible_causes & RS_INVAL_NONE));
AFAIK the RS_INVAL_NONE is defined as 0, so doing bit-wise operations
on 0 seems bogus.
Do you mean just Assert(possible_causes != NONE);
======
src/include/replication/slot.h
6.
-extern PGDLLIMPORT const char *const SlotInvalidationCauses[];
+typedef struct SlotInvalidationCauseMap
+{
+ int cause;
+ const char *cause_name;
+} SlotInvalidationCauseMap;
+
+extern PGDLLIMPORT const SlotInvalidationCauseMap InvalidationCauses[];
6a.
AFAIK. there is no longer any external access to this lookup table so
why do you need this extern. Similarly, why is this typedef even here
instead of declared in the slot.c module.
~
6b.
Why is the field 'cause' declared as int instead of
ReplicationSlotInvalidationCause?
======
Please the attached top-up patch as a code example of some of my
suggestions above -- in particular the relocating of
RS_INVAL_MAX_CAUSES and the typedef, and the reinstating of the static
insert for the lookup table.
======
Kind Regards,
Peter Smith.
Fujitsu Australia
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index eccada9..2452eac 100644
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -99,9 +99,16 @@ typedef struct
char slot_names[FLEXIBLE_ARRAY_MEMBER];
} SyncStandbySlotsConfigData;
+
/*
* Lookup table for slot invalidation causes.
*/
+typedef struct SlotInvalidationCauseMap
+{
+ ReplicationSlotInvalidationCause cause;
+ const char *cause_name;
+} SlotInvalidationCauseMap;
+
const SlotInvalidationCauseMap InvalidationCauses[] = {
{RS_INVAL_NONE, "none"},
{RS_INVAL_WAL_REMOVED, "wal_removed"},
@@ -110,8 +117,8 @@ const SlotInvalidationCauseMap InvalidationCauses[] = {
{RS_INVAL_IDLE_TIMEOUT, "idle_timeout"},
};
-/* Maximum number of invalidation causes */
-#define RS_INVAL_MAX_CAUSES (lengthof(InvalidationCauses)-1)
+StaticAssertDecl(lengthof(InvalidationCauses) == (RS_INVAL_MAX_CAUSES + 1),
+ "array length mismatch");
/* size of version independent data */
#define ReplicationSlotOnDiskConstantSize \
diff --git a/src/include/replication/slot.h b/src/include/replication/slot.h
index 161784b..56ba48e 100644
--- a/src/include/replication/slot.h
+++ b/src/include/replication/slot.h
@@ -61,14 +61,8 @@ typedef enum ReplicationSlotInvalidationCause
RS_INVAL_IDLE_TIMEOUT = (1 << 3),
} ReplicationSlotInvalidationCause;
-typedef struct SlotInvalidationCauseMap
-{
- int cause;
- const char *cause_name;
-} SlotInvalidationCauseMap;
-
-extern PGDLLIMPORT const SlotInvalidationCauseMap InvalidationCauses[];
-
+/* Maximum number of invalidation causes */
+#define RS_INVAL_MAX_CAUSES 4
/*
* On-Disk data of a replication slot, preserved across restarts.
*/
