Skip to content
This repository was archived by the owner on May 24, 2024. It is now read-only.

Commit 6bc9129

Browse files
author
Ashwin Agrawal
committed
Delete gpmapreduce code
It's decided that this functionality will not be provided for GPDB7 and forward. Hence, deleting the code for the same. Reviewed-by: Adam Lee <[email protected]>
1 parent ea614bb commit 6bc9129

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+20
-13881
lines changed

‎.travis.yml

-2
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ script:
228228
--with-ldap \
229229
--with-libcurl \
230230
--with-libxml \
231-
--enable-mapreduce \
232231
--enable-orafce \
233232
--enable-ic-proxy \
234233
$C
@@ -263,7 +262,6 @@ script:
263262
--with-ldap \
264263
--with-libcurl \
265264
--with-libxml \
266-
--enable-mapreduce \
267265
--enable-orafce \
268266
--enable-ic-proxy \
269267
$C

‎README.macOS.arm.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fi
3434
#brew install xerces-c #gporca
3535
brew install bash-completion
3636
brew install cmake # gporca
37-
brew install libyaml # enables `--enable-mapreduce`
37+
brew install libyaml
3838
brew install libevent # gpfdist
3939
brew install apr # gpfdist
4040
brew install apr-util # gpfdist

‎README.macOS.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fi
1414
brew install bash-completion
1515
brew install cmake # gporca
1616
brew install xerces-c #gporca
17-
brew install libyaml # enables `--enable-mapreduce`
17+
brew install libyaml # gpfdist
1818
brew install libevent # gpfdist
1919
brew install apr # gpfdist
2020
brew install apr-util # gpfdist

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ throughout the codebase, but a few larger additions worth noting:
168168
* __gpcontrib/__
169169

170170
Much like the PostgreSQL contrib/ directory, this directory contains
171-
extensions such as gpfdist and gpmapreduce which are Greenplum-specific.
171+
extensions such as gpfdist which are Greenplum-specific.
172172

173173
* __doc/__
174174

