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

Commit77e65bf

Browse files
committed
Fix the return type of GIN triConsistent support functions to "char".
They were marked to return a boolean, but they actually return aGinTernaryValue, which is more like a "char". It makes no practicaldifference, as the triConsistent functions cannot be called directly fromSQL because they have "internal" arguments, but this nevertheless seemsmore correct.Also fix the GinTernaryValue name in the documentation. I renamed the enumearlier, but neglected the docs.Alexander Korotkov. This is new in 9.4, so backpatch there.
1 parent58e70cf commit77e65bf

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

‎doc/src/sgml/gin.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@
614614
</varlistentry>
615615

616616
<varlistentry>
617-
<term><function>GinLogicValue triConsistent(GinLogicValue check[], StrategyNumber n, Datum query,
617+
<term><function>GinTernaryValue triConsistent(GinTernaryValue check[], StrategyNumber n, Datum query,
618618
int32 nkeys, Pointer extra_data[],
619619
Datum queryKeys[], bool nullFlags[])</></term>
620620
<listitem>

‎src/include/catalog/catversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/*yyyymmddN */
56-
#defineCATALOG_VERSION_NO201409111
56+
#defineCATALOG_VERSION_NO201409162
5757

5858
#endif

‎src/include/catalog/pg_proc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4068,7 +4068,7 @@ DATA(insert OID = 2774 ( ginqueryarrayextractPGNSP PGUID 12 1 0 0 0 f f f f t
40684068
DESCR("GIN array support");
40694069
DATA(insertOID=2744 (ginarrayconsistentPGNSPPGUID121000fffftfi8016"2281 21 2277 23 2281 2281 2281 2281"_null__null__null__null_ginarrayconsistent_null__null__null_ ));
40704070
DESCR("GIN array support");
4071-
DATA(insertOID=3920 (ginarraytriconsistentPGNSPPGUID121000fffftfi7016"2281 21 2277 23 2281 2281 2281"_null__null__null__null_ginarraytriconsistent_null__null__null_ ));
4071+
DATA(insertOID=3920 (ginarraytriconsistentPGNSPPGUID121000fffftfi7018"2281 21 2277 23 2281 2281 2281"_null__null__null__null_ginarraytriconsistent_null__null__null_ ));
40724072
DESCR("GIN array support");
40734073
DATA(insertOID=3076 (ginarrayextractPGNSPPGUID121000fffftfi202281"2277 2281"_null__null__null__null_ginarrayextract_2args_null__null__null_ ));
40744074
DESCR("GIN array support (obsolete)");
@@ -4411,7 +4411,7 @@ DATA(insert OID = 3657 ( gin_extract_tsqueryPGNSP PGUID 12 1 0 0 0 f f f f t f
44114411
DESCR("GIN tsvector support");
44124412
DATA(insertOID=3658 (gin_tsquery_consistentPGNSPPGUID121000fffftfi8016"2281 21 3615 23 2281 2281 2281 2281"_null__null__null__null_gin_tsquery_consistent_null__null__null_ ));
44134413
DESCR("GIN tsvector support");
4414-
DATA(insertOID=3921 (gin_tsquery_triconsistentPGNSPPGUID121000fffftfi7016"2281 21 3615 23 2281 2281 2281"_null__null__null__null_gin_tsquery_triconsistent_null__null__null_ ));
4414+
DATA(insertOID=3921 (gin_tsquery_triconsistentPGNSPPGUID121000fffftfi7018"2281 21 3615 23 2281 2281 2281"_null__null__null__null_gin_tsquery_triconsistent_null__null__null_ ));
44154415
DESCR("GIN tsvector support");
44164416
DATA(insertOID=3724 (gin_cmp_tslexemePGNSPPGUID121000fffftfi2023"25 25"_null__null__null__null_gin_cmp_tslexeme_null__null__null_ ));
44174417
DESCR("GIN tsvector support");
@@ -4653,15 +4653,15 @@ DATA(insert OID = 3483 ( gin_extract_jsonb_query PGNSP PGUID 12 1 0 0 0 f f f
46534653
DESCR("GIN support");
46544654
DATA(insertOID=3484 (gin_consistent_jsonbPGNSPPGUID121000fffftfi8016"2281 21 2277 23 2281 2281 2281 2281"_null__null__null__null_gin_consistent_jsonb_null__null__null_ ));
46554655
DESCR("GIN support");
4656-
DATA(insertOID=3488 (gin_triconsistent_jsonbPGNSPPGUID121000fffftfi7016"2281 21 2277 23 2281 2281 2281"_null__null__null__null_gin_triconsistent_jsonb_null__null__null_ ));
4656+
DATA(insertOID=3488 (gin_triconsistent_jsonbPGNSPPGUID121000fffftfi7018"2281 21 2277 23 2281 2281 2281"_null__null__null__null_gin_triconsistent_jsonb_null__null__null_ ));
46574657
DESCR("GIN support");
46584658
DATA(insertOID=3485 (gin_extract_jsonb_pathPGNSPPGUID121000fffftfi302281"2281 2281 2281"_null__null__null__null_gin_extract_jsonb_path_null__null__null_ ));
46594659
DESCR("GIN support");
46604660
DATA(insertOID=3486 (gin_extract_jsonb_query_pathPGNSPPGUID121000fffftfi702281"2277 2281 21 2281 2281 2281 2281"_null__null__null__null_gin_extract_jsonb_query_path_null__null__null_ ));
46614661
DESCR("GIN support");
46624662
DATA(insertOID=3487 (gin_consistent_jsonb_pathPGNSPPGUID121000fffftfi8016"2281 21 2277 23 2281 2281 2281 2281"_null__null__null__null_gin_consistent_jsonb_path_null__null__null_ ));
46634663
DESCR("GIN support");
4664-
DATA(insertOID=3489 (gin_triconsistent_jsonb_pathPGNSPPGUID121000fffftfi7016"2281 21 2277 23 2281 2281 2281"_null__null__null__null_gin_triconsistent_jsonb_path_null__null__null_ ));
4664+
DATA(insertOID=3489 (gin_triconsistent_jsonb_pathPGNSPPGUID121000fffftfi7018"2281 21 2277 23 2281 2281 2281"_null__null__null__null_gin_triconsistent_jsonb_path_null__null__null_ ));
46654665
DESCR("GIN support");
46664666

46674667
/* txid */

0 commit comments

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