From 4598f7c2087b5cbb99dbc44a75d2e03954c75d32 Mon Sep 17 00:00:00 2001 From: Sambitesh Dash Date: Tue, 4 Dec 2018 17:16:00 -0800 Subject: [PATCH] Bump ORCA Version to v3.12.0 Co-authored-by: Chris Hajas Co-authored-by: Sambitesh Dash --- config/orca.m4 | 2 +- configure | 2 +- depends/conanfile_orca.txt | 2 +- gpAux/releng/releng.mk | 2 +- .../regress/expected/gp_dqa_optimizer.out | 22 ++++++++++--------- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/config/orca.m4 b/config/orca.m4 index 70ab64ebbd..1be52fb62d 100644 --- a/config/orca.m4 +++ b/config/orca.m4 @@ -40,7 +40,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include ]], [ -return strncmp("3.11.", GPORCA_VERSION_STRING, 5); +return strncmp("3.12.", GPORCA_VERSION_STRING, 5); ])], [AC_MSG_RESULT([[ok]])], [AC_MSG_ERROR([Your ORCA version is expected to be 3.11.XXX])] diff --git a/configure b/configure index 0d842c5f04..8407c0addc 100755 --- a/configure +++ b/configure @@ -13816,7 +13816,7 @@ int main () { -return strncmp("3.11.", GPORCA_VERSION_STRING, 5); +return strncmp("3.12.", GPORCA_VERSION_STRING, 5); ; return 0; diff --git a/depends/conanfile_orca.txt b/depends/conanfile_orca.txt index 125cdd3c5f..2f3062fff7 100644 --- a/depends/conanfile_orca.txt +++ b/depends/conanfile_orca.txt @@ -1,5 +1,5 @@ [requires] -orca/v3.11.0@gpdb/stable +orca/v3.12.0@gpdb/stable [imports] include, * -> build/include diff --git a/gpAux/releng/releng.mk b/gpAux/releng/releng.mk index b7075c701b..0a1e523239 100644 --- a/gpAux/releng/releng.mk +++ b/gpAux/releng/releng.mk @@ -121,7 +121,7 @@ sync_tools: opt_write_test /opt/releng/apache-ant -Divyrepo.user=$(IVYREPO_USER) -Divyrepo.passwd="$(IVYREPO_PASSWD)" -quiet resolve); ifeq "$(findstring aix,$(BLD_ARCH))" "" - LD_LIBRARY_PATH='' wget --no-check-certificate -q -O - https://github.com/greenplum-db/gporca/releases/download/v3.11.0/bin_orca_centos5_release.tar.gz | tar zxf - -C $(BLD_TOP)/ext/$(BLD_ARCH) + LD_LIBRARY_PATH='' wget --no-check-certificate -q -O - https://github.com/greenplum-db/gporca/releases/download/v3.12.0/bin_orca_centos5_release.tar.gz | tar zxf - -C $(BLD_TOP)/ext/$(BLD_ARCH) endif clean_tools: opt_write_test diff --git a/src/test/regress/expected/gp_dqa_optimizer.out b/src/test/regress/expected/gp_dqa_optimizer.out index e25c281a3f..cae03deb25 100644 --- a/src/test/regress/expected/gp_dqa_optimizer.out +++ b/src/test/regress/expected/gp_dqa_optimizer.out @@ -29,9 +29,10 @@ explain (costs off) select count(distinct d) from dqa_t1; ------------------------------------------------ Aggregate -> Gather Motion 3:1 (slice1; segments: 3) - -> Table Scan on dqa_t1 - Optimizer: PQO version 2.70.0 -(4 rows) + -> Aggregate + -> Table Scan on dqa_t1 + Optimizer: PQO version 3.11.0 +(5 rows) select count(distinct d) from dqa_t1 group by i; count @@ -246,13 +247,14 @@ explain (costs off) select count(distinct dqa_t1.d) from dqa_t1, dqa_t2 where dq ------------------------------------------------ Aggregate -> Gather Motion 3:1 (slice1; segments: 3) - -> Hash Join - Hash Cond: (dqa_t1.d = dqa_t2.d) - -> Table Scan on dqa_t1 - -> Hash - -> Table Scan on dqa_t2 - Optimizer: PQO version 2.70.0 -(8 rows) + -> Aggregate + -> Hash Join + Hash Cond: (dqa_t1.d = dqa_t2.d) + -> Table Scan on dqa_t1 + -> Hash + -> Table Scan on dqa_t2 + Optimizer: PQO version 3.11.0 +(9 rows) select count(distinct dqa_t1.d) from dqa_t1, dqa_t2 where dqa_t1.d = dqa_t2.d group by dqa_t2.dt; count -- GitLab