Remove ORCA specific configure checks

We no longer need to check for ORCA libraries or version, as ORCA now
exists in the same repo and the concept of a version is not needed.

config/orca.m4

@@ -9,42 +9,3 @@ AC_CHECK_LIB(xerces-c, strnicmp, [],
 AC_MSG_CHECKING([[for Xerces-C]])
 ])# PGAC_CHECK_ORCA_XERCES
 
-AC_DEFUN([PGAC_CHECK_ORCA_HEADERS],
-[
-AC_LANG_PUSH([C++])
-AC_CHECK_HEADERS(gpos/_api.h, [], [AC_MSG_ERROR([GPOS header files are required for GPORCA])])
-AC_CHECK_HEADERS(naucrates/init.h, [], [AC_MSG_ERROR([Naucrates header files are required for GPORCA])])
-AC_CHECK_HEADERS(gpopt/init.h,  [], [AC_MSG_ERROR([GPOPT header files are required for GPORCA])])
-AC_CHECK_HEADERS(gpdbcost/CCostModelGPDB.h,  [], [AC_MSG_ERROR([GPDB Cost Model header files are required for GPORCA])])
-AC_LANG_POP([C++])
-]
-)
-
-AC_DEFUN([PGAC_CHECK_ORCA_LIBS],
-[
-AC_LANG_PUSH([C++])
-AC_CHECK_LIB(gpos, gpos_init, [], [AC_MSG_ERROR([library 'gpos' is required for GPORCA])])
-AC_CHECK_LIB(gpdbcost, main, [], [AC_MSG_ERROR([library 'gpdbcost' is required for GPORCA])], [-lgpopt -lnaucrates])
-AC_CHECK_LIB(naucrates, InitDXL, [], [AC_MSG_ERROR([library 'naucrates' is required for GPORCA])], [-lgpopt])
-AC_CHECK_LIB(gpopt, gpopt_init, [], [AC_MSG_ERROR([library 'gpopt' is required for GPORCA])])
-AC_LANG_POP([C++])
-]
-)
-
-AC_DEFUN([PGAC_CHECK_ORCA_VERSION],
-[
-AC_MSG_CHECKING([[Checking ORCA version]])
-AC_LANG_PUSH([C++])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#include "gpopt/version.h"
-#include <string.h>
-]],
-[
-return strncmp("3.97.", GPORCA_VERSION_STRING, 5);
-])],
-[AC_MSG_RESULT([[ok]])],
-[AC_MSG_ERROR([Your ORCA version is expected to be 3.97.XXX])]
-)
-AC_LANG_POP([C++])
-])# PGAC_CHECK_ORCA_VERSION
-

configure.in

@@ -1594,7 +1594,6 @@ AC_SUBST(UUID_LIBS)
 # Check for Greenplum Query Optimizer (orca) libraries.
 if test "$enable_orca" = yes; then
   PGAC_CHECK_ORCA_XERCES
-  PGAC_CHECK_ORCA_LIBS
 fi
 
 # OpenBSD requires libexecinfo from ports for backtrace() as it's a glibc addition
@@ -1839,12 +1838,6 @@ if test "$enable_mapreduce" = yes; then
   AC_CHECK_HEADERS(yaml.h, [], [AC_MSG_ERROR([header file <yaml.h> is required for Greenplum Mapreduce])])
 fi
 
-# Check for GPORCA and supporting GPORCA OS abstraction layer header files.
-if test "$enable_orca" = yes; then
-  PGAC_CHECK_ORCA_HEADERS
-  PGAC_CHECK_ORCA_VERSION
-fi
-
 if test "$PORTNAME" = "win32" ; then
    AC_CHECK_HEADERS(crtdefs.h)
 fi

src/backend/gporca/libgpos/config.h.in → src/backend/gporca/libgpos/include/gpos/config.h

@@ -13,28 +13,16 @@
 #ifndef GPOS_config_H
 #define GPOS_config_H
 
-#cmakedefine GPOS_DEBUG
+/* Get this working for now. */
+/* Idealy we should generate this files just like pg_config.h is generated */
 
-// These come from CMAKE_SYSTEM_PROCESSOR
-#cmakedefine GPOS_i386 1
-#cmakedefine GPOS_i686 1
-#cmakedefine GPOS_x86_64 1
-#cmakedefine GPOS_sparc 1
+#ifdef USE_ASSERT_CHECKING
+#define GPOS_DEBUG
+#else
+#undef GPOS_DEBUG
+#endif
 
-// These come from CMAKE_ARCH_BITS (based on CMAKE_SIZEOF_VOID_P)
-#cmakedefine GPOS_32BIT 1
-#cmakedefine GPOS_64BIT 1
-
-// These come from CMAKE_SYSTEM_NAME
-#cmakedefine GPOS_Linux
-#cmakedefine GPOS_Darwin
-#cmakedefine GPOS_SunOS
-
-// Atomics, detected by cmake/FindAtomics.cmake
-#cmakedefine GPOS_GCC_FETCH_ADD_32
-#cmakedefine GPOS_GCC_FETCH_ADD_64
-#cmakedefine GPOS_GCC_CAS_32
-#cmakedefine GPOS_GCC_CAS_64
+#define GPOS_Darwin
 
 #endif  // GPOS_config_H
 // EOF