Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit14a8bd9

Browse files
committed
Convert macros to static inline functions (itup.h)
Reviewed-by: Amul Sul <sulamul@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/5b558da8-99fb-0a99-83dd-f72f05388517%40enterprisedb.com
1 parent2cbc3c1 commit14a8bd9

File tree

1 file changed

+60
-57
lines changed

1 file changed

+60
-57
lines changed

‎src/include/access/itup.h

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,38 @@ typedef IndexAttributeBitMapData * IndexAttributeBitMap;
7373
#defineIndexTupleHasVarwidths(itup) ((((IndexTuple) (itup))->t_info & INDEX_VAR_MASK))
7474

7575

76+
/* routines in indextuple.c */
77+
externIndexTupleindex_form_tuple(TupleDesctupleDescriptor,
78+
Datum*values,bool*isnull);
79+
externIndexTupleindex_form_tuple_context(TupleDesctupleDescriptor,
80+
Datum*values,bool*isnull,
81+
MemoryContextcontext);
82+
externDatumnocache_index_getattr(IndexTupletup,intattnum,
83+
TupleDesctupleDesc);
84+
externvoidindex_deform_tuple(IndexTupletup,TupleDesctupleDescriptor,
85+
Datum*values,bool*isnull);
86+
externvoidindex_deform_tuple_internal(TupleDesctupleDescriptor,
87+
Datum*values,bool*isnull,
88+
char*tp,bits8*bp,inthasnulls);
89+
externIndexTupleCopyIndexTuple(IndexTuplesource);
90+
externIndexTupleindex_truncate_tuple(TupleDescsourceDescriptor,
91+
IndexTuplesource,intleavenatts);
92+
93+
7694
/*
7795
* Takes an infomask as argument (primarily because this needs to be usable
7896
* at index_form_tuple time so enough space is allocated).
7997
*/
80-
#defineIndexInfoFindDataOffset(t_info) \
81-
( \
82-
(!((t_info) & INDEX_NULL_MASK)) ? \
83-
( \
84-
(Size)MAXALIGN(sizeof(IndexTupleData)) \
85-
) \
86-
: \
87-
( \
88-
(Size)MAXALIGN(sizeof(IndexTupleData) + sizeof(IndexAttributeBitMapData)) \
89-
) \
90-
)
98+
staticinlineSize
99+
IndexInfoFindDataOffset(unsigned shortt_info)
100+
{
101+
if (!(t_info&INDEX_NULL_MASK))
102+
returnMAXALIGN(sizeof(IndexTupleData));
103+
else
104+
returnMAXALIGN(sizeof(IndexTupleData)+sizeof(IndexAttributeBitMapData));
105+
}
106+
107+
#ifndefFRONTEND
91108

92109
/* ----------------
93110
*index_getattr
@@ -97,34 +114,38 @@ typedef IndexAttributeBitMapData * IndexAttributeBitMap;
97114
*
98115
* ----------------
99116
*/
100-
#defineindex_getattr(tup,attnum,tupleDesc,isnull) \
101-
( \
102-
AssertMacro(PointerIsValid(isnull) && (attnum) > 0), \
103-
*(isnull) = false, \
104-
!IndexTupleHasNulls(tup) ? \
105-
( \
106-
TupleDescAttr((tupleDesc), (attnum)-1)->attcacheoff >= 0 ? \
107-
( \
108-
fetchatt(TupleDescAttr((tupleDesc), (attnum)-1), \
109-
(char *) (tup) + IndexInfoFindDataOffset((tup)->t_info) \
110-
+ TupleDescAttr((tupleDesc), (attnum)-1)->attcacheoff) \
111-
) \
112-
: \
113-
nocache_index_getattr((tup), (attnum), (tupleDesc)) \
114-
) \
115-
: \
116-
( \
117-
(att_isnull((attnum)-1, (bits8 *)(tup) + sizeof(IndexTupleData))) ? \
118-
( \
119-
*(isnull) = true, \
120-
(Datum)NULL \
121-
) \
122-
: \
123-
( \
124-
nocache_index_getattr((tup), (attnum), (tupleDesc)) \
125-
) \
126-
) \
127-
)
117+
staticinlineDatum
118+
index_getattr(IndexTupletup,intattnum,TupleDesctupleDesc,bool*isnull)
119+
{
120+
Assert(PointerIsValid(isnull));
121+
Assert(attnum>0);
122+
123+
*isnull= false;
124+
125+
if (!IndexTupleHasNulls(tup))
126+
{
127+
if (TupleDescAttr(tupleDesc,attnum-1)->attcacheoff >=0)
128+
{
129+
returnfetchatt(TupleDescAttr(tupleDesc,attnum-1),
130+
(char*)tup+IndexInfoFindDataOffset(tup->t_info)
131+
+TupleDescAttr(tupleDesc,attnum-1)->attcacheoff);
132+
}
133+
else
134+
returnnocache_index_getattr(tup,attnum,tupleDesc);
135+
}
136+
else
137+
{
138+
if (att_isnull(attnum-1, (bits8*)tup+sizeof(IndexTupleData)))
139+
{
140+
*isnull= true;
141+
return (Datum)NULL;
142+
}
143+
else
144+
returnnocache_index_getattr(tup,attnum,tupleDesc);
145+
}
146+
}
147+
148+
#endif
128149

129150
/*
130151
* MaxIndexTuplesPerPage is an upper bound on the number of tuples that can
@@ -146,22 +167,4 @@ typedef IndexAttributeBitMapData * IndexAttributeBitMap;
146167
((int) ((BLCKSZ - SizeOfPageHeaderData) / \
147168
(MAXALIGN(sizeof(IndexTupleData) + 1) + sizeof(ItemIdData))))
148169

149-
150-
/* routines in indextuple.c */
151-
externIndexTupleindex_form_tuple(TupleDesctupleDescriptor,
152-
Datum*values,bool*isnull);
153-
externIndexTupleindex_form_tuple_context(TupleDesctupleDescriptor,
154-
Datum*values,bool*isnull,
155-
MemoryContextcontext);
156-
externDatumnocache_index_getattr(IndexTupletup,intattnum,
157-
TupleDesctupleDesc);
158-
externvoidindex_deform_tuple(IndexTupletup,TupleDesctupleDescriptor,
159-
Datum*values,bool*isnull);
160-
externvoidindex_deform_tuple_internal(TupleDesctupleDescriptor,
161-
Datum*values,bool*isnull,
162-
char*tp,bits8*bp,inthasnulls);
163-
externIndexTupleCopyIndexTuple(IndexTuplesource);
164-
externIndexTupleindex_truncate_tuple(TupleDescsourceDescriptor,
165-
IndexTuplesource,intleavenatts);
166-
167170
#endif/* ITUP_H */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp