This is an automated email from the ASF dual-hosted git repository.
okislal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git
commit 95b3643f087e357dd9d3cbb3083dd543101159f2
Author: Orhan Kislal <okis...@apache.org>
AuthorDate: Fri Nov 5 17:54:55 2021 -0400
Revert "Build: Fix module pathname for gppkg"
This reverts commit e1337aec283e3bcfb9de0a6f950f780664fa9940.
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.
---
deploy/gppkg/gppkg_spec.yml.in | 3 --
deploy/gppkg/madlib.spec.in | 2 --
src/madpack/changelist_1.18.0_1.19.0-dev.yaml | 50 ---------------------------
src/madpack/madpack.py | 12 +------
4 files changed, 1 insertion(+), 66 deletions(-)
diff --git a/deploy/gppkg/gppkg_spec.yml.in b/deploy/gppkg/gppkg_spec.yml.in
index 8be15b4..474fda0 100644
--- a/deploy/gppkg/gppkg_spec.yml.in
+++ b/deploy/gppkg/gppkg_spec.yml.in
@@ -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"
diff --git a/deploy/gppkg/madlib.spec.in b/deploy/gppkg/madlib.spec.in
index c2ca316..78fdb90 100644
--- a/deploy/gppkg/madlib.spec.in
+++ b/deploy/gppkg/madlib.spec.in
@@ -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
diff --git a/src/madpack/changelist_1.18.0_1.19.0-dev.yaml
b/src/madpack/changelist_1.18.0_1.19.0-dev.yaml
deleted file mode 100644
index c1aad8d..0000000
--- a/src/madpack/changelist_1.18.0_1.19.0-dev.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-#
------------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
------------------------------------------------------------------------------
-
-# Changelist for MADlib version rel/v1.15 to rel/v1.15.1
-
-# This file contains all changes that were introduced in a new version of
-# MADlib. This changelist is used by the upgrade script to detect what objects
-# should be upgraded (while retaining all other objects from the previous
version)
-
-# New modules (actually .sql_in files) added in upgrade version
-# For these files the sql_in code is retained as is with the functions in the
-# file installed on the upgrade version. All other files (that don't have
-# updates), are cleaned up to remove object replacements
-new module:
-
-# Changes in the types (UDT) including removal and modification
-udt:
-
-# List of the UDF changes that affect the user externally. This includes change
-# in function name, return type, argument order or types, or removal of
-# the function. In each case, the original function is as good as removed and a
-# new function is created. In such cases, we should abort the upgrade if there
-# are user views dependent on this function, since the original function will
-# not be present in the upgraded version.
-udf:
-
-# Changes to aggregates (UDA) including removal and modification
-# Overloaded functions should be mentioned separately
-uda:
-
-# List of the UDC, UDO and UDOC changes.
-udc:
-udo:
-udoc:
diff --git a/src/madpack/madpack.py b/src/madpack/madpack.py
index e29e0cf..f620a68 100755
--- a/src/madpack/madpack.py
+++ b/src/madpack/madpack.py
@@ -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):
@@ -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"
