Skip to content

Commit 57555e7

Browse files
za-arthurza-arthur
committed
Fix rumvalidate()
1 parent 089a1bb commit 57555e7

File tree

6 files changed

+30
-39
lines changed

6 files changed

+30
-39
lines changed

‎rum--1.0.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ AS
225225
FUNCTION 4 rum_timestamp_consistent(internal,smallint,timestamp,int,internal,internal,internal,internal),
226226
FUNCTION 5 rum_timestamp_compare_prefix(timestamp,timestamp,smallint,internal),
227227
FUNCTION 6 rum_timestamp_config(internal),
228-
-- support to timestamp disttance in rum_tsvector_timestamp_ops
228+
-- support to timestamp distance in rum_tsvector_timestamp_ops
229229
FUNCTION 9 rum_timestamp_outer_distance(timestamp, timestamp, smallint),
230230
OPERATOR 20 <=> (timestamp,timestamp) FOR ORDER BY pg_catalog.float_ops,
231231
OPERATOR 21 <=| (timestamp,timestamp) FOR ORDER BY pg_catalog.float_ops,

‎rum--1.1.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ AS
225225
FUNCTION 4 rum_timestamp_consistent(internal,smallint,timestamp,int,internal,internal,internal,internal),
226226
FUNCTION 5 rum_timestamp_compare_prefix(timestamp,timestamp,smallint,internal),
227227
FUNCTION 6 rum_timestamp_config(internal),
228-
-- support to timestamp disttance in rum_tsvector_timestamp_ops
228+
-- support to timestamp distance in rum_tsvector_timestamp_ops
229229
FUNCTION 9 rum_timestamp_outer_distance(timestamp, timestamp, smallint),
230230
OPERATOR 20 <=> (timestamp,timestamp) FOR ORDER BY pg_catalog.float_ops,
231231
OPERATOR 21 <=| (timestamp,timestamp) FOR ORDER BY pg_catalog.float_ops,

‎src/rum.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ typedef struct RumScanKeyData
620620

621621
/* array of keys, used to scan using additional information as keys */
622622
RumScanKey *addInfoKeys;
623-
int addInfoNKeys;
623+
uint32 addInfoNKeys;
624624
} RumScanKeyData;
625625

626626
typedef struct RumScanEntryData

‎src/rumget.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ entryGetItem(RumState * rumstate, RumScanEntry entry, bool *nextEntryList)
11251125

11261126
if (ItemPointerIsMin(&collected.iptr))
11271127
{
1128-
joinedAddInfoIsNull = true; /* wiil change later */
1128+
joinedAddInfoIsNull = true; /* will change later */
11291129
collected.addInfoIsNull = true;
11301130
}
11311131
else

‎src/rumscan.c‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,7 @@ freeScanKeys(RumScanOpaque so)
321321
}
322322

