From ab281fc5b0aa97891a7faa025938a02baa1bdced Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <dgustafsson@pivotal.io>
Date: Thu, 20 Oct 2016 10:22:57 +0200
Subject: [PATCH] Explicitly mark abort() as an allowed API call for gpopt

libgpos has a set of banned API calls which needs to be allowed with
the ALLOW_xxx macro in order for gpopt to compile (and thus run).
The changes to ereport() brought a need for allowing abort() since
it now invokes abort when building with --enable-cassert.

This is a temporary fix awaiting the removal of the banning of
function calls entirely. Pushed even though the CI pipeline failed
to provide a clean run (for seeminly unrelated reasons) due to the
absence of this blocking other efforts.
---
 src/backend/gpopt/CGPOptimizer.cpp                       | 2 ++
 src/backend/gpopt/gpdbwrappers.cpp                       | 1 +
 src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp    | 2 ++
 src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp | 1 +
 src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp     | 1 +
 src/backend/gpopt/utils/COptTasks.cpp                    | 1 +
 src/backend/gpopt/utils/funcs.cpp                        | 1 +
 7 files changed, 9 insertions(+)

diff --git a/src/backend/gpopt/CGPOptimizer.cpp b/src/backend/gpopt/CGPOptimizer.cpp
index f0389c63fa..4af2346972 100644
--- a/src/backend/gpopt/CGPOptimizer.cpp
+++ b/src/backend/gpopt/CGPOptimizer.cpp
@@ -13,6 +13,8 @@
 //
 //---------------------------------------------------------------------------
 
+#define ALLOW_abort
+
 #include "gpopt/CGPOptimizer.h"
 #include "gpopt/utils/COptTasks.h"
 
diff --git a/src/backend/gpopt/gpdbwrappers.cpp b/src/backend/gpopt/gpdbwrappers.cpp
index 542b1312bf..2f24a566e9 100644
--- a/src/backend/gpopt/gpdbwrappers.cpp
+++ b/src/backend/gpopt/gpdbwrappers.cpp
@@ -177,6 +177,7 @@
 #define ALLOW_has_subclass
 #define ALLOW_cdbhash_const
 #define ALLOW_cdbhash_const_list
+#define ALLOW_abort
 
 #define ALLOW_ExecCheckRTPerms
 #define ALLOW_evaluate_expr
diff --git a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp b/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
index c9f3ff7dd9..8ce9ee9501 100644
--- a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
+++ b/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
@@ -14,6 +14,8 @@
 //
 //---------------------------------------------------------------------------
 
+#define ALLOW_abort
+
 #include "postgres.h"
 
 #include "access/sysattr.h"
diff --git a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
index 626b030f9e..ae78fa86cf 100644
--- a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
+++ b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
@@ -27,6 +27,7 @@
 #define ALLOW_MemoryContextFreeImpl
 #define ALLOW_CharGetDatum
 #define ALLOW_list_head
+#define ALLOW_abort
 
 #include "postgres.h"
 #include "utils/array.h"
diff --git a/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp b/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp
index d4b1e79399..f2a380b7e1 100644
--- a/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp
+++ b/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp
@@ -14,6 +14,7 @@
 //
 //---------------------------------------------------------------------------
 
+#define ALLOW_abort
 
 #include "postgres.h"
 #include "executor/executor.h"
diff --git a/src/backend/gpopt/utils/COptTasks.cpp b/src/backend/gpopt/utils/COptTasks.cpp
index 8c967f57e0..f063094f55 100644
--- a/src/backend/gpopt/utils/COptTasks.cpp
+++ b/src/backend/gpopt/utils/COptTasks.cpp
@@ -14,6 +14,7 @@
 //---------------------------------------------------------------------------
 
 #define ALLOW_strcasecmp
+#define ALLOW_abort
 
 #include "gpopt/utils/gpdbdefs.h"
 #include "gpopt/utils/CConstExprEvaluatorProxy.h"
diff --git a/src/backend/gpopt/utils/funcs.cpp b/src/backend/gpopt/utils/funcs.cpp
index d244c45a0f..5494370b25 100644
--- a/src/backend/gpopt/utils/funcs.cpp
+++ b/src/backend/gpopt/utils/funcs.cpp
@@ -14,6 +14,7 @@
 //---------------------------------------------------------------------------
 
 #define ALLOW_appendStringInfo
+#define ALLOW_abort
 
 #include <sys/stat.h>
 #include "gpopt/utils/nodeutils.h"
-- 
GitLab