Skip to content

Commit baa4fb5

Browse files
akorotkovakorotkov
committed
Rename GIN opclasses.
1 parent bfa87d1 commit baa4fb5

File tree

2 files changed

+65
-65
lines changed

2 files changed

+65
-65
lines changed

‎jsonb_gin_ops.c

+39-39
Original file line numberDiff line numberDiff line change
@@ -78,33 +78,33 @@ static GINKey *make_gin_query_key_minus_inf(uint32 hash);
7878
static int32 compare_gin_key_value(GINKey *arg1, GINKey *arg2);
7979
static int add_entry(Entries *e, Datum key, Pointer extra, bool pmatch);
8080

81-
PG_FUNCTION_INFO_V1(gin_compare_jsonb_bloom_value);
82-
PG_FUNCTION_INFO_V1(gin_compare_partial_jsonb_bloom_value);
83-
PG_FUNCTION_INFO_V1(gin_extract_jsonb_bloom_value);
84-
PG_FUNCTION_INFO_V1(gin_extract_jsonb_query_bloom_value);
85-
PG_FUNCTION_INFO_V1(gin_consistent_jsonb_bloom_value);
86-
PG_FUNCTION_INFO_V1(gin_triconsistent_jsonb_bloom_value);
87-
88-
Datum gin_compare_jsonb_bloom_value(PG_FUNCTION_ARGS);
89-
Datum gin_compare_partial_jsonb_bloom_value(PG_FUNCTION_ARGS);
90-
Datum gin_extract_jsonb_bloom_value(PG_FUNCTION_ARGS);
91-
Datum gin_extract_jsonb_query_bloom_value(PG_FUNCTION_ARGS);
92-
Datum gin_consistent_jsonb_bloom_value(PG_FUNCTION_ARGS);
93-
Datum gin_triconsistent_jsonb_bloom_value(PG_FUNCTION_ARGS);
94-
95-
PG_FUNCTION_INFO_V1(gin_compare_jsonb_hash_value);
96-
PG_FUNCTION_INFO_V1(gin_compare_partial_jsonb_hash_value);
97-
PG_FUNCTION_INFO_V1(gin_extract_jsonb_hash_value);
98-
PG_FUNCTION_INFO_V1(gin_extract_jsonb_query_hash_value);
99-
PG_FUNCTION_INFO_V1(gin_consistent_jsonb_hash_value);
100-
PG_FUNCTION_INFO_V1(gin_triconsistent_jsonb_hash_value);
101-
102-
Datum gin_compare_jsonb_hash_value(PG_FUNCTION_ARGS);
103-
Datum gin_compare_partial_jsonb_hash_value(PG_FUNCTION_ARGS);
104-
Datum gin_extract_jsonb_hash_value(PG_FUNCTION_ARGS);
105-
Datum gin_extract_jsonb_query_hash_value(PG_FUNCTION_ARGS);
106-
Datum gin_consistent_jsonb_hash_value(PG_FUNCTION_ARGS);
107-
Datum gin_triconsistent_jsonb_hash_value(PG_FUNCTION_ARGS);
81+
PG_FUNCTION_INFO_V1(gin_compare_jsonb_value_path);
82+
PG_FUNCTION_INFO_V1(gin_compare_partial_jsonb_value_path);
83+
PG_FUNCTION_INFO_V1(gin_extract_jsonb_value_path);
84+
PG_FUNCTION_INFO_V1(gin_extract_jsonb_query_value_path);
85+
PG_FUNCTION_INFO_V1(gin_consistent_jsonb_value_path);
86+
PG_FUNCTION_INFO_V1(gin_triconsistent_jsonb_value_path);
87+
88+
Datum gin_compare_jsonb_value_path(PG_FUNCTION_ARGS);
89+
Datum gin_compare_partial_jsonb_value_path(PG_FUNCTION_ARGS);
90+
Datum gin_extract_jsonb_value_path(PG_FUNCTION_ARGS);
91+
Datum gin_extract_jsonb_query_value_path(PG_FUNCTION_ARGS);
92+
Datum gin_consistent_jsonb_value_path(PG_FUNCTION_ARGS);
93+
Datum gin_triconsistent_jsonb_value_path(PG_FUNCTION_ARGS);
94+
95+
PG_FUNCTION_INFO_V1(gin_compare_jsonb_path_value);
96+
PG_FUNCTION_INFO_V1(gin_compare_partial_jsonb_path_value);
97+
PG_FUNCTION_INFO_V1(gin_extract_jsonb_path_value);
98+
PG_FUNCTION_INFO_V1(gin_extract_jsonb_query_path_value);
99+
PG_FUNCTION_INFO_V1(gin_consistent_jsonb_path_value);
100+
PG_FUNCTION_INFO_V1(gin_triconsistent_jsonb_path_value);
101+
102+
Datum gin_compare_jsonb_path_value(PG_FUNCTION_ARGS);
103+
Datum gin_compare_partial_jsonb_path_value(PG_FUNCTION_ARGS);
104+
Datum gin_extract_jsonb_path_value(PG_FUNCTION_ARGS);
105+
Datum gin_extract_jsonb_query_path_value(PG_FUNCTION_ARGS);
106+
Datum gin_consistent_jsonb_path_value(PG_FUNCTION_ARGS);
107+
Datum gin_triconsistent_jsonb_path_value(PG_FUNCTION_ARGS);
108108

