Fix conflicting raftable header names. Remove raftable.o from Makefile.

Author: kvap

Makefile

@@ -1,5 +1,5 @@
 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
 

multimaster.c

@@ -55,9 +55,9 @@
 #include "catalog/indexing.h"
 #include "pglogical_output/hooks.h"
 
-#include "raftable.h"
 #include "multimaster.h"
 #include "ddd.h"
+#include "raftable_wrapper.h"
 #include "raftable.h"
 
 typedef struct { 
@@ -2370,3 +2370,24 @@ MtmDetectGlobalDeadLock(PGPROC* proc)
 	}
     return hasDeadlock;
 }
+
+void* RaftableGet(char const* key, int* size, RaftableTimestamp* ts, bool nowait)
+{
+	size_t s;
+	char *value;
+	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)
+{
+	raftable_set(key, value, size, nowait ? 0 : -1);
+}
+
+bool  RaftableCAS(char const* key, char const* value, bool nowait)
+{
+	Assert(false); /* not implemented */
+	return false;
+}

raftable.h renamed to 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 */