You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by ok...@apache.org on 2017/11/02 23:34:39 UTC
madlib git commit: Add support for GPDB 6.X versions
Repository: madlib
Updated Branches:
refs/heads/master 3057d3b7e -> aed4d9706
Add support for GPDB 6.X versions
Additional Author: Jingyi Mei <jm...@pivotal.io>
Closes #193
Project: http://git-wip-us.apache.org/repos/asf/madlib/repo
Commit: http://git-wip-us.apache.org/repos/asf/madlib/commit/aed4d970
Tree: http://git-wip-us.apache.org/repos/asf/madlib/tree/aed4d970
Diff: http://git-wip-us.apache.org/repos/asf/madlib/diff/aed4d970
Branch: refs/heads/master
Commit: aed4d9706e59c781f4a83a023358b70b65b84085
Parents: 3057d3b
Author: Orhan Kislal <ok...@pivotal.io>
Authored: Mon Oct 30 16:50:27 2017 -0700
Committer: Orhan Kislal <ok...@pivotal.io>
Committed: Thu Nov 2 16:33:36 2017 -0700
----------------------------------------------------------------------
src/madpack/madpack.py | 3 +++
src/ports/greenplum/6/CMakeLists.txt | 19 +++++++++++++++++++
src/ports/greenplum/cmake/FindGreenplum_6.cmake | 19 +++++++++++++++++++
src/ports/postgres/cmake/PostgreSQLUtils.cmake | 2 ++
4 files changed, 43 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/madlib/blob/aed4d970/src/madpack/madpack.py
----------------------------------------------------------------------
diff --git a/src/madpack/madpack.py b/src/madpack/madpack.py
index b49fbdb..887e028 100755
--- a/src/madpack/madpack.py
+++ b/src/madpack/madpack.py
@@ -1190,6 +1190,9 @@ def main(argv):
if (_is_rev_gte(_get_rev_num(dbver), _get_rev_num('5.0')) and
not _is_rev_gte(_get_rev_num(dbver), _get_rev_num('6.0'))):
dbver = '5'
+ elif (_is_rev_gte(_get_rev_num(dbver), _get_rev_num('6.0')) and
+ not _is_rev_gte(_get_rev_num(dbver), _get_rev_num('7.0'))):
+ dbver = '6'
# Due to the ABI incompatibility between 4.3.4 and 4.3.5,
# MADlib treats 4.3.5+ as DB version 4.3ORCA which is different
# from 4.3. The name is suffixed with ORCA since optimizer (ORCA) is
http://git-wip-us.apache.org/repos/asf/madlib/blob/aed4d970/src/ports/greenplum/6/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/ports/greenplum/6/CMakeLists.txt b/src/ports/greenplum/6/CMakeLists.txt
new file mode 100644
index 0000000..b93df9e
--- /dev/null
+++ b/src/ports/greenplum/6/CMakeLists.txt
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+add_current_greenplum_version()
http://git-wip-us.apache.org/repos/asf/madlib/blob/aed4d970/src/ports/greenplum/cmake/FindGreenplum_6.cmake
----------------------------------------------------------------------
diff --git a/src/ports/greenplum/cmake/FindGreenplum_6.cmake b/src/ports/greenplum/cmake/FindGreenplum_6.cmake
new file mode 100644
index 0000000..c5ea28f
--- /dev/null
+++ b/src/ports/greenplum/cmake/FindGreenplum_6.cmake
@@ -0,0 +1,19 @@
+# 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.
+
+set(_FIND_PACKAGE_FILE "${CMAKE_CURRENT_LIST_FILE}")
+include("${CMAKE_CURRENT_LIST_DIR}/FindGreenplum.cmake")
http://git-wip-us.apache.org/repos/asf/madlib/blob/aed4d970/src/ports/postgres/cmake/PostgreSQLUtils.cmake
----------------------------------------------------------------------
diff --git a/src/ports/postgres/cmake/PostgreSQLUtils.cmake b/src/ports/postgres/cmake/PostgreSQLUtils.cmake
index 7acdf9a..8f71193 100644
--- a/src/ports/postgres/cmake/PostgreSQLUtils.cmake
+++ b/src/ports/postgres/cmake/PostgreSQLUtils.cmake
@@ -71,6 +71,8 @@ function(determine_target_versions OUT_VERSIONS)
# implying we only need 1 folder for same major versions
if(${${PORT_UC}_VERSION_MAJOR} EQUAL 5)
set(VERSION "5")
+ elseif(${${PORT_UC}_VERSION_MAJOR} EQUAL 6)
+ set(VERSION "6")
# Due to the ABI incompatibility between 4.3.4 and 4.3.5,
# MADlib treat 4.3.5+ as DB version that is different from 4.3