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

kvap · kvap · commit 0d82adcaf042 · 2016-03-30T12:03:49.000+03:00
diff --git a/contrib/mmts/Makefile b/contrib/mmts/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
 
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/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 { 
@@ -2372,3 +2372,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;
+}
diff --git a/contrib/mmts/raftable_wrapper.h b/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 */
diff --git a/contrib/raftable/state.c b/contrib/raftable/state.c
@@ -18,16 +18,17 @@ typedef struct State {
 
 static char *state_get_string(StateP state, RaftableEntry *e, size_t *len)
 {
-	size_t checklen;
+	size_t actlen;
 	char *s;
 	Assert(state);
 	Assert(LWLockHeldByMe(state->lock));
 
-	*len = blockmem_len(state->blockmem, e->block);
-	Assert(len > 0);
-	s = palloc(*len);
-	checklen = blockmem_get(state->blockmem, e->block, s, *len);
-	Assert(*len == checklen);
+	actlen = blockmem_len(state->blockmem, e->block);
+	if (len) *len = actlen;
+	Assert(actlen > 0);
+	s = palloc(actlen);
+	actlen -= blockmem_get(state->blockmem, e->block, s, actlen);
+	Assert(actlen == 0);
 
 	return s;
 }
