Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

Author: knizhnik

contrib/mmts/Makefile

@@ -1,5 +1,9 @@
 MODULE_big = multimaster
-OBJS = multimaster.o raftable.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o ddd.o bkb.o
+OBJS = multimaster.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o ddd.o bkb.o
+
+override CPPFLAGS += -I../raftable
+
+EXTRA_INSTALL = contrib/raftable contrib/mmts
 
 EXTENSION = multimaster
 DATA = multimaster--1.0.sql

contrib/mmts/multimaster.c

@@ -57,6 +57,7 @@
 
 #include "multimaster.h"
 #include "ddd.h"
+#include "raftable_wrapper.h"
 #include "raftable.h"
 
 typedef struct { 
@@ -2368,3 +2369,31 @@ MtmDetectGlobalDeadLock(PGPROC* proc)
 	}
     return hasDeadlock;
 }
+
+void* RaftableGet(char const* key, int* size, RaftableTimestamp* ts, bool nowait)
+{
+	size_t s;
+	char *value;
+
+	if (!MtmUseRaftable) return NULL;
+
+	Assert(ts == NULL); /* not implemented */
+	value = raftable_get(key, &s);
+	*size = s;
+	return value;
+}
+
+void  RaftableSet(char const* key, void const* value, int size, bool nowait)
+{
+	if (!MtmUseRaftable) return;
+
+	raftable_set(key, value, size, nowait ? 0 : -1);
+}
+
+bool  RaftableCAS(char const* key, char const* value, bool nowait)
+{
+	if (!MtmUseRaftable) return false;
+
+	Assert(false); /* not implemented */
+	return false;
+}

contrib/mmts/raftable.h renamed to contrib/mmts/raftable_wrapper.h

@@ -1,5 +1,5 @@
-#ifndef __RAFTABLE_H__
-#define __RAFTABLE_H__
+#ifndef __RAFTABLE_WRAPPER_H__
+#define __RAFTABLE_WRAPPER_H__
 
 typedef struct RaftableTimestamp { 
 	time_t time;   /* local time at master */

contrib/mmts/t/001_basic_recovery.pl

@@ -36,7 +36,7 @@ sub PostgresNode::inet_connstr {
 	max_wal_senders = 10
 	max_replication_slots = 10
 	wal_level = logical
-	shared_preload_libraries = 'multimaster'
+	shared_preload_libraries = 'raftable,multimaster'
 	multimaster.workers=4
 	multimaster.queue_size=10485760 # 10mb
 );

contrib/raftable/README

@@ -40,23 +40,24 @@ The backend can also issue commands to itself through C API.
 
 C API:
 	/* Gets value by key. Returns the value or NULL if not found. */
-	char *raftable_get(char *key);
+	char *raftable_get(const char *key, size_t *vallen);
 
 	/*
-	 * Adds/updates value by key. Returns when the value gets replicated on
-	 * current machine. Storing NULL will delete the item from the table.
+	 * Adds/updates value by key. Returns when the value gets replicated.
+	 * Storing NULL will delete the item from the table. Gives up after
+	 * 'timeout_ms' milliseconds.
 	 */
-	void raftable_set(char *key, char *value);
+	void raftable_set(const char *key, const char *value, size_t len, int timeout_ms);
 
 	/*
 	 * Iterates over all items in the table, calling func(key, value, arg)
 	 * for each of them.
 	 */
-	void raftable_every(void (*func)(char *, char *, void *), void *arg);
+	void raftable_every(void (*func)(const char *, const char *, size_t, void *), void *arg);
 
 SQL API:
 	-- set
-	raftable(key varchar(64), value text, tries int);
+	raftable(key varchar(64), value text, timeout_ms int);
 
 	-- get
 	raftable(key varchar(64)) returns text;

contrib/raftable/raftable--1.0.sql

@@ -8,7 +8,7 @@ AS 'MODULE_PATHNAME','raftable_sql_get'
 LANGUAGE C;
 
 -- set
-CREATE FUNCTION raftable(key varchar(64), value text, tries int)
+CREATE FUNCTION raftable(key varchar(64), value text, timeout_ms int)
 RETURNS void
 AS 'MODULE_PATHNAME','raftable_sql_set'
 LANGUAGE C;