From 83b9d36cb5f1594f98c21002a16c86f08d56a9b0 Mon Sep 17 00:00:00 2001
From: Shreedhar Hardikar <shardikar@pivotal.io>
Date: Fri, 26 Jul 2019 13:38:51 -0500
Subject: [PATCH] Changes for ORCA commit: "Fix mis-ordered columns in Sort
 operators for multi-key merge join"

Also bump version to 3.60.0.
---
 concourse/tasks/compile_gpdb.yml             | 2 +-
 config/orca.m4                               | 4 ++--
 configure                                    | 4 ++--
 depends/conanfile_orca.txt                   | 2 +-
 src/test/regress/expected/join_optimizer.out | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/concourse/tasks/compile_gpdb.yml b/concourse/tasks/compile_gpdb.yml
index 3d94561796..12cceaa287 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.59.0
+  ORCA_TAG: v3.60.0
diff --git a/config/orca.m4 b/config/orca.m4
index a9a7294d67..3565c8832e 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.59.", GPORCA_VERSION_STRING, 5);
+return strncmp("3.60.", GPORCA_VERSION_STRING, 5);
 ])],
 [AC_MSG_RESULT([[ok]])],
-[AC_MSG_ERROR([Your ORCA version is expected to be 3.59.XXX])]
+[AC_MSG_ERROR([Your ORCA version is expected to be 3.60.XXX])]
 )
 AC_LANG_POP([C++])
 ])# PGAC_CHECK_ORCA_VERSION
diff --git a/configure b/configure
index 36f700ac1a..a9d7e89175 100755
--- a/configure
+++ b/configure
@@ -13995,7 +13995,7 @@ int
 main ()
 {
 
-return strncmp("3.59.", GPORCA_VERSION_STRING, 5);
+return strncmp("3.60.", 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.59.XXX" "$LINENO" 5
+  as_fn_error $? "Your ORCA version is expected to be 3.60.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 8bce881937..7d2c3f5863 100644
--- a/depends/conanfile_orca.txt
+++ b/depends/conanfile_orca.txt
@@ -1,5 +1,5 @@
 [requires]
-orca/v3.59.0@gpdb/stable
+orca/v3.60.0@gpdb/stable
 
 [imports]
 include, * -> build/include
diff --git a/src/test/regress/expected/join_optimizer.out b/src/test/regress/expected/join_optimizer.out
index 9b5d441660..2fea8e0ba5 100755
--- a/src/test/regress/expected/join_optimizer.out
+++ b/src/test/regress/expected/join_optimizer.out
@@ -2272,7 +2272,7 @@ select * from
    ->  Merge Full Join
          Merge Cond: ((j1_tbl.i = j2_tbl.i) AND (j1_tbl.i = j2_tbl.k))
          ->  Sort
-               Sort Key: j1_tbl.i
+               Sort Key: j1_tbl.i, j1_tbl.i
                ->  Seq Scan on j1_tbl
          ->  Sort
                Sort Key: j2_tbl.i, j2_tbl.k
-- 
GitLab