109109
static int
110110
add_entry(Entries *e, Datum key, Pointer extra, bool pmatch)
@@ -454,7 +454,7 @@ compare_gin_key_value(GINKey *arg1, GINKey *arg2)
454454
}
455455

456456
Datum
457-
gin_compare_jsonb_bloom_value(PG_FUNCTION_ARGS)
457+
gin_compare_jsonb_value_path(PG_FUNCTION_ARGS)
458458
{
459459
GINKey *arg1 = (GINKey *)PG_GETARG_VARLENA_P(0);
460460
GINKey *arg2 = (GINKey *)PG_GETARG_VARLENA_P(1);
@@ -471,7 +471,7 @@ gin_compare_jsonb_bloom_value(PG_FUNCTION_ARGS)
471471
}
472472

473473
Datum
474-
gin_compare_partial_jsonb_bloom_value(PG_FUNCTION_ARGS)
474+
gin_compare_partial_jsonb_value_path(PG_FUNCTION_ARGS)
475475
{
476476
GINKey *partial_key = (GINKey *)PG_GETARG_VARLENA_P(0);
477477
GINKey *key = (GINKey *)PG_GETARG_VARLENA_P(1);
@@ -622,7 +622,7 @@ gin_extract_jsonb_bloom_value_internal(Jsonb *jb, int32 *nentries, uint32 **bloo
622622
}
623623

624624
Datum
625-
gin_extract_jsonb_bloom_value(PG_FUNCTION_ARGS)
625+
gin_extract_jsonb_value_path(PG_FUNCTION_ARGS)
626626
{
627627
Jsonb *jb = PG_GETARG_JSONB(0);
628628
int32 *nentries = (int32 *) PG_GETARG_POINTER(1);
@@ -631,7 +631,7 @@ gin_extract_jsonb_bloom_value(PG_FUNCTION_ARGS)
631631
}
632632

633633
Datum
634-
gin_extract_jsonb_query_bloom_value(PG_FUNCTION_ARGS)
634+
gin_extract_jsonb_query_value_path(PG_FUNCTION_ARGS)
635635
{
636636
Jsonb *jb;
637637
int32 *nentries = (int32 *) PG_GETARG_POINTER(1);
@@ -699,7 +699,7 @@ gin_extract_jsonb_query_bloom_value(PG_FUNCTION_ARGS)
699699
}
700700

701701
Datum
702-
gin_consistent_jsonb_bloom_value(PG_FUNCTION_ARGS)
702+
gin_consistent_jsonb_value_path(PG_FUNCTION_ARGS)
703703
{
704704
bool *check = (bool *) PG_GETARG_POINTER(0);
705705
StrategyNumber strategy = PG_GETARG_UINT16(1);
@@ -741,7 +741,7 @@ gin_consistent_jsonb_bloom_value(PG_FUNCTION_ARGS)
741741
}
742742

743743
Datum
744-
gin_triconsistent_jsonb_bloom_value(PG_FUNCTION_ARGS)
744+
gin_triconsistent_jsonb_value_path(PG_FUNCTION_ARGS)
745745
{
746746
GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0);
747747
StrategyNumber strategy = PG_GETARG_UINT16(1);
@@ -907,7 +907,7 @@ make_hash_entry_handler(ExtractedNode *node, Pointer extra)
907907
}
908908

