Rename the delete_late conflict to delete_exists

"Exists" means for us that something exists that is unexpected,
such as for insert_exists. In the delete_exists case, it is
unexpected that a newer timestamped row exists.

Author: mason-sharp

include/spock_conflict.h

@@ -46,7 +46,7 @@ extern bool spock_save_resolutions;
 /*
  * We want to eventually match native PostgreSQL conflict types,
  * so use same ordering and similar naming.
- * We add one additional conflict type, CT_DELETE_LATE.
+ * We add one additional conflict type, CT_DELETE_EXISTS.
  */
 typedef enum
 {
@@ -72,7 +72,7 @@ typedef enum
 	 * Unique to Spock, delete timestamp is earlier than an existing row.
 	 * Use a higher number so we don't conflict with PostgreSQL in the future.
 	 */
-	SPOCK_CT_DELETE_LATE = 101
+	SPOCK_CT_DELETE_EXISTS = 101
 
 } SpockConflictType;
 
@@ -109,6 +109,8 @@ extern bool try_resolve_conflict(Relation rel, HeapTuple localtuple,
 								 RepOriginId local_origin, TimestampTz local_ts,
 								 SpockConflictResolution *resolution);
 
+extern const char *SpockConflictTypeName(SpockConflictType t);
+
 extern void spock_report_conflict(SpockConflictType conflict_type,
 								  SpockRelation *rel,
 								  HeapTuple localtuple,

src/spock_apply_heap.c

@@ -1197,7 +1197,7 @@ spock_apply_heap_delete(SpockRelation *rel, SpockTupleData *oldtup)
 							 local_ts, &resolution))
 		{
 			/* Current DELETE happened before current tuple */
-			spock_report_conflict(SPOCK_CT_DELETE_LATE,
+			spock_report_conflict(SPOCK_CT_DELETE_EXISTS,
 								rel, TTS_TUP(localslot), oldtup,
 								NULL, /* remotetuple */
 								local_tuple, SpockResolution_Skip,

src/spock_conflict.c

@@ -56,16 +56,29 @@
 #include "spock_worker.h"
 
 
-/* From src/backend/replication/logical/conflict.c */
-static const char *const SpockConflictTypeNames[] = {
-	[SPOCK_CT_INSERT_EXISTS] = "insert_exists",
-	[SPOCK_CT_UPDATE_ORIGIN_DIFFERS] = "update_origin_differs",
-	[SPOCK_CT_UPDATE_EXISTS] = "update_exists",
-	[SPOCK_CT_UPDATE_MISSING] = "update_missing",
-	[SPOCK_CT_DELETE_ORIGIN_DIFFERS] = "delete_origin_differs",
-	[SPOCK_CT_DELETE_MISSING] = "delete_missing",
-	[SPOCK_CT_DELETE_LATE] = "delete_late"
-};
+const char *
+SpockConflictTypeName(SpockConflictType t)
+{
+	switch (t)
+	{
+		case SPOCK_CT_INSERT_EXISTS:
+			return "insert_exists";
+		case SPOCK_CT_UPDATE_ORIGIN_DIFFERS:
+			return "update_origin_differs";
+		case SPOCK_CT_UPDATE_EXISTS:
+			return "update_exists";
+		case SPOCK_CT_UPDATE_MISSING:
+			return "update_missing";
+		case SPOCK_CT_DELETE_ORIGIN_DIFFERS:
+			return "delete_origin_differs";
+		case SPOCK_CT_DELETE_MISSING:
+			return "delete_missing";
+		case SPOCK_CT_DELETE_EXISTS:
+			return "delete_exists";
+		default:
+			return "unknown";
+	}
+}
 
 
 int			spock_conflict_resolver = SPOCK_RESOLVE_LAST_UPDATE_WINS;
@@ -478,7 +491,7 @@ spock_report_conflict(SpockConflictType conflict_type,
 			ereport(spock_conflict_log_level,
 					(errcode(ERRCODE_INTEGRITY_CONSTRAINT_VIOLATION),
 					 errmsg("CONFLICT: remote %s on relation %s (local index %s). Resolution: %s.",
-							SpockConflictTypeNames[conflict_type],
+							SpockConflictTypeName(conflict_type),
 							qualrelname, idxname,
 							conflict_resolution_to_string(resolution)),
 					 errdetail("existing local tuple {%s} xid=%u,origin=%s,timestamp=%s; remote tuple {%s} in xact origin=%u,timestamp=%s,commit_lsn=%X/%X",
@@ -495,7 +508,7 @@ spock_report_conflict(SpockConflictType conflict_type,
 			ereport(spock_conflict_log_level,
 					(errcode(ERRCODE_INTEGRITY_CONSTRAINT_VIOLATION),
 					 errmsg("CONFLICT: remote %s on relation %s replica identity index %s (tuple not found). Resolution: %s.",
-							SpockConflictTypeNames[conflict_type],
+							SpockConflictTypeName(conflict_type),
 							qualrelname, idxname,
 							conflict_resolution_to_string(resolution)),
 					 errdetail("remote tuple {%s} in xact origin=%u,timestamp=%s,commit_lsn=%X/%X",
@@ -509,7 +522,7 @@ spock_report_conflict(SpockConflictType conflict_type,
 			ereport(spock_conflict_log_level,
 					(errcode(ERRCODE_INTEGRITY_CONSTRAINT_VIOLATION),
 					 errmsg("CONFLICT: remote %s on relation %s replica identity index %s (tuple not found). Resolution: %s.",
-							SpockConflictTypeNames[conflict_type],
+							SpockConflictTypeName(conflict_type),
 							qualrelname, idxname,
 							conflict_resolution_to_string(resolution)),
 					 errdetail("tuple for remote delete in xact origin=%u,timestamp=%s,commit_lsn=%X/%X",
@@ -518,11 +531,11 @@ spock_report_conflict(SpockConflictType conflict_type,
 							   (uint32) (replorigin_session_origin_lsn << 32),
 							   (uint32) replorigin_session_origin_lsn)));
 			break;
-		case SPOCK_CT_DELETE_LATE:
+		case SPOCK_CT_DELETE_EXISTS:
 			ereport(spock_conflict_log_level,
 					(errcode(ERRCODE_INTEGRITY_CONSTRAINT_VIOLATION),
 					 errmsg("CONFLICT: remote %s on relation %s replica identity index %s (newer tuple found). Resolution: %s.",
-							SpockConflictTypeNames[conflict_type],
+							SpockConflictTypeName(conflict_type),
 							qualrelname, idxname,
 							conflict_resolution_to_string(resolution)),
 					 errdetail("remote delete in xact origin=%u,timestamp=%s,commit_lsn=%X/%X",
@@ -621,7 +634,7 @@ spock_conflict_log_table(SpockConflictType conflict_type,
 		nulls[4] = true;
 
 	/* conflict type */
-	values[5] = CStringGetTextDatum(SpockConflictTypeNames[conflict_type]);
+	values[5] = CStringGetTextDatum(SpockConflictTypeName(conflict_type));
 	/* conflict_resolution */
 	values[6] = CStringGetTextDatum(conflict_resolution_to_string(resolution));
 	/* local_origin */

tests/regress/expected/tuple_origin.out

@@ -147,11 +147,11 @@ SELECT pg_sleep(3);
 
 (1 row)
 
--- We should see one resolution, delete_late
+-- We should see one resolution, delete_exists
 SELECT conflict_type, local_tuple FROM spock.resolutions;
  conflict_type |      local_tuple      
 ---------------+-----------------------
- delete_late   | {"id":3,"mgr_id":333}
+ delete_exists | {"id":3,"mgr_id":333}
 (1 row)
 
 -- Empty

tests/regress/sql/tuple_origin.sql

@@ -90,7 +90,7 @@ UPDATE users SET mgr_id = 333 WHERE id = 3;
 -- so that the delayed DELETE finally arrives (late)
 SELECT pg_sleep(3);
 
--- We should see one resolution, delete_late
+-- We should see one resolution, delete_exists
 SELECT conflict_type, local_tuple FROM spock.resolutions;
 
 -- Empty