index_insert has now HeapRelation as last param (for unique index
implementation).
This commit is contained in:
parent
f48936e8ef
commit
c6a605705c
@ -6,7 +6,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.19 1996/12/19 04:58:24 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.20 1997/01/10 09:57:14 vadim Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -619,7 +619,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
|
|||||||
index_nulls,
|
index_nulls,
|
||||||
finfoP[i]);
|
finfoP[i]);
|
||||||
indexRes = index_insert(index_rels[i], &idatum, index_nulls,
|
indexRes = index_insert(index_rels[i], &idatum, index_nulls,
|
||||||
&(tuple->t_ctid), false);
|
&(tuple->t_ctid), rel);
|
||||||
if (indexRes) pfree(indexRes);
|
if (indexRes) pfree(indexRes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.12 1997/01/05 10:58:15 vadim Exp $
|
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.13 1997/01/10 09:57:16 vadim Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -1006,7 +1006,7 @@ failed to add item with len = %u to page %u (free space %u, nusd %u, noff %u)",
|
|||||||
idatum,
|
idatum,
|
||||||
inulls,
|
inulls,
|
||||||
&(newtup->t_ctid),
|
&(newtup->t_ctid),
|
||||||
true);
|
onerel);
|
||||||
if (iresult) pfree(iresult);
|
if (iresult) pfree(iresult);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.6 1996/11/13 20:48:34 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.7 1997/01/10 09:58:53 vadim Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -1105,8 +1105,8 @@ ExecInsertIndexTuples(TupleTableSlot *slot,
|
|||||||
result = index_insert(relationDescs[i], /* index relation */
|
result = index_insert(relationDescs[i], /* index relation */
|
||||||
datum, /* array of heaptuple Datums */
|
datum, /* array of heaptuple Datums */
|
||||||
nulls, /* info on nulls */
|
nulls, /* info on nulls */
|
||||||
&(heapTuple->t_ctid),
|
&(heapTuple->t_ctid), /* oid of heap tuple */
|
||||||
is_update); /* oid of heap tuple */
|
heapRelation);
|
||||||
|
|
||||||
/* ----------------
|
/* ----------------
|
||||||
* keep track of index inserts for debugging
|
* keep track of index inserts for debugging
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.7 1996/11/13 20:49:18 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.8 1997/01/10 10:00:39 vadim Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -1008,7 +1008,8 @@ inv_indextup(LargeObjectDesc *obj_desc, HeapTuple htup)
|
|||||||
|
|
||||||
n[0] = ' ';
|
n[0] = ' ';
|
||||||
v[0] = Int32GetDatum(obj_desc->highbyte);
|
v[0] = Int32GetDatum(obj_desc->highbyte);
|
||||||
res = index_insert(obj_desc->index_r, &v[0], &n[0], &(htup->t_ctid), false);
|
res = index_insert(obj_desc->index_r, &v[0], &n[0],
|
||||||
|
&(htup->t_ctid), obj_desc->heap_r);
|
||||||
|
|
||||||
if (res)
|
if (res)
|
||||||
pfree(res);
|
pfree(res);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user