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

Commit81e25a0

Browse files
committed
Fix compilation warnings
1 parent837b8b7 commit81e25a0

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

‎jsonb_gin_ops.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ gin_extract_jsonb_value_path_internal(Jsonb *jb, int32 *nentries, uint32 **bloom
732732
Datum
733733
gin_extract_jsonb_value_path(PG_FUNCTION_ARGS)
734734
{
735-
Jsonb*jb=PG_GETARG_JSONB(0);
735+
Jsonb*jb=PG_GETARG_JSONB_P(0);
736736
int32*nentries= (int32*)PG_GETARG_POINTER(1);
737737

738738
PG_RETURN_POINTER(gin_extract_jsonb_value_path_internal(jb,nentries,NULL));
@@ -770,12 +770,12 @@ gin_extract_jsonb_query_value_path(PG_FUNCTION_ARGS)
770770
switch(strategy)
771771
{
772772
caseJsonbContainsStrategyNumber:
773-
jb=PG_GETARG_JSONB(0);
773+
jb=PG_GETARG_JSONB_P(0);
774774
entries=gin_extract_jsonb_value_path_internal(jb,nentries,NULL);
775775
break;
776776

777777
caseJsonbNestedContainsStrategyNumber:
778-
jb=PG_GETARG_JSONB(0);
778+
jb=PG_GETARG_JSONB_P(0);
779779
entries=gin_extract_jsonb_value_path_internal(jb,nentries,&bloom);
780780

781781
n=*nentries;
@@ -867,7 +867,7 @@ gin_triconsistent_jsonb_value_path(PG_FUNCTION_ARGS)
867867
{
868868
GinTernaryValue*check= (GinTernaryValue*)PG_GETARG_POINTER(0);
869869
StrategyNumberstrategy=PG_GETARG_UINT16(1);
870-
/* Jsonb *query =PG_GETARG_JSONB(2); */
870+
/* Jsonb *query =PG_GETARG_JSONB_P(2); */
871871
int32nkeys=PG_GETARG_INT32(3);
872872
Pointer*extra_data= (Pointer*)PG_GETARG_POINTER(4);
873873
GinTernaryValueres=GIN_TRUE;
@@ -1171,7 +1171,7 @@ gin_extract_jsonb_path_value_internal(Jsonb *jb, int32 *nentries)
11711171
Datum
11721172
gin_extract_jsonb_path_value(PG_FUNCTION_ARGS)
11731173
{
1174-
Jsonb*jb=PG_GETARG_JSONB(0);
1174+
Jsonb*jb=PG_GETARG_JSONB_P(0);
11751175
int32*nentries= (int32*)PG_GETARG_POINTER(1);
11761176

11771177
PG_RETURN_POINTER(gin_extract_jsonb_path_value_internal(jb,nentries));
@@ -1209,7 +1209,7 @@ gin_extract_jsonb_query_path_value(PG_FUNCTION_ARGS)
12091209
switch(strategy)
12101210
{
12111211
caseJsonbContainsStrategyNumber:
1212-
jb=PG_GETARG_JSONB(0);
1212+
jb=PG_GETARG_JSONB_P(0);
12131213
entries=gin_extract_jsonb_path_value_internal(jb,nentries);
12141214
break;
12151215

@@ -1250,7 +1250,7 @@ gin_consistent_jsonb_path_value(PG_FUNCTION_ARGS)
12501250
{
12511251
bool*check= (bool*)PG_GETARG_POINTER(0);
12521252
StrategyNumberstrategy=PG_GETARG_UINT16(1);
1253-
/* Jsonb *query =PG_GETARG_JSONB(2); */
1253+
/* Jsonb *query =PG_GETARG_JSONB_P(2); */
12541254
int32nkeys=PG_GETARG_INT32(3);
12551255
Pointer*extra_data= (Pointer*)PG_GETARG_POINTER(4);
12561256
bool*recheck= (bool*)PG_GETARG_POINTER(5);
@@ -1291,7 +1291,7 @@ gin_triconsistent_jsonb_path_value(PG_FUNCTION_ARGS)
12911291
{
12921292
GinTernaryValue*check= (GinTernaryValue*)PG_GETARG_POINTER(0);
12931293
StrategyNumberstrategy=PG_GETARG_UINT16(1);
1294-
/* Jsonb *query =PG_GETARG_JSONB(2); */
1294+
/* Jsonb *query =PG_GETARG_JSONB_P(2); */
12951295
int32nkeys=PG_GETARG_INT32(3);
12961296
Pointer*extra_data= (Pointer*)PG_GETARG_POINTER(4);
12971297
GinTernaryValueres=GIN_TRUE;

‎jsquery.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,4 +248,12 @@ bool queryNeedRecheck(ExtractedNode *node);
248248
boolexecRecursive(ExtractedNode*node,bool*check);
249249
boolexecRecursiveTristate(ExtractedNode*node,GinTernaryValue*check);
250250

251+
#ifndefPG_RETURN_JSONB_P
252+
#definePG_RETURN_JSONB_P(x)PG_RETURN_JSONB(x)
253+
#endif
254+
255+
#ifndefPG_GETARG_JSONB_P
256+
#definePG_GETARG_JSONB_P(x)PG_GETARG_JSONB(x)
257+
#endif
258+
251259
#endif

‎jsquery_extract.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ execRecursiveTristate(ExtractedNode *node, GinTernaryValue *check)
868868
res=GIN_TRUE;
869869
for (i=0;i<node->args.count;i++)
870870
{
871-
v=execRecursive(node->args.items[i],check);
871+
v=execRecursive(node->args.items[i],(bool*)check);
872872
if (v==GIN_FALSE)
873873
returnGIN_FALSE;
874874
elseif (v==GIN_MAYBE)
@@ -879,7 +879,7 @@ execRecursiveTristate(ExtractedNode *node, GinTernaryValue *check)
879879
res=GIN_FALSE;
880880
for (i=0;i<node->args.count;i++)
881881
{
882-
v=execRecursive(node->args.items[i],check);
882+
v=execRecursive(node->args.items[i],(bool*)check);
883883
if (v==GIN_TRUE)
884884
returnGIN_TRUE;
885885
elseif (v==GIN_MAYBE)

‎jsquery_op.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ Datum
780780
jsquery_json_exec(PG_FUNCTION_ARGS)
781781
{
782782
JsQuery*jq=PG_GETARG_JSQUERY(0);
783-
Jsonb*jb=PG_GETARG_JSONB(1);
783+
Jsonb*jb=PG_GETARG_JSONB_P(1);
784784
boolres;
785785
JsonbValuejbv;
786786
JsQueryItemjsq;
@@ -803,7 +803,7 @@ PG_FUNCTION_INFO_V1(json_jsquery_exec);
803803
Datum
804804
json_jsquery_exec(PG_FUNCTION_ARGS)
805805
{
806-
Jsonb*jb=PG_GETARG_JSONB(0);
806+
Jsonb*jb=PG_GETARG_JSONB_P(0);
807807
JsQuery*jq=PG_GETARG_JSQUERY(1);
808808
boolres;
809809
JsonbValuejbv;
@@ -827,7 +827,7 @@ PG_FUNCTION_INFO_V1(json_jsquery_filter);
827827
Datum
828828
json_jsquery_filter(PG_FUNCTION_ARGS)
829829
{
830-
Jsonb*jb=PG_GETARG_JSONB(0);
830+
Jsonb*jb=PG_GETARG_JSONB_P(0);
831831
JsQuery*jq=PG_GETARG_JSQUERY(1);
832832
Jsonb*res=NULL;
833833
JsonbValuejbv;
@@ -854,9 +854,9 @@ json_jsquery_filter(PG_FUNCTION_ARGS)
854854
PG_FREE_IF_COPY(jq,1);
855855

856856
if (res)
857-
PG_RETURN_JSONB(res);
858-
else
859-
PG_RETURN_NULL();
857+
PG_RETURN_JSONB_P(res);
858+
859+
PG_RETURN_NULL();
860860
}
861861

862862

0 commit comments

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