323323
static void
324-
initScanKey(RumScanOpaque so, ScanKey skey, bool *hasNullQuery,
325-
bool *hasPartialMatch)
324+
initScanKey(RumScanOpaque so, ScanKey skey, bool *hasPartialMatch)
326325
{
327326
Datum *queryValues;
328327
int32 nQueryValues = 0;
@@ -362,10 +361,6 @@ initScanKey(RumScanOpaque so, ScanKey skey, bool *hasNullQuery,
362361
searchMode > GIN_SEARCH_MODE_ALL)
363362
searchMode = GIN_SEARCH_MODE_ALL;
364363

365-
/* Non-default modes require the index to have placeholders */
366-
if (searchMode != GIN_SEARCH_MODE_DEFAULT)
367-
*hasNullQuery = true;
368-
369364
/*
370365
* In default mode, no keys means an unsatisfiable query.
371366
*/
@@ -395,10 +390,7 @@ initScanKey(RumScanOpaque so, ScanKey skey, bool *hasNullQuery,
395390
for (j = 0; j < nQueryValues; j++)
396391
{
397392
if (nullFlags[j])
398-
{
399393
nullFlags[j] = true; /* not any other nonzero value */
400-
*hasNullQuery = true;
401-
}
402394
}
403395
}
404396
/* now we can use the nullFlags as category codes */
@@ -521,7 +513,6 @@ rumNewScanKey(IndexScanDesc scan)
521513
{
522514
RumScanOpaque so = (RumScanOpaque) scan->opaque;
523515
int i;
524-
bool hasNullQuery = false;
525516
bool checkEmptyEntry = false;
526517
bool hasPartialMatch = false;
527518
MemoryContext oldCtx;
@@ -554,7 +545,7 @@ rumNewScanKey(IndexScanDesc scan)
554545

555546
for (i = 0; i < scan->numberOfKeys; i++)
556547
{
557-
initScanKey(so, &scan->keyData[i], &hasNullQuery, &hasPartialMatch);
548+
initScanKey(so, &scan->keyData[i], &hasPartialMatch);
558549
if (so->isVoidRes)
559550
break;
560551
}
@@ -565,7 +556,6 @@ rumNewScanKey(IndexScanDesc scan)
565556
*/
566557
if (so->nkeys == 0 && !so->isVoidRes)
567558
{
568-
hasNullQuery = true;
569559
rumFillScanKey(so, FirstOffsetNumber,
570560
InvalidStrategy,
571561
GIN_SEARCH_MODE_EVERYTHING,
@@ -576,7 +566,7 @@ rumNewScanKey(IndexScanDesc scan)
576566

577567
for (i = 0; i < scan->numberOfOrderBys; i++)
578568
{
579-
initScanKey(so, &scan->orderByData[i], &hasNullQuery, NULL);
569+
initScanKey(so, &scan->orderByData[i], NULL);
580570
if (so->isVoidRes)
581571
break;
582572
}

‎src/rumvalidate.c‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ rumvalidate(Oid opclassoid)
114114
case GIN_EXTRACTVALUE_PROC:
115115
/* Some opclasses omit nullFlags */
116116
ok = check_amproc_signature(procform->amproc, INTERNALOID, false,
117-
5, 5, opcintype, INTERNALOID,
117+
2, 5, opcintype, INTERNALOID,
118118
INTERNALOID, INTERNALOID,
119119
INTERNALOID);
120120
break;
121121
case GIN_EXTRACTQUERY_PROC:
122122
/* Some opclasses omit nullFlags and searchMode */
123123
ok = check_amproc_signature(procform->amproc, INTERNALOID, false,
124-
7, 7, opcintype, INTERNALOID,
124+
5, 7, opcintype, INTERNALOID,
125125
INT2OID, INTERNALOID, INTERNALOID,
126126
INTERNALOID, INTERNALOID);
127127
break;
@@ -151,11 +151,11 @@ rumvalidate(Oid opclassoid)
151151
break;
152152
case RUM_ORDERING_PROC:
153153
ok = check_amproc_signature(procform->amproc, FLOAT8OID, false,
154-
9, 9, INTERNALOID, INT2OID,
154+
10, 10, INTERNALOID, INT2OID,
155155
opcintype, INT4OID,
156156
INTERNALOID, INTERNALOID,
157157
INTERNALOID, INTERNALOID,
158-
INTERNALOID);
158+
INTERNALOID, INTERNALOID);
159159
break;
160160
case RUM_OUTER_ORDERING_PROC:
161161
ok = check_amproc_signature(procform->amproc, FLOAT8OID, false,
@@ -164,7 +164,7 @@ rumvalidate(Oid opclassoid)
164164
break;
165165
case RUM_ADDINFO_JOIN:
166166
ok = check_amproc_signature(procform->amproc, BYTEAOID, false,
167-
2, 2, opckeytype, opckeytype);
167+
2, 2, INTERNALOID, INTERNALOID);
168168
break;
169169
default:
170170
ereport(INFO,
@@ -207,22 +207,25 @@ rumvalidate(Oid opclassoid)
207207
result = false;
208208
}
209209

210-
/* rum doesn't support ORDER BY operators */
211-
if (oprform->amoppurpose != AMOP_SEARCH ||
212-
OidIsValid(oprform->amopsortfamily))
210+
/* Check ORDER BY operator signature */
211+
if (oprform->amoppurpose == AMOP_ORDER)
213212
{
214-
ereport(INFO,
215-
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
216-
errmsg("rum opfamily %s contains invalid ORDER BY specification for operator %s",
217-
opfamilyname,
218-
format_operator(oprform->amopopr))));
219-
result = false;
213+
if (!check_amop_signature(oprform->amopopr, FLOAT8OID,
214+
oprform->amoplefttype,
215+
oprform->amoprighttype))
216+
{
217+
ereport(INFO,
218+
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
219+
errmsg("rum opfamily %s contains invalid ORDER BY specification for operator %s",
220+
opfamilyname,
221+
format_operator(oprform->amopopr))));
222+
result = false;
223+
}
220224
}
221-
222-
/* Check operator signature --- same for all rum strategies */
223-
if (!check_amop_signature(oprform->amopopr, BOOLOID,
224-
oprform->amoplefttype,
225-
oprform->amoprighttype))
225+
/* Check other operator signature */
226+
else if (!check_amop_signature(oprform->amopopr, BOOLOID,
227+
oprform->amoplefttype,
228+
oprform->amoprighttype))
226229
{
227230
ereport(INFO,
228231
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -263,9 +266,7 @@ rumvalidate(Oid opclassoid)
263266
continue; /* got it */
264267
if (i == GIN_COMPARE_PARTIAL_PROC)
265268
continue; /* optional method */
266-
if (i == GIN_CONSISTENT_PROC)
267-
continue;
268-
if (i == RUM_PRE_CONSISTENT_PROC)
269+
if (i >= RUM_CONFIG_PROC)
269270
continue;
270271
ereport(INFO,
271272
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

0 commit comments

Comments
 (0)