‎concourse/scripts/builds/GpBuild.py

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ def __init__(self, mode="orca"):
1313
self.mode = 'on' if mode == 'orca' else 'off'
1414
self.configure_options = [
1515
"--enable-gpcloud",
16-
"--enable-mapreduce",
1716
"--enable-orafce",
1817
"--enable-tap-tests",
1918
"--with-gssapi",

‎concourse/scripts/common.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ function configure() {
142142
# The full set of configure options which were used for building the
143143
# tree must be used here as well since the toplevel Makefile depends
144144
# on these options for deciding what to test. Since we don't ship
145-
./configure --prefix=/usr/local/greenplum-db-devel --disable-orca --enable-gpcloud --enable-mapreduce --enable-orafce --enable-tap-tests --with-gssapi --with-libxml --with-openssl --with-perl --with-python --with-uuid=e2fs --with-llvm --with-zstd PYTHON=python3.9 PKG_CONFIG_PATH="${GPHOME}/lib/pkgconfig" ${CONFIGURE_FLAGS}
145+
./configure --prefix=/usr/local/greenplum-db-devel --disable-orca --enable-gpcloud --enable-orafce --enable-tap-tests --with-gssapi --with-libxml --with-openssl --with-perl --with-python --with-uuid=e2fs --with-llvm --with-zstd PYTHON=python3.9 PKG_CONFIG_PATH="${GPHOME}/lib/pkgconfig" ${CONFIGURE_FLAGS}
146146

147147
popd
148148
}

‎concourse/scripts/ic_resgroup.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ run_resgroup_icw_test() {
9090
sed -i '/resource_manager_switch/,/resource_manager_restore/d' src/test/regress/greenplum_schedule
9191
echo>src/test/isolation2/isolation2_resqueue_schedule
9292
./configure --prefix=/usr/local/greenplum-db-devel --disable-orca --enable-gpfdist \
93-
--enable-gpcloud --enable-mapreduce --enable-orafce --enable-tap-tests \
93+
--enable-gpcloud --enable-orafce --enable-tap-tests \
9494
--with-gssapi --with-libxml --with-openssl --with-perl --with-python \
9595
--with-uuid=e2fs --with-llvm --with-zstd PYTHON=python3.9 PKG_CONFIG_PATH="${GPHOME}/lib/pkgconfig" ${CONFIGURE_FLAGS}
9696

‎configure

+2-124
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,6 @@ INCLUDES
750750
enable_ic_proxy
751751
HAVE_CXX14
752752
enable_gpcloud
753-
enable_mapreduce
754753
enable_orca
755754
autodepend
756755
PKG_CONFIG_LIBDIR
@@ -879,7 +878,6 @@ with_llvm
879878
enable_depend
880879
enable_cassert
881880
enable_orca
882-
enable_mapreduce
883881
enable_gpcloud
884882
enable_ic_proxy
885883
enable_thread_safety
@@ -1577,7 +1575,6 @@ Optional Features:
15771575
--enable-depend turn on automatic dependency tracking
15781576
--enable-cassert enable assertion checks (for debugging)
15791577
--disable-orca disable ORCA optimizer
1580-
--enable-mapreduce enable Greenplum Mapreduce support
15811578
--enable-gpcloud enable gpcloud support
15821579
--enable-ic-proxy enable interconnect proxy mode (requires libuv
15831580
library)
@@ -8034,38 +8031,6 @@ $as_echo "#define GPOS_Darwin 1" >>confdefs.h
80348031
fi
80358032

80368033

8037-
#
8038-
# --enable-mapreduce enables GPMapreduce support
8039-
#
8040-
8041-
8042-
# Check whether --enable-mapreduce was given.
8043-
if test "${enable_mapreduce+set}" = set; then :
8044-
enableval=$enable_mapreduce;
8045-
case $enableval in
8046-
yes)
8047-
8048-
$as_echo "#define USE_MAPREDUCE 1" >>confdefs.h
8049-
8050-
;;
8051-
no)
8052-
:
8053-
;;
8054-
*)
8055-
as_fn_error $? "no argument expected for --enable-mapreduce option" "$LINENO" 5
8056-
;;
8057-
esac
8058-
8059-
else
8060-
enable_mapreduce=no
8061-
8062-
fi
8063-
8064-
8065-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to build with Greenplum Mapreduce... $enable_mapreduce" >&5
8066-
$as_echo "checking whether to build with Greenplum Mapreduce... $enable_mapreduce" >&6; }
8067-
8068-
80698034
#
80708035
# gpcloud, enabled by default
80718036
#
@@ -13945,73 +13910,7 @@ if test "$ac_res" != no; then :
1394513910
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
1394613911
have_yaml=yes; YAML_LIBS=" -lyaml"
1394713912
else
13948-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libyaml is not found. disabling transformations for gpfdist." >&5
13949-
$as_echo "$as_me: WARNING: libyaml is not found. disabling transformations for gpfdist." >&2;}
13950-
fi
13951-
13952-
13953-
13954-
LIBS="$_LIBS"
13955-
fi
13956-
13957-
if test "$enable_mapreduce" = yes ; then
13958-
_LIBS="$LIBS"
13959-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yaml_parser_initialize" >&5
13960-
$as_echo_n "checking for library containing yaml_parser_initialize... " >&6; }
13961-
if ${ac_cv_search_yaml_parser_initialize+:} false; then :
13962-
$as_echo_n "(cached) " >&6
13963-
else
13964-
ac_func_search_save_LIBS=$LIBS
13965-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13966-
/* end confdefs.h. */
13967-
13968-
/* Override any GCC internal prototype to avoid an error.
13969-
Use char because int might match the return type of a GCC
13970-
builtin and then its argument prototype would still apply. */
13971-
#ifdef __cplusplus
13972-
extern "C"
13973-
#endif
13974-
char yaml_parser_initialize ();
13975-
int
13976-
main ()
13977-
{
13978-
return yaml_parser_initialize ();
13979-
;
13980-
return 0;
13981-
}
13982-
_ACEOF
13983-
for ac_lib in '' yaml; do
13984-
if test -z "$ac_lib"; then
13985-
ac_res="none required"
13986-
else
13987-
ac_res=-l$ac_lib
13988-
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
13989-
fi
13990-
if ac_fn_c_try_link "$LINENO"; then :
13991-
ac_cv_search_yaml_parser_initialize=$ac_res
13992-
fi
13993-
rm -f core conftest.err conftest.$ac_objext \
13994-
conftest$ac_exeext
13995-
if ${ac_cv_search_yaml_parser_initialize+:} false; then :
13996-
break
13997-
fi
13998-
done
13999-
if ${ac_cv_search_yaml_parser_initialize+:} false; then :
14000-
14001-
else
14002-
ac_cv_search_yaml_parser_initialize=no
14003-
fi
14004-
rm conftest.$ac_ext
14005-
LIBS=$ac_func_search_save_LIBS
14006-
fi
14007-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yaml_parser_initialize" >&5
14008-
$as_echo "$ac_cv_search_yaml_parser_initialize" >&6; }
14009-
ac_res=$ac_cv_search_yaml_parser_initialize
14010-
if test "$ac_res" != no; then :
14011-
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
14012-
have_yaml=yes; YAML_LIBS=" -lyaml"
14013-
else
14014-
as_fn_error $? "libyaml is required for Greenplum Mapreduce" "$LINENO" 5
13913+
as_fn_error $? "libyaml is required for transformations for gpfdist." "$LINENO" 5
1401513914
fi
1401613915

1401713916

@@ -15512,8 +15411,7 @@ if test "x$ac_cv_header_yaml_h" = xyes; then :
1551215411
_ACEOF
1551315412

1551415413
else
15515-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: header file <yaml.h> is not found. disabling transformations for gpfdist." >&5
15516-
$as_echo "$as_me: WARNING: header file <yaml.h> is not found. disabling transformations for gpfdist." >&2;}
15414+
as_fn_error $? "header file <yaml.h> is required for transformations for gpfdist." "$LINENO" 5
1551715415
fi
1551815416

1551915417
done
@@ -16019,26 +15917,6 @@ done
1601915917

1602015918
fi
1602115919

16022-
if test "$enable_mapreduce" = yes; then
16023-
if test "$with_perl" = no; then
16024-
as_fn_error $? "Greenplum Mapreduce requires Perl, reconfigure with --with-perl" "$LINENO" 5
16025-
fi
16026-
for ac_header in yaml.h
16027-
do :
16028-
ac_fn_c_check_header_mongrel "$LINENO" "yaml.h" "ac_cv_header_yaml_h" "$ac_includes_default"
16029-
if test "x$ac_cv_header_yaml_h" = xyes; then :
16030-
cat >>confdefs.h <<_ACEOF
16031-
#define HAVE_YAML_H 1
16032-
_ACEOF
16033-
16034-
else
16035-
as_fn_error $? "header file <yaml.h> is required for Greenplum Mapreduce" "$LINENO" 5
16036-
fi
16037-
16038-
done
16039-
16040-
fi
16041-
1604215920
if test "$PORTNAME" = "win32" ; then
1604315921
for ac_header in crtdefs.h
1604415922
do :

‎configure.in

+2-26
Original file line numberDiff line numberDiff line change
@@ -812,15 +812,6 @@ if test "$PORTNAME" = darwin; then
812812
fi
813813

814814

815-
#
816-
# --enable-mapreduce enables GPMapreduce support
817-
#
818-
PGAC_ARG_BOOL(enable, mapreduce, no, [enable Greenplum Mapreduce support],
819-
[AC_DEFINE([USE_MAPREDUCE], 1,
820-
[Define to 1 to build with Mapreduce capabilities (--enable-mapreduce)])])
821-
AC_MSG_RESULT([checking whether to build with Greenplum Mapreduce... $enable_mapreduce])
822-
AC_SUBST(enable_mapreduce)
823-
824815
#
825816
# gpcloud, enabled by default
826817
#
@@ -1469,15 +1460,7 @@ if test "$enable_gpfdist" = yes ; then
14691460
EVENT_LIBS=" -levent"
14701461
AC_SUBST(EVENT_LIBS)
14711462