909909
Datum
910-
gin_compare_jsonb_hash_value(PG_FUNCTION_ARGS)
910+
gin_compare_jsonb_path_value(PG_FUNCTION_ARGS)
911911
{
912912
GINKey *arg1 = (GINKey *)PG_GETARG_VARLENA_P(0);
913913
GINKey *arg2 = (GINKey *)PG_GETARG_VARLENA_P(1);
@@ -927,7 +927,7 @@ gin_compare_jsonb_hash_value(PG_FUNCTION_ARGS)
927927
}
928928

929929
Datum
930-
gin_compare_partial_jsonb_hash_value(PG_FUNCTION_ARGS)
930+
gin_compare_partial_jsonb_path_value(PG_FUNCTION_ARGS)
931931
{
932932
GINKey *partial_key = (GINKey *)PG_GETARG_VARLENA_P(0);
933933
GINKey *key = (GINKey *)PG_GETARG_VARLENA_P(1);
@@ -1059,7 +1059,7 @@ gin_extract_jsonb_hash_value_internal(Jsonb *jb, int32 *nentries)
10591059
}
10601060

10611061
Datum
1062-
gin_extract_jsonb_hash_value(PG_FUNCTION_ARGS)
1062+
gin_extract_jsonb_path_value(PG_FUNCTION_ARGS)
10631063
{
10641064
Jsonb *jb = PG_GETARG_JSONB(0);
10651065
int32 *nentries = (int32 *) PG_GETARG_POINTER(1);
@@ -1068,7 +1068,7 @@ gin_extract_jsonb_hash_value(PG_FUNCTION_ARGS)
10681068
}
10691069

10701070
Datum
1071-
gin_extract_jsonb_query_hash_value(PG_FUNCTION_ARGS)
1071+
gin_extract_jsonb_query_path_value(PG_FUNCTION_ARGS)
10721072
{
10731073
Jsonb *jb;
10741074
int32 *nentries = (int32 *) PG_GETARG_POINTER(1);
@@ -1121,7 +1121,7 @@ gin_extract_jsonb_query_hash_value(PG_FUNCTION_ARGS)
11211121
}
11221122

11231123
Datum
1124-
gin_consistent_jsonb_hash_value(PG_FUNCTION_ARGS)
1124+
gin_consistent_jsonb_path_value(PG_FUNCTION_ARGS)
11251125
{
11261126
bool *check = (bool *) PG_GETARG_POINTER(0);
11271127
StrategyNumber strategy = PG_GETARG_UINT16(1);
@@ -1162,7 +1162,7 @@ gin_consistent_jsonb_hash_value(PG_FUNCTION_ARGS)
11621162
}
11631163

11641164
Datum
1165-
gin_triconsistent_jsonb_hash_value(PG_FUNCTION_ARGS)
1165+
gin_triconsistent_jsonb_path_value(PG_FUNCTION_ARGS)
11661166
{
11671167
GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0);
11681168
StrategyNumber strategy = PG_GETARG_UINT16(1);

‎jsquery--1.0.sql

+26-26
Original file line numberDiff line numberDiff line change
@@ -198,86 +198,86 @@ CREATE OPERATOR CLASS jsquery_ops
198198
OPERATOR 1 =,
199199
FUNCTION 1 jsquery_hash(jsquery);
200200

201-
CREATE OR REPLACE FUNCTION gin_compare_jsonb_bloom_value(bytea, bytea)
201+
CREATE OR REPLACE FUNCTION gin_compare_jsonb_value_path(bytea, bytea)
202202
RETURNS integer
203203
AS 'MODULE_PATHNAME'
204204
LANGUAGE C STRICT IMMUTABLE;
205205

