You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by ri...@apache.org on 2017/01/11 23:19:40 UTC
incubator-madlib git commit: Build: Exclude AggCheckCallContext for
GPDB5
Repository: incubator-madlib
Updated Branches:
refs/heads/master e75a944e3 -> 3cf3f6771
Build: Exclude AggCheckCallContext for GPDB5
- Adds build files to compile MADlib with GPDB5
- GPDB5 cherrypicked AggCheckCallContext, we have to exclude it for GPDB5 builds
Closes #83
Project: http://git-wip-us.apache.org/repos/asf/incubator-madlib/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-madlib/commit/3cf3f677
Tree: http://git-wip-us.apache.org/repos/asf/incubator-madlib/tree/3cf3f677
Diff: http://git-wip-us.apache.org/repos/asf/incubator-madlib/diff/3cf3f677
Branch: refs/heads/master
Commit: 3cf3f6771ab51dd26605ce4d70cd70aee5d896dd
Parents: e75a944
Author: Dave Cramer <da...@gmail.com>
Authored: Wed Jan 11 15:17:01 2017 -0800
Committer: Rahul Iyer <ri...@apache.org>
Committed: Wed Jan 11 15:17:01 2017 -0800
----------------------------------------------------------------------
src/ports/greenplum/5.0/CMakeLists.txt | 1 +
src/ports/greenplum/cmake/FindGreenplum_5_0.cmake | 2 ++
src/ports/greenplum/dbconnector/Compatibility.hpp | 3 ++-
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/3cf3f677/src/ports/greenplum/5.0/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/ports/greenplum/5.0/CMakeLists.txt b/src/ports/greenplum/5.0/CMakeLists.txt
new file mode 100644
index 0000000..015d76e
--- /dev/null
+++ b/src/ports/greenplum/5.0/CMakeLists.txt
@@ -0,0 +1 @@
+add_current_greenplum_version()
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/3cf3f677/src/ports/greenplum/cmake/FindGreenplum_5_0.cmake
----------------------------------------------------------------------
diff --git a/src/ports/greenplum/cmake/FindGreenplum_5_0.cmake b/src/ports/greenplum/cmake/FindGreenplum_5_0.cmake
new file mode 100644
index 0000000..fe15861
--- /dev/null
+++ b/src/ports/greenplum/cmake/FindGreenplum_5_0.cmake
@@ -0,0 +1,2 @@
+set(_FIND_PACKAGE_FILE "${CMAKE_CURRENT_LIST_FILE}")
+include("${CMAKE_CURRENT_LIST_DIR}/FindGreenplum.cmake")
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/3cf3f677/src/ports/greenplum/dbconnector/Compatibility.hpp
----------------------------------------------------------------------
diff --git a/src/ports/greenplum/dbconnector/Compatibility.hpp b/src/ports/greenplum/dbconnector/Compatibility.hpp
index a9424b4..dcffdfb 100644
--- a/src/ports/greenplum/dbconnector/Compatibility.hpp
+++ b/src/ports/greenplum/dbconnector/Compatibility.hpp
@@ -27,6 +27,7 @@ namespace {
SearchSysCache(cacheId, key1, 0, 0, 0)
#endif
+#if (GP_VERSION_NUM < 40399)
/*
* In commit 2d4db3675fa7a2f4831b755bc98242421901042f,
* by Tom Lane <tg...@sss.pgh.pa.us> Wed, 6 Jun 2007 23:00:50 +0000,
@@ -75,7 +76,7 @@ AggCheckCallContext(FunctionCallInfo fcinfo, MemoryContext *aggcontext) {
*aggcontext = NULL;
return 0;
}
-
+#endif // GP_VERSION_NUM < 40399
} // namespace
inline ArrayType* madlib_construct_array