diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/access/common/indextuple.c | 55 | ||||
| -rw-r--r-- | src/backend/access/heap/tuptoaster.c | 5 |
2 files changed, 39 insertions, 21 deletions
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 16b5233eb39..4b46c202dcd 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -2,14 +2,14 @@ * * indextuple.c * This file contains index tuple accessor and mutator routines, - * as well as a few various tuple utilities. + * as well as various tuple utilities. * * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.50 2001/01/24 19:42:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.51 2001/02/15 20:57:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -57,25 +57,45 @@ index_formtuple(TupleDesc tupleDescriptor, #ifdef TOAST_INDEX_HACK for (i = 0; i < numberOfAttributes; i++) { - if (null[i] != ' ' || tupleDescriptor->attrs[i]->attlen >= 0) + Form_pg_attribute att = tupleDescriptor->attrs[i]; + + untoasted_value[i] = value[i]; + untoasted_free[i] = false; + + /* Do nothing if value is NULL or not of varlena type */ + if (null[i] != ' ' || att->attlen >= 0) + continue; + + /* + * If value is stored EXTERNAL, must fetch it so we are not + * depending on outside storage. This should be improved someday. + */ + if (VARATT_IS_EXTERNAL(value[i])) { - untoasted_value[i] = value[i]; - untoasted_free[i] = false; + untoasted_value[i] = PointerGetDatum( + heap_tuple_fetch_attr( + (varattrib *) DatumGetPointer(value[i]))); + untoasted_free[i] = true; } - else + + /* + * If value is above size target, and is of a compressible datatype, + * try to compress it in-line. + */ + if (VARATT_SIZE(untoasted_value[i]) > TOAST_INDEX_TARGET && + !VARATT_IS_EXTENDED(untoasted_value[i]) && + (att->attstorage == 'x' || att->attstorage == 'm')) { - if (VARATT_IS_EXTERNAL(value[i])) + Datum cvalue = toast_compress_datum(untoasted_value[i]); + + if (DatumGetPointer(cvalue) != NULL) { - untoasted_value[i] = PointerGetDatum( - heap_tuple_fetch_attr( - (varattrib *)DatumGetPointer(value[i]))); + /* successful compression */ + if (untoasted_free[i]) + pfree(DatumGetPointer(untoasted_value[i])); + untoasted_value[i] = cvalue; untoasted_free[i] = true; } - else - { - untoasted_value[i] = value[i]; - untoasted_free[i] = false; - } } } #endif @@ -137,10 +157,9 @@ index_formtuple(TupleDesc tupleDescriptor, * Here we make sure that the size will fit in the field reserved for * it in t_info. */ - if ((size & INDEX_SIZE_MASK) != size) - elog(ERROR, "index_formtuple: data takes %lu bytes: too big", - (unsigned long)size); + elog(ERROR, "index_formtuple: data takes %lu bytes, max is %d", + (unsigned long) size, INDEX_SIZE_MASK); infomask |= size; diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index a1497e40f1f..a3cf6ae7116 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.16 2001/02/09 17:30:03 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.17 2001/02/15 20:57:01 tgl Exp $ * * * INTERFACE ROUTINES @@ -45,7 +45,6 @@ static void toast_delete(Relation rel, HeapTuple oldtup); static void toast_delete_datum(Relation rel, Datum value); static void toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup); -static Datum toast_compress_datum(Datum value); static Datum toast_save_datum(Relation rel, Oid mainoid, int16 attno, Datum value); static varattrib *toast_fetch_datum(varattrib *attr); @@ -721,7 +720,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup) * the tuple! * ---------- */ -static Datum +Datum toast_compress_datum(Datum value) { varattrib *tmp; |