206-
CREATE OR REPLACE FUNCTION gin_compare_partial_jsonb_bloom_value(bytea, bytea, smallint, internal)
206+
CREATE OR REPLACE FUNCTION gin_compare_partial_jsonb_value_path(bytea, bytea, smallint, internal)
207207
RETURNS integer
208208
AS 'MODULE_PATHNAME'
209209
LANGUAGE C STRICT IMMUTABLE;
210210

211-
CREATE OR REPLACE FUNCTION gin_extract_jsonb_bloom_value(internal, internal, internal)
211+
CREATE OR REPLACE FUNCTION gin_extract_jsonb_value_path(internal, internal, internal)
212212
RETURNS internal
213213
AS 'MODULE_PATHNAME'
214214
LANGUAGE C STRICT IMMUTABLE;
215215

216-
CREATE OR REPLACE FUNCTION gin_extract_jsonb_query_bloom_value(anyarray, internal, smallint, internal, internal, internal, internal)
216+
CREATE OR REPLACE FUNCTION gin_extract_jsonb_query_value_path(anyarray, internal, smallint, internal, internal, internal, internal)
217217
RETURNS internal
218218
AS 'MODULE_PATHNAME'
219219
LANGUAGE C STRICT IMMUTABLE;
220220

221-
CREATE OR REPLACE FUNCTION gin_consistent_jsonb_bloom_value(internal, smallint, anyarray, integer, internal, internal, internal, internal)
221+
CREATE OR REPLACE FUNCTION gin_consistent_jsonb_value_path(internal, smallint, anyarray, integer, internal, internal, internal, internal)
222222
RETURNS boolean
223223
AS 'MODULE_PATHNAME'
224224
LANGUAGE C STRICT IMMUTABLE;
225225

226-
CREATE OR REPLACE FUNCTION gin_triconsistent_jsonb_bloom_value(internal, smallint, anyarray, integer, internal, internal, internal)
226+
CREATE OR REPLACE FUNCTION gin_triconsistent_jsonb_value_path(internal, smallint, anyarray, integer, internal, internal, internal)
227227
RETURNS boolean
228228
AS 'MODULE_PATHNAME'
229229
LANGUAGE C STRICT IMMUTABLE;
230230

231-
CREATE OPERATOR CLASS jsonb_bloom_value_ops
231+
CREATE OPERATOR CLASS jsonb_value_path_ops
232232
FOR TYPE jsonb USING gin AS
233233
OPERATOR 7 @>,
234234
OPERATOR 14 @@ (jsonb, jsquery),
235-
FUNCTION 1 gin_compare_jsonb_bloom_value(bytea, bytea),
236-
FUNCTION 2 gin_extract_jsonb_bloom_value(internal, internal, internal),
237-
FUNCTION 3 gin_extract_jsonb_query_bloom_value(anyarray, internal, smallint, internal, internal, internal, internal),
238-
FUNCTION 4 gin_consistent_jsonb_bloom_value(internal, smallint, anyarray, integer, internal, internal, internal, internal),
239-
FUNCTION 5 gin_compare_partial_jsonb_bloom_value(bytea, bytea, smallint, internal),
240-
FUNCTION 6 gin_triconsistent_jsonb_bloom_value(internal, smallint, anyarray, integer, internal, internal, internal),
235+
FUNCTION 1 gin_compare_jsonb_value_path(bytea, bytea),
236+
FUNCTION 2 gin_extract_jsonb_value_path(internal, internal, internal),
237+
FUNCTION 3 gin_extract_jsonb_query_value_path(anyarray, internal, smallint, internal, internal, internal, internal),
238+
FUNCTION 4 gin_consistent_jsonb_value_path(internal, smallint, anyarray, integer, internal, internal, internal, internal),
239+
FUNCTION 5 gin_compare_partial_jsonb_value_path(bytea, bytea, smallint, internal),
240+
FUNCTION 6 gin_triconsistent_jsonb_value_path(internal, smallint, anyarray, integer, internal, internal, internal),
241241
STORAGE bytea;
242242

243-
CREATE OR REPLACE FUNCTION gin_compare_jsonb_hash_value(bytea, bytea)
243+
CREATE OR REPLACE FUNCTION gin_compare_jsonb_path_value(bytea, bytea)
244244
RETURNS integer
245245
AS 'MODULE_PATHNAME'
246246
LANGUAGE C STRICT IMMUTABLE;
247247

248-
CREATE OR REPLACE FUNCTION gin_compare_partial_jsonb_hash_value(bytea, bytea, smallint, internal)
248+
CREATE OR REPLACE FUNCTION gin_compare_partial_jsonb_path_value(bytea, bytea, smallint, internal)
249249
RETURNS integer
250250
AS 'MODULE_PATHNAME'
251251
LANGUAGE C STRICT IMMUTABLE;
252252

253-
CREATE OR REPLACE FUNCTION gin_extract_jsonb_hash_value(internal, internal, internal)
253+
CREATE OR REPLACE FUNCTION gin_extract_jsonb_path_value(internal, internal, internal)
254254
RETURNS internal
255255
AS 'MODULE_PATHNAME'
256256
LANGUAGE C STRICT IMMUTABLE;
257257

258-
CREATE OR REPLACE FUNCTION gin_extract_jsonb_query_hash_value(anyarray, internal, smallint, internal, internal, internal, internal)
258+
CREATE OR REPLACE FUNCTION gin_extract_jsonb_query_path_value(anyarray, internal, smallint, internal, internal, internal, internal)
259259
RETURNS internal
260260
AS 'MODULE_PATHNAME'
261261
LANGUAGE C STRICT IMMUTABLE;
262262

263-
CREATE OR REPLACE FUNCTION gin_consistent_jsonb_hash_value(internal, smallint, anyarray, integer, internal, internal, internal, internal)
263+
CREATE OR REPLACE FUNCTION gin_consistent_jsonb_path_value(internal, smallint, anyarray, integer, internal, internal, internal, internal)
264264
RETURNS boolean
265265
AS 'MODULE_PATHNAME'
266266
LANGUAGE C STRICT IMMUTABLE;
267267

268-
CREATE OR REPLACE FUNCTION gin_triconsistent_jsonb_hash_value(internal, smallint, anyarray, integer, internal, internal, internal)
268+
CREATE OR REPLACE FUNCTION gin_triconsistent_jsonb_path_value(internal, smallint, anyarray, integer, internal, internal, internal)
269269
RETURNS boolean
270270
AS 'MODULE_PATHNAME'
271271
LANGUAGE C STRICT IMMUTABLE;
272272

273-
CREATE OPERATOR CLASS jsonb_hash_value_ops
273+
CREATE OPERATOR CLASS jsonb_path_value_ops
274274
FOR TYPE jsonb USING gin AS
275275
OPERATOR 7 @>,
276276
OPERATOR 14 @@ (jsonb, jsquery),
277-
FUNCTION 1 gin_compare_jsonb_hash_value(bytea, bytea),
278-
FUNCTION 2 gin_extract_jsonb_hash_value(internal, internal, internal),
279-
FUNCTION 3 gin_extract_jsonb_query_hash_value(anyarray, internal, smallint, internal, internal, internal, internal),
280-
FUNCTION 4 gin_consistent_jsonb_hash_value(internal, smallint, anyarray, integer, internal, internal, internal, internal),
281-
FUNCTION 5 gin_compare_partial_jsonb_hash_value(bytea, bytea, smallint, internal),
282-
FUNCTION 6 gin_triconsistent_jsonb_hash_value(internal, smallint, anyarray, integer, internal, internal, internal),
277+
FUNCTION 1 gin_compare_jsonb_path_value(bytea, bytea),
278+
FUNCTION 2 gin_extract_jsonb_path_value(internal, internal, internal),
279+
FUNCTION 3 gin_extract_jsonb_query_path_value(anyarray, internal, smallint, internal, internal, internal, internal),
280+
FUNCTION 4 gin_consistent_jsonb_path_value(internal, smallint, anyarray, integer, internal, internal, internal, internal),
281+
FUNCTION 5 gin_compare_partial_jsonb_path_value(bytea, bytea, smallint, internal),
282+
FUNCTION 6 gin_triconsistent_jsonb_path_value(internal, smallint, anyarray, integer, internal, internal, internal),
283283
STORAGE bytea;

0 commit comments

Comments
 (0)