Add a check that Raft is configured into the set-get-cas functions.

kvap · kvap · commit 1deed765720e · 2016-03-30T13:04:26.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2377,6 +2377,9 @@ 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;
@@ -2385,11 +2388,15 @@ void* RaftableGet(char const* key, int* size, RaftableTimestamp* ts, bool nowait
 
 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -2377,6 +2377,9 @@ void* RaftableGet(char const* key, int* size, RaftableTimestamp* ts, bool nowait`
`2377`	`2377`	`{`
`2378`	`2378`	`size_t s;`
`2379`	`2379`	`char *value;`
	`2380`	`+`
	`2381`	`+ if (!MtmUseRaftable) return NULL;`
	`2382`	`+`
`2380`	`2383`	`Assert(ts == NULL); /* not implemented */`
`2381`	`2384`	`value = raftable_get(key, &s);`
`2382`	`2385`	`*size = s;`
`@@ -2385,11 +2388,15 @@ void* RaftableGet(char const* key, int* size, RaftableTimestamp* ts, bool nowait`
`2385`	`2388`
`2386`	`2389`	`void RaftableSet(char const* key, void const* value, int size, bool nowait)`
`2387`	`2390`	`{`
	`2391`	`+ if (!MtmUseRaftable) return;`
	`2392`	`+`
`2388`	`2393`	`raftable_set(key, value, size, nowait ? 0 : -1);`
`2389`	`2394`	`}`
`2390`	`2395`
`2391`	`2396`	`bool RaftableCAS(char const* key, char const* value, bool nowait)`
`2392`	`2397`	`{`
	`2398`	`+ if (!MtmUseRaftable) return false;`
	`2399`	`+`
`2393`	`2400`	`Assert(false); /* not implemented */`
`2394`	`2401`	`return false;`
`2395`	`2402`	`}`