external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more Makefile cleanup

merge-cstore-pykello
Jeff Davis 2020-09-16 11:06:40 -07:00
parent ec8afe0a5d
commit 4dfec401ce
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -15,6 +15,7 @@ endif
MVER = $(firstword $(VER_WORDS)) MVER = $(firstword $(VER_WORDS))
# version >= 12?
ifeq ($(lastword $(sort 12 $(MVER))),$(MVER)) ifeq ($(lastword $(sort 12 $(MVER))),$(MVER))
USE_TABLEAM = yes USE_TABLEAM = yes
USE_FDW = yes USE_FDW = yes
@ -32,7 +33,7 @@ DATA = cstore_fdw--1.7.sql cstore_fdw--1.6--1.7.sql cstore_fdw--1.5--1.6.sql cs
cstore_fdw--1.3--1.4.sql cstore_fdw--1.2--1.3.sql cstore_fdw--1.1--1.2.sql \ cstore_fdw--1.3--1.4.sql cstore_fdw--1.2--1.3.sql cstore_fdw--1.1--1.2.sql \
cstore_fdw--1.0--1.1.sql cstore_fdw--1.7--1.8.sql cstore_fdw--1.0--1.1.sql cstore_fdw--1.7--1.8.sql
REGRESS = extension_create REGRESS = extension_create
EXTRA_CLEAN = cstore.pb-c.h cstore.pb-c.c data/*.cstore data/*.cstore.footer \ EXTRA_CLEAN = cstore.pb-c.h cstore.pb-c.c data/*.cstore data/*.cstore.footer \
sql/block_filtering.sql sql/create.sql sql/data_types.sql sql/load.sql \ sql/block_filtering.sql sql/create.sql sql/data_types.sql sql/load.sql \
sql/copyto.sql expected/block_filtering.out expected/create.out \ sql/copyto.sql expected/block_filtering.out expected/create.out \
@ -74,10 +75,7 @@ PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS) include $(PGXS)
installcheck: remove_cstore_files installcheck:
remove_cstore_files:
rm -f data/*.cstore data/*.cstore.footer
reindent: reindent:
citus_indent . citus_indent .

16
mod.c
View File

@ -16,28 +16,38 @@
#include "fmgr.h" #include "fmgr.h"
#include "mod.h" #include "mod.h"
#if PG_VERSION_NUM >= 120000
#ifdef USE_TABLEAM
#include "cstore_tableam.h" #include "cstore_tableam.h"
#endif #endif
#ifdef USE_FDW
#include "cstore_fdw.h" #include "cstore_fdw.h"
#endif
PG_MODULE_MAGIC; PG_MODULE_MAGIC;
void void
_PG_init(void) _PG_init(void)
{ {
#if PG_VERSION_NUM >= 120000 #ifdef USE_TABLEAM
cstore_tableam_init(); cstore_tableam_init();
#endif #endif
#ifdef USE_FDW
cstore_fdw_init(); cstore_fdw_init();
#endif
} }
void void
_PG_fini(void) _PG_fini(void)
{ {
#if PG_VERSION_NUM >= 120000 #if USE_TABLEAM
cstore_tableam_finish(); cstore_tableam_finish();
#endif #endif
#ifdef USE_FDW
cstore_fdw_finish(); cstore_fdw_finish();
#endif
} }