5 files changed, 4 insertions, 97 deletions
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index fd3d010b778..aecbd4a9437 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -4755,6 +4755,7 @@ IsProjectionFunctionalIndex(Relation index, IndexInfo *ii)
 {
 	bool		is_projection = false;
 
+#ifdef NOT_USED
 	if (ii->ii_Expressions)
 	{
 		HeapTuple	tuple;
@@ -4800,6 +4801,8 @@ IsProjectionFunctionalIndex(Relation index, IndexInfo *ii)
 		}
 		ReleaseSysCache(tuple);
 	}
+#endif
+
 	return is_projection;
 }
 
diff --git a/src/test/regress/expected/func_index.out b/src/test/regress/expected/func_index.out
deleted file mode 100644
index 307ac97b4bc..00000000000
--- a/src/test/regress/expected/func_index.out
+++ /dev/null
@@ -1,64 +0,0 @@
-begin;
-create table keyvalue(id integer primary key, info jsonb);
-create index nameindex on keyvalue((info->>'name')) with (recheck_on_update=false);
-insert into keyvalue values (1, '{"name": "john", "data": "some data"}');
-update keyvalue set info='{"name": "john", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
- pg_stat_get_xact_tuples_hot_updated 
--------------------------------------
-                                   0
-(1 row)
-
-rollback;
-begin;
-create table keyvalue(id integer primary key, info jsonb);
-create index nameindex on keyvalue((info->>'name')) with (recheck_on_update=true);
-insert into keyvalue values (1, '{"name": "john", "data": "some data"}');
-update keyvalue set info='{"name": "john", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
- pg_stat_get_xact_tuples_hot_updated 
--------------------------------------
-                                   1
-(1 row)
-
-update keyvalue set info='{"name": "smith", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
- pg_stat_get_xact_tuples_hot_updated 
--------------------------------------
-                                   1
-(1 row)
-
-update keyvalue set info='{"name": "smith", "data": "some more data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
- pg_stat_get_xact_tuples_hot_updated 
--------------------------------------
-                                   2
-(1 row)
-
-rollback;
-begin;
-create table keyvalue(id integer primary key, info jsonb);
-create index nameindex on keyvalue((info->>'name'));
-insert into keyvalue values (1, '{"name": "john", "data": "some data"}');
-update keyvalue set info='{"name": "john", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
- pg_stat_get_xact_tuples_hot_updated 
--------------------------------------
-                                   1
-(1 row)
-
-update keyvalue set info='{"name": "smith", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
- pg_stat_get_xact_tuples_hot_updated 
--------------------------------------
-                                   1
-(1 row)
-
-update keyvalue set info='{"name": "smith", "data": "some more data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
- pg_stat_get_xact_tuples_hot_updated 
--------------------------------------
-                                   2
-(1 row)
-
-rollback;
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index b5e15501dd7..289c658483c 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -84,7 +84,7 @@ test: select_into select_distinct select_distinct_on select_implicit select_havi
 # ----------
 # Another group of parallel tests
 # ----------
-test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity object_address tablesample groupingsets drop_operator password func_index
+test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity object_address tablesample groupingsets drop_operator password
 
 # ----------
 # Another group of parallel tests
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 49329ffbb62..bc43b18c628 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -99,7 +99,6 @@ test: portals
 test: arrays
 test: btree_index
 test: hash_index
-test: func_index
 test: update
 test: delete
 test: namespace
diff --git a/src/test/regress/sql/func_index.sql b/src/test/regress/sql/func_index.sql
deleted file mode 100644
index c267c93eb08..00000000000
--- a/src/test/regress/sql/func_index.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-begin;
-create table keyvalue(id integer primary key, info jsonb);
-create index nameindex on keyvalue((info->>'name')) with (recheck_on_update=false);
-insert into keyvalue values (1, '{"name": "john", "data": "some data"}');
-update keyvalue set info='{"name": "john", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
-rollback;
-
-begin;
-create table keyvalue(id integer primary key, info jsonb);
-create index nameindex on keyvalue((info->>'name')) with (recheck_on_update=true);
-insert into keyvalue values (1, '{"name": "john", "data": "some data"}');
-update keyvalue set info='{"name": "john", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
-update keyvalue set info='{"name": "smith", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
-update keyvalue set info='{"name": "smith", "data": "some more data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
-rollback;
-
-begin;
-create table keyvalue(id integer primary key, info jsonb);
-create index nameindex on keyvalue((info->>'name'));
-insert into keyvalue values (1, '{"name": "john", "data": "some data"}');
-update keyvalue set info='{"name": "john", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
-update keyvalue set info='{"name": "smith", "data": "some other data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
-update keyvalue set info='{"name": "smith", "data": "some more data"}' where id=1;
-select pg_stat_get_xact_tuples_hot_updated('keyvalue'::regclass);
-rollback;