Add ALTER INDEX test

knizhnik · kelvich · commit 3c760693042b · 2016-02-03T19:21:36.000+03:00
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
@@ -300,6 +300,7 @@ UpdateIndex(Oid indexRelationId, Node* whereClause)
 
 	heap_deform_tuple(oldTuple, RelationGetDescr(pg_index), values, isnull);
 	values[Anum_pg_index_indpred - 1] = CStringGetTextDatum(nodeToString(whereClause));
+	isnull[Anum_pg_index_indpred - 1] = false;
 	newTuple = heap_form_tuple(RelationGetDescr(pg_index), values, isnull);
 	simple_heap_update(pg_index, &oldTuple->t_self, newTuple);
 	CatalogUpdateIndexes(pg_index, newTuple);
@@ -345,7 +346,6 @@ AlterIndex(Oid indexRelationId, IndexStmt *stmt)
 	namespaceId = RelationGetNamespace(indexRelation);
 
 	indexInfo = BuildIndexInfo(indexRelation);
-	Assert(indexInfo->ii_Predicate);
 	Assert(!indexInfo->ii_ExclusionOps);
  
 	/*
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
@@ -1819,27 +1819,6 @@ check_index_only(RelOptInfo *rel, IndexOptInfo *index)
 	{
 		RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
 
-		/*
-		 * If the index is partial, we won't consider the clauses that are
-		 * implied by the index predicate (those are not needed at runtime).
-		 */
-		if (index->indpred != NIL)
-		{
-			bool	implied = false;
-			List   *clauses  = NIL;
-
-			/* need a list for the 'implied_by' call */
-			clauses = lappend(clauses, (Node *) rinfo->clause);
-
-			implied = predicate_implied_by(clauses, index->indpred);
-
-			/* we generally don't free memory, but well ... */
-			list_free(clauses);
-
-			/* if the clause is implied by index predicate, skip it */
-			if (implied)
-				continue;
-		}
 		pull_varattnos((Node *) rinfo->clause, rel->relid, &attrs_used);
 	}
 
diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out
@@ -780,7 +780,6 @@ explain (costs off)
                  ->  Index Only Scan Backward using minmaxtest2i on minmaxtest2
                        Index Cond: (f1 IS NOT NULL)
                  ->  Index Only Scan using minmaxtest3i on minmaxtest3
-                       Index Cond: (f1 IS NOT NULL)
    InitPlan 2 (returns $1)
      ->  Limit
            ->  Merge Append
@@ -792,8 +791,7 @@ explain (costs off)
                  ->  Index Only Scan using minmaxtest2i on minmaxtest2 minmaxtest2_1
                        Index Cond: (f1 IS NOT NULL)
                  ->  Index Only Scan Backward using minmaxtest3i on minmaxtest3 minmaxtest3_1
-                       Index Cond: (f1 IS NOT NULL)
-(25 rows)
+(23 rows)
 
 select min(f1), max(f1) from minmaxtest;
  min | max 
@@ -819,7 +817,6 @@ explain (costs off)
                  ->  Index Only Scan Backward using minmaxtest2i on minmaxtest2
                        Index Cond: (f1 IS NOT NULL)
                  ->  Index Only Scan using minmaxtest3i on minmaxtest3
-                       Index Cond: (f1 IS NOT NULL)
    InitPlan 2 (returns $1)
      ->  Limit
            ->  Merge Append
@@ -831,9 +828,8 @@ explain (costs off)
                  ->  Index Only Scan using minmaxtest2i on minmaxtest2 minmaxtest2_1
                        Index Cond: (f1 IS NOT NULL)
                  ->  Index Only Scan Backward using minmaxtest3i on minmaxtest3 minmaxtest3_1
-                       Index Cond: (f1 IS NOT NULL)
    ->  Result
-(27 rows)
+(25 rows)
 
 select distinct min(f1), max(f1) from minmaxtest;
  min | max 
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
@@ -103,7 +103,7 @@ test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combo
 # NB: temp.sql does a reconnect which transiently uses 2 connections,
 # so keep this parallel group to at most 19 tests
 # ----------
-test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid conversion truncate alter_table sequence polymorphism rowtypes returning largeobject with xml
+test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid conversion truncate alter_table alter_index_with sequence polymorphism rowtypes returning largeobject with xml
 
 # event triggers cannot run concurrently with any test that runs DDL
 test: event_trigger
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
@@ -152,6 +152,7 @@ test: without_oid
 test: conversion
 test: truncate
 test: alter_table
+test: alter_index_with
 test: sequence
 test: polymorphism
 test: rowtypes
