Skip to content

Commit af3359c

Browse files
ildusildus
committed
compilation fixes
1 parent bc64831 commit af3359c

File tree

4 files changed

+82
-187
lines changed

4 files changed

+82
-187
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MODULE_big = tsvector2
2-
OBJS = src/tsvector2.o src/tsvector_op2.o
2+
OBJS = src/tsvector2.o src/tsvector2_op.o
33

44
EXTENSION = tsvector2
55
EXTVERSION = 1.0
@@ -9,6 +9,7 @@ REGRESS = basic
99

1010
EXTRA_CLEAN = tsvector2--$(EXTVERSION).sql
1111

12+
override PG_CPPFLAGS += -I$(CURDIR)/src
1213
PG_CONFIG = pg_config
1314
PGXS := $(shell $(PG_CONFIG) --pgxs)
1415
include $(PGXS)

‎src/tsvector2.c‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ compareentry(const void *va, const void *vb, void *arg)
9595
{
9696
const WordEntry2 *a = (const WordEntry2 *) va;
9797
const WordEntry2 *b = (const WordEntry2 *) vb;
98-
TSVector tsv = (TSVector) arg;
98+
TSVector2 tsv = (TSVector2) arg;
9999

100100
uint32 offset1 = tsvector2_getoffset(tsv, a - tsvector2_entries(tsv), NULL),
101101
offset2 = tsvector2_getoffset(tsv, b - tsvector2_entries(tsv), NULL);
@@ -198,6 +198,7 @@ uniqueentry(WordEntryIN *a, int l, char *buf, int *outbuflen)
198198
return res + 1 - a;
199199
}
200200

201+
PG_FUNCTION_INFO_V1(tsvector2in);
201202
Datum
202203
tsvector2in(PG_FUNCTION_ARGS)
203204
{
@@ -207,7 +208,7 @@ tsvector2in(PG_FUNCTION_ARGS)
207208
int totallen;
208209
int arrlen; /* allocated size of arr */
209210
int len = 0;
210-
TSVector in;
211+
TSVector2 in;
211212
int i;
212213
char *token;
213214
int toklen;
@@ -223,13 +224,13 @@ tsvector2in(PG_FUNCTION_ARGS)
223224
char *cur;
224225
int buflen = 256; /* allocated size of tmpbuf */
225226

226-
state = init_tsvector2_parser(buf, 0);
227+
state = init_tsvector_parser(buf, 0);
227228

228229
arrlen = 64;
229230
arr = (WordEntryIN *) palloc(sizeof(WordEntryIN) * arrlen);
230231
cur = tmpbuf = (char *) palloc(buflen);
231232

232-
while (gettoken_tsvector2(state, &token, &toklen, &pos, &poslen, NULL))
233+
while (gettoken_tsvector(state, &token, &toklen, &pos, &poslen, NULL))
233234
{
234235
if (toklen >= MAXSTRLEN)
235236
ereport(ERROR,
@@ -271,7 +272,7 @@ tsvector2in(PG_FUNCTION_ARGS)
271272
len++;
272273
}
273274

274-
close_tsvector2_parser(state);
275+
close_tsvector_parser(state);
275276

276277
if (len > 0)
277278
len = uniqueentry(arr, len, tmpbuf, &buflen);
@@ -283,10 +284,10 @@ tsvector2in(PG_FUNCTION_ARGS)
283284
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
284285
errmsg("string is too long for tsvector2 (%d bytes, max %d bytes)", buflen, MAXSTRPOS)));
285286

286-
totallen = CALCDATASIZE(len, buflen);
287-
in = (TSVector) palloc0(totallen);
287+
totallen = tsvector2_calcsize(len, buflen);
288+
in = (TSVector2) palloc0(totallen);
288289
SET_VARSIZE(in, totallen);
289-
TS_SETCOUNT(in, len);
290+
in->size = len;
290291
stroff = 0;
291292
for (i = 0; i < len; i++)
292293
{
@@ -298,13 +299,14 @@ tsvector2in(PG_FUNCTION_ARGS)
298299
}
299300

