diff options
Diffstat (limited to 'src/backend/access/common')
| -rw-r--r-- | src/backend/access/common/heaptuple.c | 12 | ||||
| -rw-r--r-- | src/backend/access/common/indextuple.c | 8 | ||||
| -rw-r--r-- | src/backend/access/common/indexvalid.c | 6 | ||||
| -rw-r--r-- | src/backend/access/common/tupdesc.c | 4 |
4 files changed, 4 insertions, 26 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index ded94d0d8a..ec5b756e74 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.37 1998/02/26 04:29:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.38 1998/06/15 19:27:44 momjian Exp $ * * NOTES * The old interface functions have been converted to macros @@ -143,9 +143,7 @@ DataFill(char *data, if (bit != NULL) { if (bitmask != CSIGNBIT) - { bitmask <<= 1; - } else { bitP += 1; @@ -167,13 +165,9 @@ DataFill(char *data, case -1: *infomask |= HEAP_HASVARLENA; if (att[i]->attalign == 'd') - { data = (char *) DOUBLEALIGN(data); - } else - { data = (char *) INTALIGN(data); - } data_length = VARSIZE(DatumGetPointer(value[i])); memmove(data, DatumGetPointer(value[i]), data_length); data += data_length; @@ -239,9 +233,7 @@ heap_attisnull(HeapTuple tup, int attnum) return (0); if (attnum > 0) - { return (att_isnull(attnum - 1, tup->t_bits)); - } else switch (attnum) { @@ -513,9 +505,7 @@ nocachegetattr(HeapTuple tup, tp + att[attnum]->attcacheoff); } else if (attnum == 0) - { return ((Datum) fetchatt(&(att[0]), (char *) tp)); - } else if (!HeapTupleAllFixed(tup)) { int j = 0; diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 521dda8d81..181f362d94 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.28 1998/02/26 04:29:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.29 1998/06/15 19:27:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -178,9 +178,7 @@ nocache_index_getattr(IndexTuple tup, /* first attribute is always at position zero */ if (attnum == 1) - { return (Datum) fetchatt(&(att[0]), (char *) tup + data_off); - } if (att[attnum]->attcacheoff != -1) { return (Datum) fetchatt(&(att[attnum]), @@ -260,9 +258,7 @@ nocache_index_getattr(IndexTuple tup, tp + att[attnum]->attcacheoff); } else if (attnum == 0) - { return ((Datum) fetchatt(&(att[0]), (char *) tp)); - } else if (!IndexTupleAllFixed(tup)) { int j = 0; @@ -482,9 +478,7 @@ CopyIndexTuple(IndexTuple source, IndexTuple *target) size = IndexTupleSize(source); if (*target == NULL) - { *target = (IndexTuple) palloc(size); - } ret = *target; memmove((char *) ret, (char *) source, size); diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c index c39cce4751..b19b35c923 100644 --- a/src/backend/access/common/indexvalid.c +++ b/src/backend/access/common/indexvalid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.18 1998/01/31 05:54:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.19 1998/06/15 19:27:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,9 +61,7 @@ index_keytest(IndexTuple tuple, } if (key[0].sk_flags & SK_ISNULL) - { return (false); - } if (key[0].sk_flags & SK_COMMUTE) { @@ -79,9 +77,7 @@ index_keytest(IndexTuple tuple, } if (!test == !(key[0].sk_flags & SK_NEGATE)) - { return (false); - } scanKeySize -= 1; key++; diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index 5711d18dff..39b6ebeb72 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.39 1998/04/26 04:05:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.40 1998/06/15 19:27:45 momjian Exp $ * * NOTES * some of the executor utility code such as "ExecTypeFromTL" should be @@ -508,9 +508,7 @@ BuildDescForRelation(List *schema, char *relname) * ---------------- */ if (!strcmp(typename, relname)) - { TupleDescMakeSelfReference(desc, attnum, relname); - } else elog(ERROR, "DefineRelation: no such type %s", typename); |