From 35a71407082dbb38d16ca10e498bae12e32326b8 Mon Sep 17 00:00:00 2001 From: Tingfang Bao Date: Wed, 13 Mar 2019 11:21:42 +0800 Subject: [PATCH] Build necessary extensions for release (#7057) * Build necessary extensions for release * Add new '--enable-debug-extensions' configure option, if provide the option, the extensions include: gp_distribution_policy gp_internal_tools gp_sparse_vector gp_replica_check gp_inject_fault gp_debug_numsegments * Rename configure_flags to configure_flags_with_extensions The configure_flags_with_extensions SHOULD BE set to configure_flags_with_extensions: "--enable-cassert --enable-debug-extensions" in these secrets files secrets/gpdb_master-ci-secrets.dev.yml secrets/gpdb_master-ci-secrets.prod.yml Co-authored-by: Bob Bao Co-authored-by: Ning Fu --- concourse/pipelines/templates/gpdb-tpl.yml | 6 ++-- .../compile_gpdb_open_source_ubuntu.bash | 1 + configure | 32 +++++++++++++++++++ configure.in | 7 ++++ gpcontrib/Makefile | 16 ++++++++-- src/Makefile.global.in | 1 + 6 files changed, 57 insertions(+), 6 deletions(-) diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml index c0b26b8786..3738ef62e0 100644 --- a/concourse/pipelines/templates/gpdb-tpl.yml +++ b/concourse/pipelines/templates/gpdb-tpl.yml @@ -854,7 +854,7 @@ jobs: file: gpdb_src/concourse/tasks/compile_gpdb.yml image: gpdb6-centos6-build params: - CONFIGURE_FLAGS: {{configure_flags}} + CONFIGURE_FLAGS: {{configure_flags_with_extensions}} TARGET_OS: centos TARGET_OS_VERSION: 6 BLD_TARGETS: "clients loaders" @@ -897,7 +897,7 @@ jobs: image: gpdb6-centos7-build file: gpdb_src/concourse/tasks/compile_gpdb.yml params: - CONFIGURE_FLAGS: {{configure_flags}} + CONFIGURE_FLAGS: {{configure_flags_with_extensions}} TARGET_OS: centos TARGET_OS_VERSION: 7 BLD_TARGETS: "clients loaders" @@ -931,7 +931,7 @@ jobs: - task: compile_gpdb file: gpdb_src/concourse/tasks/compile_gpdb_sles11.yml params: - CONFIGURE_FLAGS: {{configure_flags}} + CONFIGURE_FLAGS: {{configure_flags_with_extensions}} TARGET_OS: sles TARGET_OS_VERSION: BLD_TARGETS: "clients loaders" diff --git a/concourse/scripts/compile_gpdb_open_source_ubuntu.bash b/concourse/scripts/compile_gpdb_open_source_ubuntu.bash index 2ec7862835..d7a377572b 100755 --- a/concourse/scripts/compile_gpdb_open_source_ubuntu.bash +++ b/concourse/scripts/compile_gpdb_open_source_ubuntu.bash @@ -33,6 +33,7 @@ function build_gpdb() { CWD=$(pwd) LD_LIBRARY_PATH=${CWD}/depends/build/lib CC=$(which gcc) CXX=$(which g++) ./configure --enable-mapreduce --enable-orafce --with-gssapi --with-perl --with-libxml \ --with-python \ + --enable-debug-extensions \ --with-libraries=${CWD}/depends/build/lib \ --with-includes=${CWD}/depends/build/include \ --prefix=${GREENPLUM_INSTALL_DIR} \ diff --git a/configure b/configure index 035839d1c1..9bff535c9f 100755 --- a/configure +++ b/configure @@ -777,6 +777,7 @@ GCOV enable_debug enable_gpperfmon enable_orafce +enable_debug_extensions enable_pxf enable_gpfdist enable_rpath @@ -846,6 +847,7 @@ enable_spinlocks enable_atomics enable_gpfdist enable_pxf +enable_debug_extensions enable_orafce enable_gpperfmon enable_debug @@ -1533,6 +1535,8 @@ Optional Features: --disable-atomics do not use atomic operations --disable-gpfdist do not use gpfdist --disable-pxf do not build pxf + --enable-debug-extensions + include debug extensions in gpcontrib --enable-orafce build with Oracle compatibility functions --enable-gpperfmon build with gpperfmon --enable-debug build with debugging symbols (-g) @@ -3546,6 +3550,34 @@ fi +# +# include debug extensions in gpcontrib +# + + +# Check whether --enable-debug-extensions was given. +if test "${enable_debug_extensions+set}" = set; then : + enableval=$enable_debug_extensions; + case $enableval in + yes) + : + ;; + no) + : + ;; + *) + as_fn_error $? "no argument expected for --enable-debug-extensions option" "$LINENO" 5 + ;; + esac + +else + enable_debug_extensions=no + +fi + + + + # # orafce # diff --git a/configure.in b/configure.in index 565a2d73f1..32336c6bfc 100644 --- a/configure.in +++ b/configure.in @@ -212,6 +212,13 @@ PGAC_ARG_BOOL(enable, pxf, yes, [do not build pxf]) AC_SUBST(enable_pxf) +# +# include debug extensions in gpcontrib +# +PGAC_ARG_BOOL(enable, debug-extensions, no, + [include debug extensions in gpcontrib]) +AC_SUBST(enable_debug_extensions) + # # orafce # diff --git a/gpcontrib/Makefile b/gpcontrib/Makefile index cb36d5c335..1b7bcbe30c 100644 --- a/gpcontrib/Makefile +++ b/gpcontrib/Makefile @@ -16,11 +16,21 @@ include $(top_builddir)/src/Makefile.global # # targets built via top_builddir/GNUmakefile # -recurse_targets = gp_sparse_vector \ - gp_debug_numsegments \ +recurse_targets = "" + +ifeq "$(enable_debug_extensions)" "yes" + recurse_targets = gp_sparse_vector \ gp_distribution_policy \ gp_internal_tools \ - gp_inject_fault + gp_debug_numsegments \ + gp_inject_fault \ + gp_replica_check +else + recurse_targets = gp_sparse_vector \ + gp_distribution_policy \ + gp_internal_tools +endif + ifeq "$(with_zstd)" "yes" recurse_targets += zstd endif diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 2467f3b94b..873c1d2edb 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -212,6 +212,7 @@ enable_largefile = @enable_largefile@ enable_orca = @enable_orca@ enable_gpfdist = @enable_gpfdist@ enable_pxf = @enable_pxf@ +enable_debug_extensions = @enable_debug_extensions@ enable_orafce = @enable_orafce@ enable_mapreduce = @enable_mapreduce@ enable_gpcloud = @enable_gpcloud@ -- GitLab