aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/access')
-rw-r--r--src/backend/access/common/heaptuple.c74
-rw-r--r--src/backend/access/common/indextuple.c39
-rw-r--r--src/backend/access/heap/heapam.c10
3 files changed, 25 insertions, 98 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 1ece4f02bf3..8d770a368b4 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -50,7 +50,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.129 2010/01/02 16:57:33 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.130 2010/01/10 04:26:36 rhaas Exp $
*
*-------------------------------------------------------------------------
*/
@@ -323,8 +323,7 @@ heap_attisnull(HeapTuple tup, int attnum)
Datum
nocachegetattr(HeapTuple tuple,
int attnum,
- TupleDesc tupleDesc,
- bool *isnull)
+ TupleDesc tupleDesc)
{
HeapTupleHeader tup = tuple->t_data;
Form_pg_attribute *att = tupleDesc->attrs;
@@ -333,8 +332,6 @@ nocachegetattr(HeapTuple tuple,
bool slow = false; /* do we have to walk attrs? */
int off; /* current offset within data */
- (void) isnull; /* not used */
-
/* ----------------
* Three cases:
*
@@ -344,68 +341,32 @@ nocachegetattr(HeapTuple tuple,
* ----------------
*/
-#ifdef IN_MACRO
-/* This is handled in the macro */
- Assert(attnum > 0);
-
- if (isnull)
- *isnull = false;
-#endif
-
attnum--;
- if (HeapTupleNoNulls(tuple))
- {
-#ifdef IN_MACRO
-/* This is handled in the macro */
- if (att[attnum]->attcacheoff >= 0)
- {
- return fetchatt(att[attnum],
- (char *) tup + tup->t_hoff +
- att[attnum]->attcacheoff);
- }
-#endif
- }
- else
+ if (!HeapTupleNoNulls(tuple))
{
/*
* there's a null somewhere in the tuple
*
- * check to see if desired att is null
+ * check to see if any preceding bits are null...
*/
+ int byte = attnum >> 3;
+ int finalbit = attnum & 0x07;
-#ifdef IN_MACRO
-/* This is handled in the macro */
- if (att_isnull(attnum, bp))
- {
- if (isnull)
- *isnull = true;
- return (Datum) NULL;
- }
-#endif
-
- /*
- * Now check to see if any preceding bits are null...
- */
+ /* check for nulls "before" final bit of last byte */
+ if ((~bp[byte]) & ((1 << finalbit) - 1))
+ slow = true;
+ else
{
- int byte = attnum >> 3;
- int finalbit = attnum & 0x07;
+ /* check for nulls in any "earlier" bytes */
+ int i;
- /* check for nulls "before" final bit of last byte */
- if ((~bp[byte]) & ((1 << finalbit) - 1))
- slow = true;
- else
+ for (i = 0; i < byte; i++)
{
- /* check for nulls in any "earlier" bytes */
- int i;
-
- for (i = 0; i < byte; i++)
+ if (bp[i] != 0xFF)
{
- if (bp[i] != 0xFF)
- {
- slow = true;
- break;
- }
+ slow = true;
+ break;
}
}
}
@@ -567,8 +528,7 @@ heap_getsysattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull)
Assert(tup);
/* Currently, no sys attribute ever reads as NULL. */
- if (isnull)
- *isnull = false;
+ *isnull = false;
switch (attnum)
{
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 61d7f61997a..3ce377b8545 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/common/indextuple.c,v 1.90 2010/01/02 16:57:33 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/common/indextuple.c,v 1.91 2010/01/10 04:26:36 rhaas Exp $
*
*-------------------------------------------------------------------------
*/
@@ -200,8 +200,7 @@ index_form_tuple(TupleDesc tupleDescriptor,
Datum
nocache_index_getattr(IndexTuple tup,
int attnum,
- TupleDesc tupleDesc,
- bool *isnull)
+ TupleDesc tupleDesc)
{
Form_pg_attribute *att = tupleDesc->attrs;
char *tp; /* ptr to data part of tuple */
@@ -210,8 +209,6 @@ nocache_index_getattr(IndexTuple tup,
int data_off; /* tuple data offset */
int off; /* current offset within data */
- (void) isnull; /* not used */
-
/* ----------------
* Three cases:
*
@@ -221,31 +218,11 @@ nocache_index_getattr(IndexTuple tup,
* ----------------
*/
-#ifdef IN_MACRO
-/* This is handled in the macro */
- Assert(PointerIsValid(isnull));
- Assert(attnum > 0);
-
- *isnull = false;
-#endif
-
data_off = IndexInfoFindDataOffset(tup->t_info);
attnum--;
- if (!IndexTupleHasNulls(tup))
- {
-#ifdef IN_MACRO
-/* This is handled in the macro */
- if (att[attnum]->attcacheoff >= 0)
- {
- return fetchatt(att[attnum],
- (char *) tup + data_off +
- att[attnum]->attcacheoff);
- }
-#endif
- }
- else
+ if (IndexTupleHasNulls(tup))
{
/*
* there's a null somewhere in the tuple
@@ -256,16 +233,6 @@ nocache_index_getattr(IndexTuple tup,
/* XXX "knows" t_bits are just after fixed tuple header! */
bp = (bits8 *) ((char *) tup + sizeof(IndexTupleData));
-#ifdef IN_MACRO
-/* This is handled in the macro */
-
- if (att_isnull(attnum, bp))
- {
- *isnull = true;
- return (Datum) NULL;
- }
-#endif
-
/*
* Now check to see if any preceding bits are null...
*/
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index a787dc43da8..de061279a14 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.280 2010/01/02 16:57:34 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.281 2010/01/10 04:26:36 rhaas Exp $
*
*
* INTERFACE ROUTINES
@@ -834,7 +834,7 @@ fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc,
return (
(attnum) > 0 ?
(
- ((isnull) ? (*(isnull) = false) : (dummyret) NULL),
+ (*(isnull) = false),
HeapTupleNoNulls(tup) ?
(
(tupleDesc)->attrs[(attnum) - 1]->attcacheoff >= 0 ?
@@ -844,18 +844,18 @@ fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc,
(tupleDesc)->attrs[(attnum) - 1]->attcacheoff)
)
:
- nocachegetattr((tup), (attnum), (tupleDesc), (isnull))
+ nocachegetattr((tup), (attnum), (tupleDesc))
)
:
(
att_isnull((attnum) - 1, (tup)->t_data->t_bits) ?
(
- ((isnull) ? (*(isnull) = true) : (dummyret) NULL),
+ (*(isnull) = true),
(Datum) NULL
)
:
(
- nocachegetattr((tup), (attnum), (tupleDesc), (isnull))
+ nocachegetattr((tup), (attnum), (tupleDesc))
)
)
)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 10:17:43 +0000