Skip to content

Commit

Permalink
Revert "Build: Fix module pathname for gppkg"
Browse files Browse the repository at this point in the history
This reverts commit e1337ae.

The reverted commit was creating a symlink for the lilbmadlib.so file.
Since we decided to use the dynamic_library_path GUC, this link is
and the associated changes are not needed any more.
  • Loading branch information
orhankislal committed Dec 8, 2021
1 parent ac0c46d commit 95b3643
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 66 deletions.
3 changes: 0 additions & 3 deletions deploy/gppkg/gppkg_spec.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,3 @@ PostInstall:
echo 'For additional options run:';
echo '$ madpack --help';
echo 'Release notes and additional documentation can be found at http://madlib.apache.org';"
PostUninstall:
- Master: "rm $GPHOME/lib/postgresql/libmadlib.so"
- Segment: "rm $GPHOME/lib/postgresql/libmadlib.so"
2 changes: 0 additions & 2 deletions deploy/gppkg/madlib.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ ln -nsf $RPM_INSTALL_PREFIX/madlib/Versions/$MADLIB_VERSION $RPM_INSTALL_PREFIX/
ln -nsf $RPM_INSTALL_PREFIX/madlib/Current/bin $RPM_INSTALL_PREFIX/madlib/bin
ln -nsf $RPM_INSTALL_PREFIX/madlib/Current/doc $RPM_INSTALL_PREFIX/madlib/doc

ln -nsf $RPM_INSTALL_PREFIX/madlib/Current/ports/greenplum/@GPDB_VERSION@/lib/libmadlib.so $RPM_INSTALL_PREFIX/lib/postgresql/libmadlib.so

# creating symlink for madpack (does not work at present)
# find $RPM_INSTALL_PREFIX/bin/madpack -type f -exec mv {} $RPM_INSTALL_PREFIX/bin/old_madpack \; 2>/dev/null
# ln -nsf $RPM_INSTALL_PREFIX/madlib/Current/bin/madpack $RPM_INSTALL_PREFIX/bin/madpack
Expand Down
50 changes: 0 additions & 50 deletions src/madpack/changelist_1.18.0_1.19.0-dev.yaml

This file was deleted.

12 changes: 1 addition & 11 deletions src/madpack/madpack.py
Original file line number Diff line number Diff line change
Expand Up @@ -1232,13 +1232,6 @@ def get_madlib_function_drop_str(schema):
for idx in range(len(madlib_functions)):

func = madlib_functions[idx]

# Filter out the DEFAULT value from the function arguments
# DROP FUNCTION statements do not need or allow default values:
# DROP FUNCTION foo(bar INTEGER DEFAULT 0);
func['args'] = func['args'].split(',')
func['args'] = [i.split('DEFAULT')[0] for i in func['args']]
func['args'] = ', '.join(func['args'])
# We don't drop type related functions
no_drop = ['bytea8', 'float8arr', 'svec']
if not any(x in func['name'] for x in no_drop):
Expand Down Expand Up @@ -1410,10 +1403,7 @@ def main(argv):
maddir_conf = maddir + "/config"

global maddir_lib
if portid == 'greenplum' and \
os.path.islink(maddir + "/../../../lib/postgresql/libmadlib.so"):
maddir_lib = '$libdir/libmadlib.so'
elif os.path.isfile(maddir + "/ports/" + portid + "/" + dbver +
if os.path.isfile(maddir + "/ports/" + portid + "/" + dbver +
"/lib/libmadlib.so"):
maddir_lib = maddir + "/ports/" + portid + "/" + dbver + \
"/lib/libmadlib.so"
Expand Down

0 comments on commit 95b3643

Please sign in to comment.