index_insert has now HeapRelation as last param (for

vadim4o · vadim4o · commit c7990b35f7d6 · 1997-01-10T09:36:34.000Z
unique index implementation).
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: genam.h,v 1.5 1996/11/13 20:50:28 scrappy Exp $`
	`9`	`+ * $Id: genam.h,v 1.6 1997/01/10 09:36:29 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -28,7 +28,7 @@ extern void index_close(Relation relation);`
`28`	`28`	`extern InsertIndexResult index_insert(Relation relation,`
`29`	`29`	`Datum datum, char nulls,`
`30`	`30`	`ItemPointer heap_t_ctid,`
`31`		`- bool is_update);`
	`31`	`+ Relation heapRel);`
`32`	`32`	`extern void index_delete(Relation relation, ItemPointer indexItem);`
`33`	`33`	`extern IndexScanDesc index_beginscan(Relation relation, bool scanFromEnd,`
`34`	`34`	`uint16 numberOfKeys, ScanKey key);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: hash.h,v 1.5 1996/11/13 20:50:31 scrappy Exp $`
	`9`	`+ * $Id: hash.h,v 1.6 1997/01/10 09:36:32 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`* NOTES`
`12`	`12`	`* modeled after Margo Seltzer's hash implementation for unix.`
`@@ -255,7 +255,7 @@ extern void hashbuild(Relation heap, Relation index, int natts,`
`255`	`255`	`AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,`
`256`	`256`	`Datum params, FuncIndexInfo finfo, PredInfo *predInfo);`
`257`	`257`	`extern InsertIndexResult hashinsert(Relation rel, Datum datum, char nulls,`
`258`		`- ItemPointer ht_ctid, bool is_update);`
	`258`	`+ ItemPointer ht_ctid, Relation heapRel);`
`259`	`259`	`extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir);`
`260`	`260`	`extern char *hashbeginscan(Relation rel, bool fromEnd, uint16 keysz,`
`261`	`261`	`ScanKey scankey);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: rtree.h,v 1.4 1996/11/13 20:50:34 scrappy Exp $`
	`9`	`+ * $Id: rtree.h,v 1.5 1997/01/10 09:36:34 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -112,7 +112,7 @@ extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);`
`112`	`112`	`* Defined in access/index-rtree/`
`113`	`113`	`*/`
`114`	`114`	`extern InsertIndexResult rtinsert(Relation r, Datum datum, char nulls,`
`115`		`- ItemPointer ht_ctid, bool is_update);`
	`115`	`+ ItemPointer ht_ctid, Relation heapRel);`
`116`	`116`	`extern char *rtdelete(Relation r, ItemPointer tid);`
`117`	`117`
`118`	`118`	`extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);`