1472-
AC_SEARCH_LIBS(yaml_parser_initialize, [yaml], [have_yaml=yes; YAML_LIBS=" -lyaml"], [AC_MSG_WARN([libyaml is not found. disabling transformations for gpfdist.])])
1473-
AC_SUBST(YAML_LIBS)
1474-
AC_SUBST(have_yaml)
1475-
LIBS="$_LIBS"
1476-
fi
1477-
1478-
if test "$enable_mapreduce" = yes ; then
1479-
_LIBS="$LIBS"
1480-
AC_SEARCH_LIBS(yaml_parser_initialize, [yaml], [have_yaml=yes; YAML_LIBS=" -lyaml"], [AC_MSG_ERROR([libyaml is required for Greenplum Mapreduce])])
1463+
AC_SEARCH_LIBS(yaml_parser_initialize, [yaml], [have_yaml=yes; YAML_LIBS=" -lyaml"], [AC_MSG_ERROR([libyaml is required for transformations for gpfdist.])])
14811464
AC_SUBST(YAML_LIBS)
14821465
AC_SUBST(have_yaml)
14831466
LIBS="$_LIBS"
@@ -1727,7 +1710,7 @@ if test "$enable_gpfdist" = yes; then
17271710
AC_CHECK_HEADERS([winsock2.h])
17281711
fi
17291712

1730-
AC_CHECK_HEADERS(yaml.h, [], [AC_MSG_WARN([header file <yaml.h> is not found. disabling transformations for gpfdist.])])
1713+
AC_CHECK_HEADERS(yaml.h, [], [AC_MSG_ERROR([header file <yaml.h> is required for transformations for gpfdist.])])
17311714
AC_CHECK_HEADERS(event.h, [], [AC_MSG_ERROR([header file <event.h> is required for gpfdist])])
17321715

17331716
ac_save_CPPFLAGS=$CPPFLAGS
@@ -1873,13 +1856,6 @@ if test "$with_rt" = yes; then
18731856
[AC_MSG_ERROR([header file <time.h> is required for realtime library support])])
18741857
fi
18751858

1876-
if test "$enable_mapreduce" = yes; then
1877-
if test "$with_perl" = no; then
1878-
AC_MSG_ERROR([Greenplum Mapreduce requires Perl, reconfigure with --with-perl])
1879-
fi
1880-
AC_CHECK_HEADERS(yaml.h, [], [AC_MSG_ERROR([header file <yaml.h> is required for Greenplum Mapreduce])])
1881-
fi
1882-
18831859
if test "$PORTNAME" = "win32" ; then
18841860
AC_CHECK_HEADERS(crtdefs.h)
18851861
fi

‎gpAux/Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@ DEFPORT=5432
120120

121121
ORCA_CONFIG=--enable-orca
122122

123-
rhel6_x86_64_CONFIGFLAGS=--with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
124-
rhel7_x86_64_CONFIGFLAGS=--with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
125-
rhel8_x86_64_CONFIGFLAGS=--with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
126-
rocky8_x86_64_CONFIGFLAGS=--with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
127-
rocky9_x86_64_CONFIGFLAGS=--with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs
128-
ol8_x86_64_CONFIGFLAGS=--with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
129-
ubuntu18.04_x86_64_CONFIGFLAGS=--with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
130-
sles12_x86_64_CONFIGFLAGS=--with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
123+
rhel6_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
124+
rhel7_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
125+
rhel8_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
126+
rocky8_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
127+
rocky9_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs
128+
ol8_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
129+
ubuntu18.04_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
130+
sles12_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-pythonsrc-ext --with-uuid=e2fs --with-llvm
131131
BLD_CONFIGFLAGS=$($(BLD_ARCH)_CONFIGFLAGS)
132132

133133
CONFIGFLAGS=$(strip $(BLD_CONFIGFLAGS) --with-pgport=$(DEFPORT) $(BLD_DEPLOYMENT_SETTING))

‎gpMgmt/doc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $(recurse)
1010
DOCS= gpactivatestandby_help gpaddmirrors_help gpcheckperf_help \
1111
gpconfig_help gpdeletesystem_help gpexpand_help gpfdist_help \
1212
gpinitstandby_help gpinitsystem_help gpload_help gplogfilter_help \
13-
gpmapreduce_help gprecoverseg_help \
13+
gprecoverseg_help \
1414
gpreload_help gpsync_help gpssh-exkeys_help gpssh_help gpstart_help \
1515
gpstate_help gpstop_help
1616

0 commit comments

Comments
 (0)