index_insert has now HeapRelation as last param (for

unique index implementation).

diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 81dadca..b18a929 100644 (file)
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: genam.h,v 1.5 1996/11/13 20:50:28 scrappy Exp $
+ * $Id: genam.h,v 1.6 1997/01/10 09:36:29 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,7 +28,7 @@ extern void index_close(Relation relation);
 extern InsertIndexResult index_insert(Relation relation,
                                      Datum *datum, char *nulls,
                                      ItemPointer heap_t_ctid,
-                                     bool is_update);
+                                     Relation heapRel);
 extern void index_delete(Relation relation, ItemPointer indexItem);
 extern IndexScanDesc index_beginscan(Relation relation, bool scanFromEnd,
      uint16 numberOfKeys, ScanKey key);

diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index cd723e3..e49a988 100644 (file)
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -174,7 +174,7 @@ extern void gistbuild(Relation heap,
          FuncIndexInfo *finfo,
          PredInfo *predInfo);
 extern InsertIndexResult gistinsert(Relation r, Datum *datum,
-                       char *nulls,ItemPointer ht_ctid, bool is_update);
+                       char *nulls,ItemPointer ht_ctid, Relation heapRel);
 extern void _gistdump(Relation r);
 extern char *text_range_out(TXTRANGE *r);
 extern char *int_range_out(INTRANGE *r);

diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 65e9a23..52a0955 100644 (file)
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.5 1996/11/13 20:50:31 scrappy Exp $
+ * $Id: hash.h,v 1.6 1997/01/10 09:36:32 vadim Exp $
  *
  * NOTES
  *     modeled after Margo Seltzer's hash implementation for unix. 
@@ -255,7 +255,7 @@ extern void hashbuild(Relation heap, Relation index, int natts,
        AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
        Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
 extern InsertIndexResult hashinsert(Relation rel, Datum *datum, char *nulls,
-                                   ItemPointer ht_ctid, bool is_update);
+                                   ItemPointer ht_ctid, Relation heapRel);
 extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir);
 extern char *hashbeginscan(Relation rel, bool fromEnd, uint16 keysz,
                           ScanKey scankey);

diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index c17ce47..affe0d5 100644 (file)
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.4 1996/11/13 20:50:32 scrappy Exp $
+ * $Id: nbtree.h,v 1.5 1997/01/10 09:36:33 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -171,7 +171,7 @@ typedef BTStackData *BTStack;
  * prototypes for functions in nbtinsert.c
  */
 extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem,
-                                     bool index_is_unique, bool is_update);
+                                     bool index_is_unique, Relation heapRel);
 
                                /* default is to allow duplicates */
 extern bool _bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2,
@@ -203,7 +203,7 @@ extern void btbuild(Relation heap, Relation index, int natts,
        AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
        Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
 extern InsertIndexResult btinsert(Relation rel, Datum *datum, char *nulls,
-                                 ItemPointer ht_ctid, bool is_update);
+                                 ItemPointer ht_ctid, Relation heapRel);
 extern char *btgettuple(IndexScanDesc scan, ScanDirection dir);
 extern char *btbeginscan(Relation rel, bool fromEnd, uint16 keysz,
                         ScanKey scankey);

diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index 34ca36e..01dfc62 100644 (file)
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtree.h,v 1.4 1996/11/13 20:50:34 scrappy Exp $
+ * $Id: rtree.h,v 1.5 1997/01/10 09:36:34 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -112,7 +112,7 @@ extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
  *     Defined in access/index-rtree/
  */
 extern InsertIndexResult rtinsert(Relation r, Datum *datum, char *nulls,
-                       ItemPointer ht_ctid, bool is_update);
+                       ItemPointer ht_ctid, Relation heapRel);
 extern char *rtdelete(Relation r, ItemPointer tid);
 
 extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);