300301
Assert((tsvector2_storage(in) + stroff - (char *) in) == totallen);
301-
PG_RETURN_TSVECTOR(in);
302+
PG_RETURN_TSVECTOR2(in);
302303
}
303304

305+
PG_FUNCTION_INFO_V1(tsvector2out);
304306
Datum
305307
tsvector2out(PG_FUNCTION_ARGS)
306308
{
307-
TSVector out = PG_GETARG_TSVECTOR(0);
309+
TSVector2 out = PG_GETARG_TSVECTOR2(0);
308310
char *outbuf;
309311
int32 i,
310312
lenbuf = 0,
@@ -404,10 +406,11 @@ tsvector2out(PG_FUNCTION_ARGS)
404406
* uint16 WordEntryPos
405407
*/
406408

409+
PG_FUNCTION_INFO_V1(tsvector2send);
407410
Datum
408411
tsvector2send(PG_FUNCTION_ARGS)
409412
{
410-
TSVector vec = PG_GETARG_TSVECTOR(0);
413+
TSVector2 vec = PG_GETARG_TSVECTOR2(0);
411414
StringInfoData buf;
412415
int i,
413416
j;
@@ -425,7 +428,7 @@ tsvector2send(PG_FUNCTION_ARGS)
425428
lex_len = ENTRY_LEN(vec, weptr);
426429

427430
/*
428-
* the strings in the TSVector array are not null-terminated, so we
431+
* the strings in the TSVector2 array are not null-terminated, so we
429432
* have to send the null-terminator separately
430433
*/
431434
pq_sendtext(&buf, lexeme, lex_len);
@@ -446,14 +449,15 @@ tsvector2send(PG_FUNCTION_ARGS)
446449
PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
447450
}
448451

452+
PG_FUNCTION_INFO_V1(tsvector2recv);
449453
Datum
450454
tsvector2recv(PG_FUNCTION_ARGS)
451455
{
452456
StringInfo buf = (StringInfo) PG_GETARG_POINTER(0);
453-
TSVector vec;
457+
TSVector2 vec;
454458
int i,
455459
datalen; /* number of bytes used in the variable size
456-
* area after fixed size TSVector header and
460+
* area after fixed size TSVector2 header and
457461
* WordEntries */
458462
int32 nentries;
459463
Size hdrlen;
@@ -466,11 +470,11 @@ tsvector2recv(PG_FUNCTION_ARGS)
466470
if (nentries < 0 || nentries > (MaxAllocSize / sizeof(WordEntry2)))
467471
elog(ERROR, "invalid size of tsvector2");
468472

469-
hdrlen = DATAHDRSIZE + sizeof(WordEntry2) * nentries;
473+
hdrlen = tsvector2_hdrlen() + sizeof(WordEntry2) * nentries;
470474

471475
len = hdrlen * 2; /* times two to make room for lexemes */
472-
vec = (TSVector) palloc0(len);
473-
TS_SETCOUNT(vec, nentries);
476+
vec = (TSVector2) palloc0(len);
477+
vec->size = nentries;
474478

475479
datalen = 0;
476480
for (i = 0; i < nentries; i++)
@@ -504,7 +508,7 @@ tsvector2recv(PG_FUNCTION_ARGS)
504508
npos * sizeof(WordEntryPos) >= len)
505509
{
506510
len *= 2;
507-
vec = (TSVector) repalloc(vec, len);
511+
vec = (TSVector2) repalloc(vec, len);
508512
}
509513

510514
if (prev_lexeme && tsCompareString(lexeme, lex_len,
@@ -537,5 +541,5 @@ tsvector2recv(PG_FUNCTION_ARGS)
537541
qsort_arg((void *) tsvector2_entries(vec), vec->size, sizeof(WordEntry2),
538542
compareentry, (void *) vec);
539543

540-
PG_RETURN_TSVECTOR(vec);
544+
PG_RETURN_TSVECTOR2(vec);
541545
}

‎src/tsvector2.h‎

Lines changed: 12 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
*
99
*-------------------------------------------------------------------------
1010
*/
11-
#ifndef _PG_TSTYPE_H_
12-
#define _PG_TSTYPE_H_
11+
#ifndef TSVECTOR2_H
12+
#define TSVECTOR2_H
1313

1414
#include "fmgr.h"
1515
#include "utils/memutils.h"
@@ -55,9 +55,6 @@ typedef union
5555
};
5656
} WordEntry2;
5757

58-
#define MAXSTRLEN ( (1<<11) - 1)
59-
#define MAXSTRPOS ( (1<<30) - 1)
60-
6158
extern int compareWordEntryPos(const void *a, const void *b);
6259

6360
/*
@@ -93,8 +90,9 @@ typedef struct
9390

9491
typedef TSVectorData2 *TSVector2;
9592

96-
#define DATAHDRSIZE (offsetof(TSVectorData2, entries))
97-
#define CALCDATASIZE(nentries, lenstr) (DATAHDRSIZE + (nentries) * sizeof(WordEntry2) + (lenstr) )
93+
#define tsvector2_hdrlen() (offsetof(TSVectorData2, entries))
94+
#define tsvector2_calcsize(nentries, lenstr) (tsvector2_hdrlen() + \
95+
(nentries) * sizeof(WordEntry2) + (lenstr) )
9896

9997
/* pointer to start of a tsvector2's WordEntry2 array */
10098
#define tsvector2_entries(x) ( (x)->entries )
@@ -152,129 +150,12 @@ do { \
152150

153151
TSVector2 tsvector2_upgrade(Datum orig, bool copy);
154152

155-
#define DatumGetTSVector(X) tsvector2_upgrade((X), false)
156-
#define DatumGetTSVectorCopy(X) tsvector2_upgrade((X), true)
157-
#define TSVectorGetDatum(X) PointerGetDatum(X)
158-
#define PG_GETARG_TSVECTOR(n) DatumGetTSVector(PG_GETARG_DATUM(n))
159-
#define PG_GETARG_TSVECTOR_COPY(n) DatumGetTSVectorCopy(PG_GETARG_DATUM(n))
160-
#define PG_RETURN_TSVECTOR(x) return TSVectorGetDatum(x)
161-
162-
/*
163-
* TSQuery
164-
*
165-
*
166-
*/
167-
168-
typedef int8 QueryItemType;
169-
170-
/* Valid values for QueryItemType: */
171-
#define QI_VAL 1
172-
#define QI_OPR 2
173-
#define QI_VALSTOP 3 /* This is only used in an intermediate stack
174-
* representation in parse_tsquery. It's not a
175-
* legal type elsewhere. */
176-
177-
/*
178-
* QueryItem is one node in tsquery - operator or operand.
179-
*/
180-
typedef struct
181-
{
182-
QueryItemType type; /* operand or kind of operator (ts_tokentype) */
183-
uint8 weight; /* weights of operand to search. It's a
184-
* bitmask of allowed weights. if it =0 then
185-
* any weight are allowed. Weights and bit
186-
* map: A: 1<<3 B: 1<<2 C: 1<<1 D: 1<<0 */
187-
bool prefix; /* true if it's a prefix search */
188-
int32 valcrc; /* XXX: pg_crc32 would be a more appropriate
189-
* data type, but we use comparisons to signed
190-
* integers in the code. They would need to be
191-
* changed as well. */
192-
193-
/* pointer to text value of operand, must correlate with WordEntry2 */
194-
uint32
195-
length:12,
196-
distance:20;
197-
} QueryOperand;
198-
199-
200-
/*
201-
* Legal values for QueryOperator.operator.
202-
*/
203-
#define OP_NOT 1
204-
#define OP_AND 2
205-
#define OP_OR 3
206-
#define OP_PHRASE 4 /* highest code, tsquery_cleanup.c */
207-
#define OP_COUNT 4
208-
209-
extern const int tsearch_op_priority[OP_COUNT];
210-
211-
/* get operation priority by its code*/
212-
#define OP_PRIORITY(x) ( tsearch_op_priority[(x) - 1] )
213-
/* get QueryOperator priority */
214-
#define QO_PRIORITY(x) OP_PRIORITY(((QueryOperator *) (x))->oper)
215-
216-
typedef struct
217-
{
218-
QueryItemType type;
219-
int8 oper; /* see above */
220-
int16 distance; /* distance between agrs for OP_PHRASE */
221-
uint32 left; /* pointer to left operand. Right operand is
222-
* item + 1, left operand is placed
223-
* item+item->left */
224-
} QueryOperator;
225-
226-
/*
227-
* Note: TSQuery is 4-bytes aligned, so make sure there's no fields
228-
* inside QueryItem requiring 8-byte alignment, like int64.
229-
*/
230-
typedef union
231-
{
232-
QueryItemType type;
233-
QueryOperator qoperator;
234-
QueryOperand qoperand;
235-
} QueryItem;
236-
237-
/*
238-
* Storage:
239-
* (len)(size)(array of QueryItem)(operands as '\0'-terminated c-strings)
240-
*/
241-
242-
typedef struct
243-
{
244-
int32 vl_len_; /* varlena header (do not touch directly!) */
245-
int32 size; /* number of QueryItems */
246-
char data[FLEXIBLE_ARRAY_MEMBER]; /* data starts here */
247-
} TSQueryData;
248-
249-
typedef TSQueryData *TSQuery;
250-
251-
#define HDRSIZETQ ( VARHDRSZ + sizeof(int32) )
252-
253-
/* Computes the size of header and all QueryItems. size is the number of
254-
* QueryItems, and lenofoperand is the total length of all operands
255-
*/
256-
#define COMPUTESIZE(size, lenofoperand) ( HDRSIZETQ + (size) * sizeof(QueryItem) + (lenofoperand) )
257-
#define TSQUERY_TOO_BIG(size, lenofoperand) \
258-
((size) > (MaxAllocSize - HDRSIZETQ - (lenofoperand)) / sizeof(QueryItem))
259-
260-
/* Returns a pointer to the first QueryItem in a TSQuery */
261-
#define GETQUERY(x) ((QueryItem*)( (char*)(x)+HDRSIZETQ ))
262-
263-
/* Returns a pointer to the beginning of operands in a TSQuery */
264-
#define GETOPERAND(x) ( (char*)GETQUERY(x) + ((TSQuery)(x))->size * sizeof(QueryItem) )
265-
266-
/*
267-
* fmgr interface macros
268-
* Note, TSQuery type marked as plain storage, so it can't be toasted
269-
* but PG_DETOAST_DATUM_COPY is used for simplicity
270-
*/
271-
272-
#define DatumGetTSQuery(X) (PG_DETOAST_DATUM(X))
273-
#define DatumGetTSQueryCopy(X) (PG_DETOAST_DATUM_COPY(X))
274-
#define TSQueryGetDatum(X) PointerGetDatum(X)
275-
#define PG_GETARG_TSQUERY(n) DatumGetTSQuery(PG_GETARG_DATUM(n))
276-
#define PG_GETARG_TSQUERY_COPY(n) DatumGetTSQueryCopy(PG_GETARG_DATUM(n))
277-
#define PG_RETURN_TSQUERY(x) return TSQueryGetDatum(x)
153+
#define DatumGetTSVector2(X) ((TSVector2) PG_DETOAST_DATUM(X))
154+
#define DatumGetTSVector2Copy(X) ((TSVector2) PG_DETOAST_DATUM(X))
155+
#define TSVector2GetDatum(X) PointerGetDatum(X)
156+
#define PG_GETARG_TSVECTOR2(n) DatumGetTSVector2(PG_GETARG_DATUM(n))
157+
#define PG_GETARG_TSVECTOR2_COPY(n) DatumGetTSVector2Copy(PG_GETARG_DATUM(n))
158+
#define PG_RETURN_TSVECTOR2(x) return TSVector2GetDatum(x)
278159

279160
int tsvector2_getoffset(TSVector2 vec, int idx, WordEntry2 **we);
280161
char *tsvector2_addlexeme(TSVector2 tsv, int idx, int *dataoff,
@@ -294,4 +175,4 @@ tsvector2_getlexeme(TSVector2 vec, int idx, WordEntry2 **we)
294175
return tsvector2_storage(vec) + tsvector2_getoffset(vec, idx, we);
295176
}
296177

297-
#endif /* _PG_TSTYPE_H_ */
178+
#endif

0 commit comments

Comments
 (0)