Skip to content

Commit bc64831

Browse files
ildusildus
committed
changes
1 parent 2a3afc7 commit bc64831

File tree

3 files changed

+55
-59
lines changed

3 files changed

+55
-59
lines changed

‎src/tsvector2.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ tsvector2out(PG_FUNCTION_ARGS)
309309
int32 i,
310310
lenbuf = 0,
311311
pp,
312-
tscount = TS_COUNT(out);
312+
tscount = out->size;
313313
uint32 pos;
314314
WordEntry2 *ptr = tsvector2_entries(out);
315315
char *curbegin,
@@ -357,7 +357,7 @@ tsvector2out(PG_FUNCTION_ARGS)
357357
WordEntryPos *wptr;
358358

359359
*curout++ = ':';
360-
wptr = POSDATAPTR(curbegin, lex_len);
360+
wptr = get_lexeme_positions(curbegin, lex_len);
361361
while (pp)
362362
{
363363
curout += sprintf(curout, "%d", WEP_GETPOS(*wptr));
@@ -415,10 +415,10 @@ tsvector2send(PG_FUNCTION_ARGS)
415415
WordEntry2 *weptr = tsvector2_entries(vec);
416416

417417
pq_begintypsend(&buf);
418-
pq_sendint32(&buf, TS_COUNT(vec));
418+
pq_sendint32(&buf, vec->size);
419419

420420
INITPOS(pos);
421-
for (i = 0; i < TS_COUNT(vec); i++)
421+
for (i = 0; i < vec->size; i++)
422422
{
423423
char *lexeme = tsvector2_storage(vec) + pos;
424424
int npos = ENTRY_NPOS(vec, weptr),
@@ -434,7 +434,7 @@ tsvector2send(PG_FUNCTION_ARGS)
434434

435435
if (npos > 0)
436436
{
437-
WordEntryPos *wepptr = POSDATAPTR(lexeme, lex_len);
437+
WordEntryPos *wepptr = get_lexeme_positions(lexeme, lex_len);
438438

439439
for (j = 0; j < npos; j++)
440440
pq_sendint16(&buf, wepptr[j]);
@@ -518,7 +518,7 @@ tsvector2recv(PG_FUNCTION_ARGS)
518518
WordEntryPos *wepptr;
519519
int j;
520520

521-
wepptr = POSDATAPTR(lexeme_out, lex_len);
521+
wepptr = get_lexeme_positions(lexeme_out, lex_len);
522522
for (j = 0; j < npos; j++)
523523
{
524524
wepptr[j] = (WordEntryPos) pq_getmsgint(buf, sizeof(WordEntryPos));
@@ -534,7 +534,7 @@ tsvector2recv(PG_FUNCTION_ARGS)
534534
SET_VARSIZE(vec, hdrlen + datalen);
535535

536536
if (needSort)
537-
qsort_arg((void *) tsvector2_entries(vec), TS_COUNT(vec), sizeof(WordEntry2),
537+
qsort_arg((void *) tsvector2_entries(vec), vec->size, sizeof(WordEntry2),
538538
compareentry, (void *) vec);
539539

540540
PG_RETURN_TSVECTOR(vec);

‎src/tsvector2.h‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,26 +85,22 @@ typedef uint16 WordEntryPos;
8585
/* This struct represents a complete tsvector2 datum */
8686
typedef struct
8787
{
88-
int32 vl_len_; /* varlena header (do not touch directly!) */
89-
int32 size_; /* flags and lexemes count */
88+
int32 vl_len; /* varlena header (do not touch directly!) */
89+
int32 size; /* flags and lexemes count */
9090
WordEntry2 entries[FLEXIBLE_ARRAY_MEMBER];
9191
/* lexemes follow the entries[] array */
9292
} TSVectorData2;
9393

9494
typedef TSVectorData2 *TSVector2;
9595

96-
#define TS_FLAG_STRETCHED 0x80000000
97-
#define TS_COUNT(t) ((t)->size_ & 0x0FFFFFFF)
98-
#define TS_SETCOUNT(t,c) ((t)->size_ = (c) | TS_FLAG_STRETCHED)
99-
10096
#define DATAHDRSIZE (offsetof(TSVectorData2, entries))
10197
#define CALCDATASIZE(nentries, lenstr) (DATAHDRSIZE + (nentries) * sizeof(WordEntry2) + (lenstr) )
10298

10399
/* pointer to start of a tsvector2's WordEntry2 array */
104100
#define tsvector2_entries(x) ( (x)->entries )
105101

106102
/* pointer to start of a tsvector2's lexeme storage */
107-
#define tsvector2_storage(x) ( (char *) &(x)->entries[TS_COUNT(x)] )
103+
#define tsvector2_storage(x) ( (char *) &(x)->entries[x->size] )
108104

109105
/* for WordEntry2 with offset return its WordEntry2 with other properties */
110106
#define UNWRAP_ENTRY(x,we) \
@@ -118,7 +114,7 @@ typedef TSVectorData2 *TSVector2;
118114
#define ENTRY_LEN(x,we) (UNWRAP_ENTRY(x,we)->len)
119115

120116
/* pointer to start of positions */
121-
#define POSDATAPTR(lex, len) ((WordEntryPos *) (lex + SHORTALIGN(len)))
117+
#define get_lexeme_positions(lex, len) ((WordEntryPos *) (lex + SHORTALIGN(len)))
122118

123119
/* set default offset in tsvector2 data */
124120
#define INITPOS(p) ((p) = sizeof(WordEntry2))
@@ -135,7 +131,7 @@ do { \
135131
(w)++; \
136132
Assert(!y->hasoff); \
137133
(p) += SHORTALIGN(y->len) + y->npos * sizeof(WordEntryPos); \
138-
if ((w) - ARRPTR(x) < TS_COUNT(x) && w->hasoff) \
134+
if ((w) - ARRPTR(x) < x->size && w->hasoff) \
139135
(p) = INTALIGN(p) + sizeof(WordEntry2); \
140136
} while (0);
141137

@@ -288,7 +284,7 @@ char *tsvector2_addlexeme(TSVector2 tsv, int idx, int *dataoff,
288284
inline static char *
289285
tsvector2_getlexeme(TSVector2 vec, int idx, WordEntry2 **we)
290286
{
291-
Assert(idx >= 0 && idx < TS_COUNT(vec));
287+
Assert(idx >= 0 && idx < vec->size);
292288

293289
/*
294290
* we do not allow we == NULL because returned lexeme is not \0 ended, and

0 commit comments

Comments
 (0)