Merge branch 'main' into change-to-5.0

Author: wieck

spock.c

@@ -130,6 +130,8 @@ bool	spock_include_ddl_repset = false;
 bool	allow_ddl_from_functions = false;
 int		restart_delay_default;
 int		restart_delay_on_exception;
+int		spock_replay_queue_size;
+bool	check_all_uc_indexes = false;
 
 
 void _PG_init(void);
@@ -994,6 +996,19 @@ _PG_init(void)
 							NULL,
 							NULL);
 
+	DefineCustomIntVariable("spock.exception_replay_queue_size",
+							"apply-worker replay queue size for exception",
+							NULL,
+							&spock_replay_queue_size,
+							4194304,
+							0,
+							INT_MAX,
+							PGC_SIGHUP,
+							0,
+							NULL,
+							NULL,
+							NULL);
+
 	DefineCustomEnumVariable("spock.readonly",
 							 gettext_noop("Controls cluster read-only mode."),
 							 NULL,
@@ -1003,6 +1018,15 @@ _PG_init(void)
 							 PGC_SUSET, 0,
 							 NULL, NULL, NULL);
 
+	DefineCustomBoolVariable("spock.check_all_uc_indexes",
+							 gettext_noop("Check all valid unique indexes for conflict resolution on INSERT when primary or replica identity index fails."),
+							 NULL,
+							 &check_all_uc_indexes,
+							 false,
+							 PGC_SIGHUP,
+							 0,
+							 NULL, NULL, NULL);
+
 	if (IsBinaryUpgrade)
 		return;
 

spock.h

@@ -53,6 +53,8 @@ extern bool	spock_include_ddl_repset;
 extern bool	allow_ddl_from_functions;
 extern int	restart_delay_default;
 extern int	restart_delay_on_exception;
+extern int	spock_replay_queue_size;
+extern bool check_all_uc_indexes;
 extern char *shorten_hash(const char *str, int maxlen);
 
 extern List *textarray_to_list(ArrayType *textarray);