Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit8f39700

Browse files
kvapkelvich
authored andcommitted
Fix conflicting raftable header names. Remove raftable.o from Makefile.
1 parent90ef453 commit8f39700

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MODULE_big = multimaster
2-
OBJS = multimaster.oraftable.oarbiter.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
2+
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
33

44
overrideCPPFLAGS += -I../raftable
55

‎multimaster.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
#include"catalog/indexing.h"
5656
#include"pglogical_output/hooks.h"
5757

58-
#include"raftable.h"
5958
#include"multimaster.h"
6059
#include"ddd.h"
60+
#include"raftable_wrapper.h"
6161
#include"raftable.h"
6262

6363
typedefstruct {
@@ -2370,3 +2370,24 @@ MtmDetectGlobalDeadLock(PGPROC* proc)
23702370
}
23712371
returnhasDeadlock;
23722372
}
2373+
2374+
void*RaftableGet(charconst*key,int*size,RaftableTimestamp*ts,boolnowait)
2375+
{
2376+
size_ts;
2377+
char*value;
2378+
Assert(ts==NULL);/* not implemented */
2379+
value=raftable_get(key,&s);
2380+
*size=s;
2381+
returnvalue;
2382+
}
2383+
2384+
voidRaftableSet(charconst*key,voidconst*value,intsize,boolnowait)
2385+
{
2386+
raftable_set(key,value,size,nowait ?0 :-1);
2387+
}
2388+
2389+
boolRaftableCAS(charconst*key,charconst*value,boolnowait)
2390+
{
2391+
Assert(false);/* not implemented */
2392+
return false;
2393+
}

‎raftable.hrenamed to‎raftable_wrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef__RAFTABLE_H__
2-
#define__RAFTABLE_H__
1+
#ifndef__RAFTABLE_WRAPPER_H__
2+
#define__RAFTABLE_WRAPPER_H__
33

44
typedefstructRaftableTimestamp {
55
time_ttime;/* local time at master */

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp