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

change configure to not have options

pull/4311/head
Nils Dijk 2020-11-16 15:02:33 +01:00
parent 22df8027b0
commit 725f4a37d0
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
10 changed files with 32 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.global.in
View File

@ -92,8 +92,7 @@ endif
override CPPFLAGS := @CPPFLAGS@ @CITUS_CPPFLAGS@ -I '${citus_abs_top_srcdir}/src/include' -I'${citus_top_builddir}/src/include' $(CPPFLAGS)
override LDFLAGS += @LDFLAGS@ @CITUS_LDFLAGS@
USE_FDW:=@USE_FDW@
USE_TABLEAM:=@USE_TABLEAM@
HAS_TABLEAM:=@HAS_TABLEAM@
# optional file with user defined, additional, rules
-include ${citus_abs_srcdir}/src/Makefile.custom

76
configure vendored
View File

@ -622,8 +622,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
USE_TABLEAM
USE_FDW
HAS_TABLEAM
HAS_DOTGIT
POSTGRES_BUILDDIR
POSTGRES_SRCDIR
@ -692,8 +691,6 @@ with_extra_version
enable_coverage
with_libcurl
with_reports_hostname
with_columnar_tableam
with_columnar_fdw
'
ac_precious_vars='build_alias
host_alias
@ -1327,9 +1324,6 @@ Optional Packages:
--with-reports-hostname=HOSTNAME
Use HOSTNAME as hostname for statistics collection
and update checks
--without-columnar-tableam
compile with table access methods for columnar
--without-columnar-fdw compile with foreign data wrappers for columnar
Some influential environment variables:
PG_CONFIG Location to find pg_config for target PostgreSQL instalation
@ -4476,69 +4470,13 @@ _ACEOF
if test "$version_num" != '11'; then
HAS_TABLEAM=yes
# Check whether --with-columnar-tableam was given.
if test "${with_columnar_tableam+set}" = set; then :
withval=$with_columnar_tableam;
case $withval in
yes)
USE_TABLEAM=yes
;;
no)
:
;;
*)
as_fn_error $? "no argument expected for --with-columnar-tableam option" "$LINENO" 5
;;
esac
$as_echo "#define HAS_TABLEAM 1" >>confdefs.h
else
with_columnar_tableam=yes
USE_TABLEAM=yes
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: postgres does not support table access methodds" >&5
$as_echo "$as_me: postgres does not support table access methodds" >&6;}
fi;
if test "$USE_TABLEAM" = yes; then
$as_echo "#define USE_TABLEAM 1" >>confdefs.h
fi;
# Check whether --with-columnar-fdw was given.
if test "${with_columnar_fdw+set}" = set; then :
withval=$with_columnar_fdw;
case $withval in
yes)
USE_FDW=yes
;;
no)
:
;;
*)
as_fn_error $? "no argument expected for --with-columnar-fdw option" "$LINENO" 5
;;
esac
else
with_columnar_fdw=yes
USE_FDW=yes
fi
if test "$USE_FDW" = yes; then
$as_echo "#define USE_FDW 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: postgres version does not support table access methodds" >&5
$as_echo "$as_me: postgres version does not support table access methodds" >&6;}
fi;
# Check if git is installed, when installed the gitref of the checkout will be baked in the application
@ -4616,9 +4554,7 @@ POSTGRES_BUILDDIR="$POSTGRES_BUILDDIR"
HAS_DOTGIT="$HAS_DOTGIT"
USE_FDW="$USE_FDW"
USE_TABLEAM="$USE_TABLEAM"
HAS_TABLEAM="$HAS_TABLEAM"
ac_config_files="$ac_config_files Makefile.global"

21
configure.in
View File

@ -213,22 +213,10 @@ AC_DEFINE_UNQUOTED(REPORTS_BASE_URL, "$REPORTS_BASE_URL",
[Base URL for statistics collection and update checks])
if test "$version_num" != '11'; then
PGAC_ARG_BOOL(with, columnar-tableam, yes,
[compile with table access methods for columnar],
[USE_TABLEAM=yes])
HAS_TABLEAM=yes
AC_DEFINE([HAS_TABLEAM], 1, [Define to 1 to build with table access method support, pg12 and up])
else
AC_MSG_NOTICE([postgres does not support table access methodds])
fi;
if test "$USE_TABLEAM" = yes; then
AC_DEFINE([USE_TABLEAM], 1, [Define to 1 to build with table access method support. (--with-columnar-tableam)])
fi;
PGAC_ARG_BOOL(with, columnar-fdw, yes,
[compile with foreign data wrappers for columnar],
[USE_FDW=yes])
if test "$USE_FDW" = yes; then
AC_DEFINE([USE_FDW], 1, [Define to 1 to build with foreign datawrapper support. (--with-columnar-fdw)])
AC_MSG_NOTICE([postgres version does not support table access methodds])
fi;
# Check if git is installed, when installed the gitref of the checkout will be baked in the application
@ -241,8 +229,7 @@ AC_SUBST(CITUS_LDFLAGS, "$LIBS $CITUS_LDFLAGS")
AC_SUBST(POSTGRES_SRCDIR, "$POSTGRES_SRCDIR")
AC_SUBST(POSTGRES_BUILDDIR, "$POSTGRES_BUILDDIR")
AC_SUBST(HAS_DOTGIT, "$HAS_DOTGIT")
AC_SUBST(USE_FDW, "$USE_FDW")
AC_SUBST(USE_TABLEAM, "$USE_TABLEAM")
AC_SUBST(HAS_TABLEAM, "$HAS_TABLEAM")
AC_CONFIG_FILES([Makefile.global])
AC_CONFIG_HEADERS([src/include/citus_config.h] [src/include/citus_version.h])

4
src/backend/columnar/cstore_customscan.c
View File

@ -11,7 +11,7 @@
*/
#include "citus_version.h"
#if USE_TABLEAM
#if HAS_TABLEAM
#include "postgres.h"
@ -426,4 +426,4 @@ CStoreScan_ReScanCustomScan(CustomScanState *node)
}
#endif /* USE_TABLEAM */
#endif /* HAS_TABLEAM */

2
src/backend/columnar/cstore_tableam.c
View File

@ -1,5 +1,5 @@
#include "citus_version.h"
#if USE_TABLEAM
#if HAS_TABLEAM
#include "postgres.h"

23
src/backend/columnar/mod.c
View File

@ -18,27 +18,22 @@
#include "citus_version.h"
#include "columnar/cstore.h"
#include "columnar/cstore_fdw.h"
#include "columnar/mod.h"
#ifdef USE_TABLEAM
#ifdef HAS_TABLEAM
#include "columnar/cstore_tableam.h"
#endif
#ifdef USE_FDW
#include "columnar/cstore_fdw.h"
#endif
void
columnar_init(void)
{
cstore_init();
#ifdef USE_TABLEAM
cstore_tableam_init();
#endif
#ifdef USE_FDW
cstore_fdw_init();
#ifdef HAS_TABLEAM
cstore_tableam_init();
#endif
}
@ -46,11 +41,9 @@ columnar_init(void)
void
columnar_fini(void)
{
#if USE_TABLEAM
cstore_fdw_finish();
#if HAS_TABLEAM
cstore_tableam_finish();
#endif
#ifdef USE_FDW
cstore_fdw_finish();
#endif
}

11
src/include/citus_config.h.in
View File

@ -31,6 +31,9 @@
/* A string containing the version number, platform, and C compiler */
#undef CITUS_VERSION_STR
/* Define to 1 to build with table access method support, pg12 and up */
#undef HAS_TABLEAM
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@ -87,11 +90,3 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to 1 to build with foreign datawrapper support.
(--with-columnar-fdw) */
#undef USE_FDW
/* Define to 1 to build with table access method support.
(--with-columnar-tableam) */
#undef USE_TABLEAM

5
src/include/citus_version.h.in
View File

@ -27,8 +27,5 @@
/* Base URL for statistics collection and update checks */
#undef REPORTS_BASE_URL
/* columnar foreign data wrapper capability */
#undef USE_FDW
/* columnar table access method capability */
#undef USE_TABLEAM
#undef HAS_TABLEAM

2
src/include/columnar/cstore_tableam.h
View File

@ -1,5 +1,5 @@
#include "citus_version.h"
#if USE_TABLEAM
#if HAS_TABLEAM
#include "postgres.h"
#include "fmgr.h"

10
src/test/regress/Makefile
View File

@ -163,11 +163,11 @@ check-follower-cluster: all
COLUMNAR_SCHEDULES =
COLUMNAR_ISOLATION_SCHEDULES =
ifeq ($(USE_FDW),yes)
COLUMNAR_SCHEDULES += columnar_fdw_schedule
COLUMNAR_ISOLATION_SCHEDULES += columnar_fdw_isolation_schedule
endif
ifeq ($(USE_TABLEAM),yes)
# even though we always add the fdw schedules, keep them separate from the declaration
# above for easy removabl when fdw support is removed
COLUMNAR_SCHEDULES += columnar_fdw_schedule
COLUMNAR_ISOLATION_SCHEDULES += columnar_fdw_isolation_schedule
ifeq ($(HAS_TABLEAM),yes)
COLUMNAR_SCHEDULES += columnar_am_schedule
COLUMNAR_ISOLATION_SCHEDULES += columnar_am_isolation_schedule
endif