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

Commit654809e

Browse files
committed
Fix a couple of trivial issues in jsonb.c
Typo "aggreagate" appeared three times, and the return value of functionJsonbIteratorNext() was being assigned to an int variable in a bunch ofplaces.
1 parent3f190f6 commit654809e

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

‎src/backend/utils/adt/jsonb.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ JsonbToCString(StringInfo out, JsonbContainer *in, int estimated_len)
424424
{
425425
boolfirst= true;
426426
JsonbIterator*it;
427-
inttype=0;
427+
JsonbIteratorTokentype;
428428
JsonbValuev;
429429
intlevel=0;
430430
boolredo_switch= false;
@@ -506,7 +506,7 @@ JsonbToCString(StringInfo out, JsonbContainer *in, int estimated_len)
506506
first= false;
507507
break;
508508
default:
509-
elog(ERROR,"unknownflag ofjsonb iterator");
509+
elog(ERROR,"unknown jsonb iterator token type");
510510
}
511511
}
512512

@@ -824,7 +824,7 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
824824
caseJSONBTYPE_JSONB:
825825
{
826826
Jsonb*jsonb=DatumGetJsonb(val);
827-
inttype;
827+
JsonbIteratorTokentype;
828828
JsonbIterator*it;
829829

830830
it=JsonbIteratorInit(&jsonb->root);
@@ -1519,7 +1519,7 @@ jsonb_agg_transfn(PG_FUNCTION_ARGS)
15191519
JsonbIterator*it;
15201520
Jsonb*jbelem;
15211521
JsonbValuev;
1522-
inttype;
1522+
JsonbIteratorTokentype;
15231523

15241524
if (val_type==InvalidOid)
15251525
ereport(ERROR,
@@ -1591,7 +1591,7 @@ jsonb_agg_transfn(PG_FUNCTION_ARGS)
15911591
caseWJB_VALUE:
15921592
if (v.type==jbvString)
15931593
{
1594-
/* copy string values in theaggreagate context */
1594+
/* copy string values in theaggregate context */
15951595
char*buf=palloc(v.val.string.len+1);;
15961596
snprintf(buf,v.val.string.len+1,"%s",v.val.string.val);
15971597
v.val.string.val=buf;
@@ -1607,6 +1607,8 @@ jsonb_agg_transfn(PG_FUNCTION_ARGS)
16071607
result->res=pushJsonbValue(&result->parseState,
16081608
type,&v);
16091609
break;
1610+
default:
1611+
elog(ERROR,"unknown jsonb iterator token type");
16101612
}
16111613
}
16121614

@@ -1667,7 +1669,7 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
16671669
Jsonb*jbkey,
16681670
*jbval;
16691671
JsonbValuev;
1670-
inttype;
1672+
JsonbIteratorTokentype;
16711673

16721674
if (!AggCheckCallContext(fcinfo,&aggcontext))
16731675
{
@@ -1750,7 +1752,7 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
17501752
caseWJB_ELEM:
17511753
if (v.type==jbvString)
17521754
{
1753-
/* copy string values in theaggreagate context */
1755+
/* copy string values in theaggregate context */
17541756
char*buf=palloc(v.val.string.len+1);;
17551757
snprintf(buf,v.val.string.len+1,"%s",v.val.string.val);
17561758
v.val.string.val=buf;
@@ -1808,7 +1810,7 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
18081810
caseWJB_VALUE:
18091811
if (v.type==jbvString)
18101812
{
1811-
/* copy string values in theaggreagate context */
1813+
/* copy string values in theaggregate context */
18121814
char*buf=palloc(v.val.string.len+1);;
18131815
snprintf(buf,v.val.string.len+1,"%s",v.val.string.val);
18141816
v.val.string.val=buf;
@@ -1825,6 +1827,8 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
18251827
single_scalar ?WJB_VALUE :type,
18261828
&v);
18271829
break;
1830+
default:
1831+
elog(ERROR,"unknown jsonb iterator token type");
18281832
}
18291833
}
18301834

0 commit comments

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