Pull 99% of walproposer code into extension. (#188)

* Pull 99% of walproposer code into extension.

* Annotate nbytes to show it's used for asserts only, fixing one more warning.

* Fix makefiles:

- Include neon extensions into contrib Makefile
- Configure libpqwalproposer more like other extensions

* Add comment about lack of PG timelines, and make StartReplication static again.

* Fix some compiler warnings in vendor/postgres, and pull libpqwalproposer into vendor/neon

* Fix issue with makefile that didn't get caught in the normal test envs.

Author: MMeent

contrib/Makefile

@@ -26,6 +26,8 @@ SUBDIRS = \
 		isn		\
 		lo		\
 		ltree		\
+		neon	\
+		neon_test_utils	\
 		oid2name	\
 		old_snapshot	\
 		pageinspect	\

contrib/neon/Makefile

@@ -4,7 +4,14 @@
 MODULE_big = neon
 OBJS = \
 	$(WIN32RES) \
-	inmem_smgr.o libpagestore.o pagestore_smgr.o relsize_cache.o neon.o
+	inmem_smgr.o \
+	libpagestore.o \
+	libpqwalproposer.o \
+	pagestore_smgr.o \
+	relsize_cache.o \
+	neon.o \
+	walproposer.o \
+	walproposer_utils.o
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
 SHLIB_LINK_INTERNAL = $(libpq)
@@ -13,6 +20,7 @@ EXTENSION = neon
 DATA = neon--1.0.sql
 PGFILEDESC = "neon - cloud storage for PostgreSQL"
 
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)

contrib/neon/libpagestore.c

@@ -26,11 +26,10 @@
 #include "pgstat.h"
 #include "utils/guc.h"
 
-#include "replication/walproposer.h"
+#include "neon.h"
+#include "walproposer.h"
+#include "walproposer_utils.h"
 
-PG_MODULE_MAGIC;
-
-void		_PG_init(void);
 
 #define PageStoreTrace DEBUG5
 
@@ -355,7 +354,7 @@ substitute_pageserver_password(const char *page_server_connstring_raw)
  * Module initialization function
  */
 void
-_PG_init(void)
+pg_init_libpagestore(void)
 {
 	DefineCustomStringVariable("neon.pageserver_connstring",
 							   "connection string to the page server",

src/backend/replication/libpqwalproposer/libpqwalproposer.c renamed to contrib/neon/libpqwalproposer.c

@@ -1,11 +1,8 @@
 #include "postgres.h"
 
-#include "replication/walproposer.h"
 #include "libpq-fe.h"
-
-/* Required for anything that's dynamically loaded */
-PG_MODULE_MAGIC;
-void _PG_init(void);
+#include "neon.h"
+#include "walproposer.h"
 
 /* Header in walproposer.h -- Wrapper struct to abstract away the libpq connection */
 struct WalProposerConn
@@ -46,7 +43,7 @@ static WalProposerFunctionsType PQWalProposerFunctions = {
 
 /* Module initialization */
 void
-_PG_init(void)
+pg_init_libpqwalproposer(void)
 {
 	if (WalProposerFunctions != NULL)
 		elog(ERROR, "libpqwalproposer already loaded");

contrib/neon/neon.c

@@ -17,11 +17,24 @@
 #include "storage/bufmgr.h"
 #include "catalog/pg_type.h"
 #include "replication/walsender.h"
-#include "replication/walproposer.h"
 #include "funcapi.h"
 #include "access/htup_details.h"
 #include "utils/pg_lsn.h"
 
+#include "neon.h"
+#include "walproposer.h"
+
+PG_MODULE_MAGIC;
+void		_PG_init(void);
+
+
+void		_PG_init(void)
+{
+	pg_init_libpagestore();
+	pg_init_libpqwalproposer();
+	pg_init_walproposer();
+}
+
 PG_FUNCTION_INFO_V1(pg_cluster_size);
 PG_FUNCTION_INFO_V1(backpressure_lsns);
 

contrib/neon/neon.h

@@ -0,0 +1,19 @@
+/*-------------------------------------------------------------------------
+ *
+ * neon.h
+ *	  Functions used in the initialization of this extension.
+ *
+ * IDENTIFICATION
+ *	 contrib/neon/neon.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef NEON_H
+#define NEON_H
+
+extern void pg_init_libpagestore(void);
+extern void pg_init_libpqwalproposer(void);
+extern void pg_init_walproposer(void);
+
+#endif /* NEON_H */

contrib/neon/pagestore_client.h

@@ -182,7 +182,7 @@ extern void zenith_write(SMgrRelation reln, ForkNumber forknum,
 extern void zenith_writeback(SMgrRelation reln, ForkNumber forknum,
 							 BlockNumber blocknum, BlockNumber nblocks);
 extern BlockNumber zenith_nblocks(SMgrRelation reln, ForkNumber forknum);
-extern int64 zenith_dbsize(Oid dbNode);
+extern const int64 zenith_dbsize(Oid dbNode);
 extern void zenith_truncate(SMgrRelation reln, ForkNumber forknum,
 							BlockNumber nblocks);
 extern void zenith_immedsync(SMgrRelation reln, ForkNumber forknum);

contrib/neon/pagestore_smgr.c

@@ -1336,7 +1336,7 @@ zenith_nblocks(SMgrRelation reln, ForkNumber forknum)
 /*
  *	zenith_db_size() -- Get the size of the database in bytes.
  */
-int64
+const int64
 zenith_dbsize(Oid dbNode)
 {
 	ZenithResponse *resp;