From 143adc2e091b5668fc87d50cb4e322c8da23d7e4 Mon Sep 17 00:00:00 2001
From: Shreedhar Hardikar <shardikar@pivotal.io>
Date: Fri, 26 Jul 2019 16:24:58 -0500
Subject: [PATCH] Changes for ORCA commit: "IndexNLJ should not broadcast
 co-located tables"

Also, bump ORCA version to 3.61.0
---
 concourse/tasks/compile_gpdb.yml | 2 +-
 config/orca.m4                   | 4 ++--
 configure                        | 4 ++--
 depends/conanfile_orca.txt       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/concourse/tasks/compile_gpdb.yml b/concourse/tasks/compile_gpdb.yml
index 12cceaa287..ca4ab7b232 100644
--- a/concourse/tasks/compile_gpdb.yml
+++ b/concourse/tasks/compile_gpdb.yml
@@ -19,4 +19,4 @@ params:
   BLD_TARGETS:
   OUTPUT_ARTIFACT_DIR: gpdb_artifacts
   CONFIGURE_FLAGS:
-  ORCA_TAG: v3.60.0
+  ORCA_TAG: v3.61.0
diff --git a/config/orca.m4 b/config/orca.m4
index 3565c8832e..847b052f98 100644
--- a/config/orca.m4
+++ b/config/orca.m4
@@ -40,10 +40,10 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <string.h>
 ]],
 [
-return strncmp("3.60.", GPORCA_VERSION_STRING, 5);
+return strncmp("3.61.", GPORCA_VERSION_STRING, 5);
 ])],
 [AC_MSG_RESULT([[ok]])],
-[AC_MSG_ERROR([Your ORCA version is expected to be 3.60.XXX])]
+[AC_MSG_ERROR([Your ORCA version is expected to be 3.61.XXX])]
 )
 AC_LANG_POP([C++])
 ])# PGAC_CHECK_ORCA_VERSION
diff --git a/configure b/configure
index a9d7e89175..bdfebc4d00 100755
--- a/configure
+++ b/configure
@@ -13995,7 +13995,7 @@ int
 main ()
 {
 
-return strncmp("3.60.", GPORCA_VERSION_STRING, 5);
+return strncmp("3.61.", GPORCA_VERSION_STRING, 5);
 
   ;
   return 0;
@@ -14005,7 +14005,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
 else
-  as_fn_error $? "Your ORCA version is expected to be 3.60.XXX" "$LINENO" 5
+  as_fn_error $? "Your ORCA version is expected to be 3.61.XXX" "$LINENO" 5
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
diff --git a/depends/conanfile_orca.txt b/depends/conanfile_orca.txt
index 7d2c3f5863..077cf034c2 100644
--- a/depends/conanfile_orca.txt
+++ b/depends/conanfile_orca.txt
@@ -1,5 +1,5 @@
 [requires]
-orca/v3.60.0@gpdb/stable
+orca/v3.61.0@gpdb/stable
 
 [imports]
 include, * -> build/include
-- 
GitLab