1 files changed, 17 insertions, 22 deletions
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index 66b4f601be..e00b25e6f0 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: index.h,v 1.28 2000/07/12 02:37:27 tgl Exp $
+ * $Id: index.h,v 1.29 2000/07/14 22:17:56 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,25 +27,24 @@ extern void InitIndexStrategy(int numatts,
 				  Oid accessMethodObjectId);
 
 extern void index_create(char *heapRelationName,
-			 char *indexRelationName,
-			 FuncIndexInfo *funcInfo,
-			 List *attributeList,
-			 Oid accessMethodObjectId,
-			 int numatts,
-			 AttrNumber *attNums,
-			 Oid *classObjectId,
-			 Node *predicate,
-			 bool islossy,
-			 bool unique,
-			 bool primary,
-			 bool allow_system_table_mods);
+						 char *indexRelationName,
+						 IndexInfo *indexInfo,
+						 Oid accessMethodObjectId,
+						 Oid *classObjectId,
+						 bool islossy,
+						 bool primary,
+						 bool allow_system_table_mods);
 
 extern void index_drop(Oid indexId);
 
-extern void FormIndexDatum(int numberOfAttributes,
-			   AttrNumber *attributeNumber, HeapTuple heapTuple,
-			   TupleDesc heapDescriptor, Datum *datum,
-			   char *nullv, FuncIndexInfoPtr fInfo);
+extern IndexInfo *BuildIndexInfo(HeapTuple indexTuple);
+
+extern void FormIndexDatum(IndexInfo *indexInfo,
+						   HeapTuple heapTuple,
+						   TupleDesc heapDescriptor,
+						   MemoryContext resultCxt,
+						   Datum *datum,
+						   char *nullv);
 
 extern void UpdateStats(Oid relid, long reltuples, bool inplace);
 extern bool IndexesAreActive(Oid relid, bool comfirmCommitted);
@@ -54,11 +53,7 @@ extern bool SetReindexProcessing(bool processing);
 extern bool IsReindexProcessing(void);
 
 extern void index_build(Relation heapRelation, Relation indexRelation,
-						int numberOfAttributes, AttrNumber *attributeNumber,
-						FuncIndexInfo *funcInfo, PredInfo *predInfo,
-						bool unique);
-
-extern bool IndexIsUnique(Oid indexId);
+						IndexInfo *indexInfo, Node *oldPred);
 
 extern bool reindex_index(Oid indexId, bool force);
 extern bool activate_indexes_of_a_table(Oid relid, bool activate);