Fix some warnings in raftable. Link raft as .o files instead of .a.

kvap · kvap · commit 9b0e4c8960fe · 2016-03-31T14:14:51.000+03:00
diff --git a/contrib/raftable/Makefile b/contrib/raftable/Makefile
@@ -1,19 +1,19 @@
 MODULE_big = raftable
-OBJS = raftable.o worker.o state.o blockmem.o
+OBJS = raftable.o worker.o state.o blockmem.o raft/obj/raft.o raft/obj/util.o
 EXTENSION = raftable
 DATA = raftable--1.0.sql
 
-raftable.so: raft/lib/libraft.a
+.PHONY: all
 
-raft/lib/libraft.a:
-	make -C raft
+all: raftable.so
+
+raft/obj/raft.o raft/obj/util.o:
+	make -C raft obj/raft.o obj/util.o
 
 EXTRA_INSTALL = contrib/raftable
 
-RAFT_PREFIX = raft
-override LDFLAGS += -L$(RAFT_PREFIX)/lib -Wl,-whole-archive -lraft -Wl,-no-whole-archive
-override CFLAGS += -Wfatal-errors
-override CPPFLAGS += -I$(RAFT_PREFIX)/include
+override CFLAGS += -Wfatal-errors -Wall
+override CPPFLAGS += -Iraft/include
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/raftable/README b/contrib/raftable/README
@@ -4,12 +4,6 @@ Raftable
 This extension allows you to have a key-value table replicated between several
 Postgres instances over Raft protocol.
 
-Depends on
-----------
-
-Raft implementation in C: https://github.com/kvap/raft
-Please compile the raft library with -fpic flag.
-
 Internals
 ---------
 
diff --git a/contrib/raftable/blockmem.c b/contrib/raftable/blockmem.c
@@ -32,8 +32,6 @@ typedef struct block_t
 int
 blockmem_format(void *origin, size_t size)
 {
-	block_t *block;
-	meta_t *meta;
 	int id;
 	int blocks = (size - 1) / BLOCK_LEN;
 	if (blocks <= 0) return 0;
diff --git a/contrib/raftable/raftable.c b/contrib/raftable/raftable.c
@@ -160,7 +160,6 @@ char *raftable_get(const char *key, size_t *len)
 Datum
 raftable_sql_get(PG_FUNCTION_ARGS)
 {
-	RaftableEntry *e;
 	RaftableKey key;
 	size_t len;
 	text_to_cstring_buffer(PG_GETARG_TEXT_P(0), key.data, sizeof(key.data));
@@ -178,16 +177,6 @@ raftable_sql_get(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 }
 
-static void start_timer(TimestampTz *timer)
-{
-        *timer -= GetCurrentTimestamp();
-}
-
-static void stop_timer(TimestampTz *timer)
-{
-        *timer += GetCurrentTimestamp();
-}
-
 static long msec(TimestampTz timer)
 {
         long sec;
diff --git a/contrib/raftable/state.c b/contrib/raftable/state.c
@@ -264,7 +264,6 @@ StateP state_shmem_init()
 	info.keysize = sizeof(RaftableKey);
 	info.entrysize = sizeof(RaftableEntry);
 	bool found;
-	int i;
 
 	state = ShmemInitStruct(
 		"raftable_state",
diff --git a/contrib/raftable/worker.c b/contrib/raftable/worker.c
@@ -131,7 +131,6 @@ static bool add_socket(int sock)
 static bool add_client(int sock)
 {
 	int i;
-	Client *c = server.clients;
 
 	if (server.clientnum >= MAX_CLIENTS)
 	{
@@ -165,7 +164,6 @@ static bool remove_socket(int sock)
 
 static bool remove_client(Client *c)
 {
-	int i = 0;
 	int sock = c->sock;
 	Assert(sock >= 0);
 	c->sock = -1;
@@ -309,7 +307,7 @@ static void attend(Client *c)
 	}
 }
 
-static bool notify(void)
+static void notify(void)
 {
 	int i = 0;
 	for (i = 0; i < MAX_CLIENTS; i++)
@@ -343,7 +341,6 @@ static void drop_bads(void)
 
 static bool tick(int timeout_ms)
 {
-	int i;
 	int numready;
 	bool raft_ready = false;
 

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ typedef struct block_t`
`32`	`32`	`int`
`33`	`33`	`blockmem_format(void *origin, size_t size)`
`34`	`34`	`{`
`35`		`- block_t *block;`
`36`		`- meta_t *meta;`
`37`	`35`	`int id;`
`38`	`36`	`int blocks = (size - 1) / BLOCK_LEN;`
`39`	`37`	`if (blocks <= 0) return 0;`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,6 @@ static bool add_socket(int sock)`
`131`	`131`	`static bool add_client(int sock)`
`132`	`132`	`{`
`133`	`133`	`int i;`
`134`		`- Client *c = server.clients;`
`135`	`134`
`136`	`135`	`if (server.clientnum >= MAX_CLIENTS)`
`137`	`136`	`{`
`@@ -165,7 +164,6 @@ static bool remove_socket(int sock)`
`165`	`164`
`166`	`165`	`static bool remove_client(Client *c)`
`167`	`166`	`{`
`168`		`- int i = 0;`
`169`	`167`	`int sock = c->sock;`
`170`	`168`	`Assert(sock >= 0);`
`171`	`169`	`c->sock = -1;`
`@@ -309,7 +307,7 @@ static void attend(Client *c)`
`309`	`307`	`}`
`310`	`308`	`}`
`311`	`309`
`312`		`-static bool notify(void)`
	`310`	`+static void notify(void)`
`313`	`311`	`{`
`314`	`312`	`int i = 0;`
`315`	`313`	`for (i = 0; i < MAX_CLIENTS; i++)`
`@@ -343,7 +341,6 @@ static void drop_bads(void)`
`343`	`341`
`344`	`342`	`static bool tick(int timeout_ms)`
`345`	`343`	`{`
`346`		`- int i;`
`347`	`344`	`int numready;`
`348`	`345`	`bool raft_ready = false;`
`349`	`346`