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

Clean up & address rest of comments

pull/5661/head
Yanwen Jin 2022-02-08 14:30:31 -08:00
parent 613e4d4274
commit ea449bc9c8
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -10,9 +10,6 @@ ifeq (,$(wildcard Makefile.global))
endif endif
include Makefile.global include Makefile.global
# directories with source files
SUBDIRS += $(citus_top_builddir)/src/backend/columnar/safeclib
ENSURE_SUBDIRS_EXIST := $(shell mkdir -p $(SUBDIRS))
all: extension all: extension

2
src/backend/columnar/Makefile
View File

@ -3,12 +3,12 @@ citus_top_builddir = ../../..
safestringlib_srcdir = $(citus_abs_top_srcdir)/vendor/safestringlib safestringlib_srcdir = $(citus_abs_top_srcdir)/vendor/safestringlib
SUBDIRS = . safeclib SUBDIRS = . safeclib
SUBDIRS += SUBDIRS +=
ENSURE_SUBDIRS_EXIST := $(shell mkdir -p $(SUBDIRS))
OBJS += \ OBJS += \
$(patsubst $(citus_abs_srcdir)/%.c,%.o,$(foreach dir,$(SUBDIRS), $(sort $(wildcard $(citus_abs_srcdir)/$(dir)/*.c)))) $(patsubst $(citus_abs_srcdir)/%.c,%.o,$(foreach dir,$(SUBDIRS), $(sort $(wildcard $(citus_abs_srcdir)/$(dir)/*.c))))
MODULE_big = columnar MODULE_big = columnar
PG_CPPFLAGS += -I$(libpq_srcdir) -I$(safestringlib_srcdir)/include PG_CPPFLAGS += -I$(libpq_srcdir) -I$(safestringlib_srcdir)/include
include $(citus_top_builddir)/Makefile.global include $(citus_top_builddir)/Makefile.global

4
src/backend/distributed/Makefile
View File

@ -36,12 +36,12 @@ all:
NO_PGXS = 1 NO_PGXS = 1
SHLIB_LINK += $(libpq) SHLIB_LINK = $(libpq)
SHLIB_LINK_INTERNAL += -L../columnar -l:columnar.so SHLIB_LINK_INTERNAL += -L../columnar -l:columnar.so
override enable_rpath = yes override enable_rpath = yes
include $(citus_top_builddir)/Makefile.global include $(citus_top_builddir)/Makefile.global
rpathdir = $(shell $(PG_CONFIG) --libdir):$(shell $(PG_CONFIG) --pkglibdir) rpathdir := $(shell $(PG_CONFIG) --libdir):$(shell $(PG_CONFIG) --pkglibdir)
# make sure citus_version.o is recompiled whenever any change is made to the binary or any # make sure citus_version.o is recompiled whenever any change is made to the binary or any
# other artifact being installed to reflect the correct gitref for every build # other artifact being installed to reflect the correct gitref for every build

2
src/test/regress/Makefile
View File

@ -192,8 +192,6 @@ check-operations: all
-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/operations_schedule $(EXTRA_TESTS) -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/operations_schedule $(EXTRA_TESTS)
check-columnar: check-columnar:
ldd /usr/lib/postgresql/13/lib/citus.so
readelf -d /usr/lib/postgresql/13/lib/citus.so
$(pg_regress_multi_check) --load-extension=citus \ $(pg_regress_multi_check) --load-extension=citus \
-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS) -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS)