Changes for ORCA commit: "Fallback when citext op non-citext join predicate is present"

Bumps ORCA version to 3.75.0 and ICG test.

concourse/tasks/compile_gpdb.yml

@@ -19,5 +19,5 @@ params:
   BLD_TARGETS:
   OUTPUT_ARTIFACT_DIR: gpdb_artifacts
   CONFIGURE_FLAGS:
-  ORCA_TAG: v3.74.0
+  ORCA_TAG: v3.75.0
   RC_BUILD_TYPE_GCS:

config/orca.m4

@@ -40,10 +40,10 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <string.h>
 ]],
 [
-return strncmp("3.74.", GPORCA_VERSION_STRING, 5);
+return strncmp("3.75.", GPORCA_VERSION_STRING, 5);
 ])],
 [AC_MSG_RESULT([[ok]])],
-[AC_MSG_ERROR([Your ORCA version is expected to be 3.74.XXX])]
+[AC_MSG_ERROR([Your ORCA version is expected to be 3.75.XXX])]
 )
 AC_LANG_POP([C++])
 ])# PGAC_CHECK_ORCA_VERSION

configure

@@ -14129,7 +14129,7 @@ int
 main ()
 {
 
-return strncmp("3.74.", GPORCA_VERSION_STRING, 5);
+return strncmp("3.75.", GPORCA_VERSION_STRING, 5);
 
   ;
   return 0;
@@ -14139,7 +14139,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.74.XXX" "$LINENO" 5
+  as_fn_error $? "Your ORCA version is expected to be 3.75.XXX" "$LINENO" 5
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

depends/conanfile_orca.txt

 [requires]
-orca/v3.74.0@gpdb/stable
+orca/v3.75.0@gpdb/stable
 
 [imports]
 include, * -> build/include

src/test/regress/expected/gporca.out

@@ -11449,3 +11449,24 @@ SELECT * from tc4 where a IS NULL;
    |  
 (1 row)
 
+-- citext fallback
+CREATE EXTENSION IF NOT EXISTS citext;
+drop table if exists tt, tc;
+NOTICE:  table "tt" does not exist, skipping
+NOTICE:  table "tc" does not exist, skipping
+create table tc (a int, c citext) distributed by (a);
+create table tt (b int, v varchar) distributed by (v);
+insert into tc values (1, 'a'), (1, 'A');
+insert into tt values (1, 'a'), (1, 'A');
+insert into tc values (1, 'b'), (1, 'B');
+insert into tt values (1, 'b'), (1, 'B');
+-- expected fall back to the planner
+select * from tc, tt where c = v;
+ a | c | b | v 
+---+---+---+---
+ 1 | a | 1 | a
+ 1 | A | 1 | A
+ 1 | B | 1 | B
+ 1 | b | 1 | b
+(4 rows)
+

src/test/regress/expected/gporca_optimizer.out

@@ -11595,3 +11595,26 @@ SELECT * from tc4 where a IS NULL;
    |  
 (1 row)
 
+-- citext fallback
+CREATE EXTENSION IF NOT EXISTS citext;
+drop table if exists tt, tc;
+NOTICE:  table "tt" does not exist, skipping
+NOTICE:  table "tc" does not exist, skipping
+create table tc (a int, c citext) distributed by (a);
+create table tt (b int, v varchar) distributed by (v);
+insert into tc values (1, 'a'), (1, 'A');
+insert into tt values (1, 'a'), (1, 'A');
+insert into tc values (1, 'b'), (1, 'B');
+insert into tt values (1, 'b'), (1, 'B');
+-- expected fall back to the planner
+select * from tc, tt where c = v;
+INFO:  GPORCA failed to produce a plan, falling back to planner
+DETAIL:  Operator Citext comparison in join. not supported
+ a | c | b | v 
+---+---+---+---
+ 1 | a | 1 | a
+ 1 | A | 1 | A
+ 1 | B | 1 | B
+ 1 | b | 1 | b
+(4 rows)
+

src/test/regress/sql/gporca.sql

@@ -2221,6 +2221,21 @@ CREATE TABLE tc4 (a int, b int, check(a + b > 1 and a = b));
 INSERT INTO tc4 VALUES(NULL, NULL);
 SELECT * from tc4 where a IS NULL;
 
+-- citext fallback
+CREATE EXTENSION IF NOT EXISTS citext;
+drop table if exists tt, tc;
+create table tc (a int, c citext) distributed by (a);
+create table tt (b int, v varchar) distributed by (v);
+
+insert into tc values (1, 'a'), (1, 'A');
+insert into tt values (1, 'a'), (1, 'A');
+
+insert into tc values (1, 'b'), (1, 'B');
+insert into tt values (1, 'b'), (1, 'B');
+
+-- expected fall back to the planner
+select * from tc, tt where c = v;
+
 -- start_ignore
 DROP SCHEMA orca CASCADE;
 -- end_ignore