NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8084453

Nikita Glukhov

committed

Simplify json container pushing

1 parenta4a7bfb commit8084453Copy full SHA for 8084453

File tree

1 file changed

-38

lines changed

src/backend/utils/adt
- jsonfuncs.c

1 file changed

-38

lines changed

`‎src/backend/utils/adt/jsonfuncs.c`

Lines changed: 6 additions & 38 deletions

Original file line number	Diff line number	Diff line change
`@@ -4926,24 +4926,9 @@ setPathObject(JsonbIterator *it, Datum path_elems, bool *path_nulls,`
`4926`	`4926`	`}`
`4927`	`4927`
`4928`	`4928`	`(void)pushJsonbValue(st,r,&k);`
`4929`		`-r=JsonbIteratorNext(it,&v, false);`
`4930`		`-(void)pushJsonbValue(st,r,r<WJB_BEGIN_ARRAY ?&v :NULL);`
`4931`		`-if (r==WJB_BEGIN_ARRAY\|\|r==WJB_BEGIN_OBJECT)`
`4932`		`-{`
`4933`		`-intwalking_level=1;`
`4934`		`-`
`4935`		`-while (walking_level!=0)`
`4936`		`-{`
`4937`		`-r=JsonbIteratorNext(it,&v, false);`
`4938`		`-`
`4939`		`-if (r==WJB_BEGIN_ARRAY\|\|r==WJB_BEGIN_OBJECT)`
`4940`		`-++walking_level;`
`4941`		`-if (r==WJB_END_ARRAY\|\|r==WJB_END_OBJECT)`
`4942`		`---walking_level;`
`4943`		`-`
`4944`		`-(void)pushJsonbValue(st,r,r<WJB_BEGIN_ARRAY ?&v :NULL);`
`4945`		`-}`
`4946`		`-}`
	`4929`	`+r=JsonbIteratorNext(it,&v, true);`
	`4930`	`+Assert(r==WJB_VALUE);`
	`4931`	`+(void)pushJsonbValue(st,r,&v);`
`4947`	`4932`	`}`
`4948`	`4933`	`}`
`4949`	`4934`	`}`
`@@ -5039,26 +5024,9 @@ setPathArray(JsonbIterator *it, Datum path_elems, bool *path_nulls,`
`5039`	`5024`	`}`
`5040`	`5025`	`else`
`5041`	`5026`	`{`
`5042`		`-r=JsonbIteratorNext(it,&v, false);`
`5043`		`-`
`5044`		`-(void)pushJsonbValue(st,r,r<WJB_BEGIN_ARRAY ?&v :NULL);`
`5045`		`-`
`5046`		`-if (r==WJB_BEGIN_ARRAY\|\|r==WJB_BEGIN_OBJECT)`
`5047`		`-{`
`5048`		`-intwalking_level=1;`
`5049`		`-`
`5050`		`-while (walking_level!=0)`
`5051`		`-{`
`5052`		`-r=JsonbIteratorNext(it,&v, false);`
`5053`		`-`
`5054`		`-if (r==WJB_BEGIN_ARRAY\|\|r==WJB_BEGIN_OBJECT)`
`5055`		`-++walking_level;`
`5056`		`-if (r==WJB_END_ARRAY\|\|r==WJB_END_OBJECT)`
`5057`		`---walking_level;`
`5058`		`-`
`5059`		`-(void)pushJsonbValue(st,r,r<WJB_BEGIN_ARRAY ?&v :NULL);`
`5060`		`-}`
`5061`		`-}`
	`5027`	`+r=JsonbIteratorNext(it,&v, true);`
	`5028`	`+Assert(r==WJB_ELEM);`
	`5029`	`+(void)pushJsonbValue(st,r,&v);`
`5062`	`5030`
`5063`	`5031`	`if ((op_type&JB_PATH_CREATE_OR_INSERT)&& !done&&`
`5064`	`5032`	`level==path_len-1&&i==nelems-1)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8084453

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/jsonfuncs.c`

0 commit comments