Fix raftable_wrapper

knizhnik · knizhnik · commit cd0a6ee53a3f · 2016-03-30T13:24:48.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2354,7 +2354,7 @@ MtmDetectGlobalDeadLock(PGPROC* proc)
         ByteBufferFree(&buf);
 		for (i = 0; i < MtmNodes; i++) { 
 			if (i+1 != MtmNodeId && !BIT_CHECK(Mtm->disabledNodeMask, i)) { 
-				int size;
+				size_t size;
 				void* data = RaftableGet(psprintf("lock-graph-%d", i+1), &size, NULL, true);
 				if (data == NULL) { 
 					return true; /* If using Raftable is disabled */
@@ -2369,31 +2369,3 @@ 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;
-}
diff --git a/contrib/mmts/pglogical_output.c b/contrib/mmts/pglogical_output.c
@@ -480,17 +480,23 @@ pg_decode_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 /*
  * Decide if the whole transaction with specific origin should be filtered out.
  */
+extern int MtmReplicationNodeId;
+
 static bool
 pg_decode_origin_filter(LogicalDecodingContext *ctx,
 						RepOriginId origin_id)
 {
 	PGLogicalOutputData *data = ctx->output_plugin_private;
 
-	if (!call_txn_filter_hook(data, origin_id))
+	if (!call_txn_filter_hook(data, origin_id)) { 
+		elog(WARNING, "Record with origin %d is not sent to node %d", origin_id, MtmReplicationNodeId);
 		return true;
+	}
 
-	if (!data->forward_changesets && origin_id != InvalidRepOriginId)
+	if (!data->forward_changesets && origin_id != InvalidRepOriginId) {
+		*(int*)0 = 0;
 		return true;
+	}
 
 	return false;
 }
diff --git a/contrib/mmts/raftable.c b/contrib/mmts/raftable.c
@@ -19,20 +19,28 @@ static void RaftableResolve()
 /*
  * Raftable function proxies
  */
-void* RaftableGet(char const* key, int* size, RaftableTimestamp* ts, bool nowait)
+void* RaftableGet(char const* key, size_t* size, RaftableTimestamp* ts, bool nowait)
 {
 	if (!MtmUseRaftable) { 
 		return NULL;
 	}
 	RaftableResolve();
-	return (*raftable_get_impl)(key, size, nowait ? 0 : -1);
+	return (*raftable_get_impl)(key, size);
 }
 
 
-void RaftableSet(char const* key, void const* value, int size, bool nowait)
+void RaftableSet(char const* key, void const* value, size_t size, bool nowait)
 {
 	if (MtmUseRaftable) { 
 		RaftableResolve();
 		(*raftable_set_impl)(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;
+}
diff --git a/contrib/mmts/raftable_wrapper.h b/contrib/mmts/raftable_wrapper.h
@@ -15,13 +15,13 @@ typedef struct RaftableTimestamp {
  * If "ts" is not NULL, then it is assigned timestamp of last update of this value
  * If RAFT master is not accessible, then depending non value of "nowait" parameter, this funciton should either block until RAFT quorum is reached, either report error.
  */
-extern void* RaftableGet(char const* key, int* size, RaftableTimestamp* ts, bool nowait);
+extern void* RaftableGet(char const* key, size_t* size, RaftableTimestamp* ts, bool nowait);
 
 /*
  * Set new value for the specified key. IF value is NULL, then key should be deleted.
  * If RAFT master is not accessible, then depending non value of "nowait" parameter, this funciton should either block until RAFT quorum is reached, either report error.
  */
-extern void  RaftableSet(char const* key, void const* value, int size, bool nowait);
+extern void  RaftableSet(char const* key, void const* value, size_t size, bool nowait);
 
 /* 
  * If key doesn't exists or its value is not equal to the specified value then store this value and return true.
@@ -30,8 +30,8 @@ extern void  RaftableSet(char const* key, void const* value, int size, bool nowa
  */
 extern bool  RaftableCAS(char const* key, char const* value, bool nowait);
 
-typedef void* (*raftable_get_t)(char const* key, int* size, int timeout);
-typedef void (*raftable_set_t)(char const* key, void const* value, int size, int timeout);
+typedef void* (*raftable_get_t)(char const* key, size_t* size);
+typedef void (*raftable_set_t)(char const* key, void const* value, size_t size, int timeout_ms);
 
 extern bool MtmUseRaftable;
 

Original file line number	Diff line number	Diff line change
`@@ -19,20 +19,28 @@ static void RaftableResolve()`
`19`	`19`	`/*`
`20`	`20`	`* Raftable function proxies`
`21`	`21`	`*/`
`22`		`-void* RaftableGet(char const* key, int* size, RaftableTimestamp* ts, bool nowait)`
	`22`	`+void* RaftableGet(char const* key, size_t* size, RaftableTimestamp* ts, bool nowait)`
`23`	`23`	`{`
`24`	`24`	`if (!MtmUseRaftable) {`
`25`	`25`	`return NULL;`
`26`	`26`	`}`
`27`	`27`	`RaftableResolve();`
`28`		`- return (*raftable_get_impl)(key, size, nowait ? 0 : -1);`
	`28`	`+ return (*raftable_get_impl)(key, size);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`
`32`		`-void RaftableSet(char const* key, void const* value, int size, bool nowait)`
	`32`	`+void RaftableSet(char const* key, void const* value, size_t size, bool nowait)`
`33`	`33`	`{`
`34`	`34`	`if (MtmUseRaftable) {`
`35`	`35`	`RaftableResolve();`
`36`	`36`	`(*raftable_set_impl)(key, value, size, nowait ? 0 : -1);`
`37`	`37`	`}`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+bool RaftableCAS(char const* key, char const* value, bool nowait)`
	`41`	`+{`
	`42`	`+ if (!MtmUseRaftable) return false;`
	`43`	`+`
	`44`	`+ Assert(false); /* not implemented */`
	`45`	`+ return false;`
	`46`	`+}`