postgres
diff --git a/‎doc/src/sgml/ref/create_index.sgml
Lines changed: 2 additions & 35 deletions b/‎doc/src/sgml/ref/create_index.sgml
Lines changed: 2 additions & 35 deletions
diff --git a/‎doc/src/sgml/release-11.sgml
Lines changed: 0 additions & 13 deletions b/‎doc/src/sgml/release-11.sgml
Lines changed: 0 additions & 13 deletions
diff --git a/‎src/backend/utils/cache/relcache.c
Lines changed: 3 additions & 0 deletions b/‎src/backend/utils/cache/relcache.c
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/test/regress/expected/func_index.out
Lines changed: 0 additions & 64 deletions b/‎src/test/regress/expected/func_index.out
Lines changed: 0 additions & 64 deletions
diff --git a/‎src/test/regress/parallel_schedule
Lines changed: 1 addition & 1 deletion b/‎src/test/regress/parallel_schedule
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/test/regress/serial_schedule
Lines changed: 0 additions & 1 deletion b/‎src/test/regress/serial_schedule
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/test/regress/sql/func_index.sql
Lines changed: 0 additions & 31 deletions b/‎src/test/regress/sql/func_index.sql
Lines changed: 0 additions & 31 deletions
@@ -356,41 +356,8 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
    <para>
     The optional <literal>WITH</literal> clause specifies <firstterm>storage
     parameters</firstterm> for the index.  Each index method has its own set of allowed
-    storage parameters.  All indexes accept the following parameter:
-   </para>
-
-   <variablelist>
-   <varlistentry>
-    <term><literal>recheck_on_update</literal></term>
-    <listitem>
-     <para>
-       Specifies whether to recheck a functional index value to see whether
-       we can use a HOT update or not. The default value is on for functional
-       indexes with an total expression cost less than 1000, otherwise off.
-       You might decide to turn this off if you knew that a function used in
-       an index is unlikely to return the same value when one of the input
-       columns is updated and so the recheck is not worth the additional cost
-       of executing the function.
-     </para>
-
-     <para>
-       Functional indexes are used frequently for the case where the function
-       returns a subset of the argument. Examples of this would be accessing
-       part of a string with <literal>SUBSTR()</literal> or accessing a single
-       field in a JSON document using an expression such as
-       <literal>(bookinfo-&gt;&gt;'isbn')</literal>. In this example, the JSON
-       document might be updated frequently, yet it is uncommon for the ISBN
-       field for a book to change so we would keep the parameter set to on
-       for that index. A more frequently changing field might have an index
-       with this parameter turned off, while very frequently changing fields
-       might be better to avoid indexing at all under high load.
-     </para>
-    </listitem>
-   </varlistentry>
-   </variablelist>
-
-   <para>
-     The B-tree, hash, GiST and SP-GiST index methods all accept this parameter:
+    storage parameters.  The B-tree, hash, GiST and SP-GiST index methods all
+    accept this parameter:
    </para>
 
    <variablelist>
 
@@ -1437,19 +1437,6 @@ same commits as above
        </para>
       </listitem>
 
-      <listitem>
-<!--
-2018-03-27 [c203d6cf8] Allow HOT updates for some expression indexes
--->
-
-       <para>
-        Allow heap-only-tuple (<acronym>HOT</acronym>) updates for
-        expression indexes when the values of the expressions are unchanged
-        (Konstantin Knizhnik)
-       </para>
-
-      </listitem>
-
      </itemizedlist>
 
      <sect5>
 
@@ -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;
 }
 
 
@@ -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
 
@@ -99,7 +99,6 @@ test: portals
 test: arrays
 test: btree_index
 test: hash_index
-test: func_index
 test: update
 test: delete
 test: namespace