NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit67079ae

Nikita Glukhov

committed

Avoid double compilation of jsonfuncs.c

1 parent4732912 commit67079aeCopy full SHA for 67079ae

File tree

5 files changed

+504

-299

lines changed

src
- backend/utils/adt
- include/utils
  - json_generic.h
  - jsonfuncs.h

5 files changed

+504

-299

lines changed

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

Lines changed: 0 additions & 31 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,36 +35,6 @@`
`35`	`35`	`#definejsonb_object_two_argjson_object_two_arg`
`36`	`36`	`#definejsonb_typeofjson_typeof`
`37`	`37`
`38`		`-#definejsonb_array_elementjson_array_element`
`39`		`-#definejsonb_array_element_textjson_array_element_text`
`40`		`-#definejsonb_array_elementsjson_array_elements`
`41`		`-#definejsonb_array_elements_textjson_array_elements_text`
`42`		`-#definejsonb_array_lengthjson_array_length`
`43`		`-#definejsonb_canonicaljson_canonical`
`44`		`-#definejsonb_concatjson_concat`
`45`		`-#definejsonb_deletejson_delete`
`46`		`-#definejsonb_delete_idxjson_delete_idx`
`47`		`-#definejsonb_delete_pathjson_delete_path`
`48`		`-#definejsonb_delete_arrayjson_delete_array`
`49`		`-#definejsonb_eachjson_each`
`50`		`-#definejsonb_each_textjson_each_text`
`51`		`-#definejsonb_insertjson_insert`
`52`		`-#definejsonb_extract_pathjson_extract_path`
`53`		`-#definejsonb_extract_path_textjson_extract_path_text`
`54`		`-#definejsonb_object_fieldjson_object_field`
`55`		`-#definejsonb_object_field_textjson_object_field_text`
`56`		`-#definejsonb_object_keysjson_object_keys`
`57`		`-#definejsonb_extract_keysjson_extract_keys`
`58`		`-#definejsonb_populate_recordjson_populate_record`
`59`		`-#definejsonb_populate_recordsetjson_populate_recordset`
`60`		`-#definejsonb_prettyjson_pretty`
`61`		`-#definejsonb_setjson_set`
`62`		`-#definejsonb_set_laxjson_set_lax`
`63`		`-#definejsonb_to_recordjson_to_record`
`64`		`-#definejsonb_to_recordsetjson_to_recordset`
`65`		`-#definejsonb_get_elementjson_get_element`
`66`		`-#definejsonb_set_elementjson_set_element`
`67`		`-`
`68`	`38`	`#defineJsonxContainerOps(&jsontContainerOps)`
`69`	`39`	`#defineJsonxGetUniquified(json)(json)`
`70`	`40`	`#defineJsonxPGetDatum(json)JsontPGetDatum(json)`
`@@ -291,7 +261,6 @@ escape_json(StringInfo buf, const char *str)`
`291`	`261`	`}`
`292`	`262`
`293`	`263`	`#include"jsonb.c"`
`294`		`-#include"jsonfuncs.c"`
`295`	`264`
`296`	`265`	`/*`
`297`	`266`	`* SQL function array_to_json(row)`

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

Lines changed: 33 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -244,16 +244,29 @@ jsonb_subscript_fetch(ExprState *state,`
`244`	`244`	`SubscriptingRefState*sbsrefstate=op->d.sbsref.state;`
`245`	`245`	`JsonbSubWorkspaceworkspace= (JsonbSubWorkspace)sbsrefstate->workspace;`
`246`	`246`	`Jsonb*jsonbSource;`
	`247`	`+JsonbValue*res;`
	`248`	`+JsonbValueresbuf;`
`247`	`249`
`248`	`250`	`/* Should not get here if source jsonb (or any subscript) is null */`
`249`	`251`	`Assert(!(*op->resnull));`
`250`	`252`
`251`	`253`	`jsonbSource=DatumGetJsonbP(*op->resvalue);`
`252`		`-*op->resvalue=jsonb_get_element(jsonbSource,`
`253`		`-workspace->index,`
`254`		`-sbsrefstate->numupper,`
`255`		`-op->resnull,`
`256`		`- false);`
	`254`	`+`
	`255`	`+res=jsonb_get_element(jsonbSource,`
	`256`	`+workspace->index,`
	`257`	`+sbsrefstate->numupper,`
	`258`	`+&resbuf);`
	`259`	`+`
	`260`	`+if (res!=NULL)`
	`261`	`+{`
	`262`	`+*op->resnull= false;`
	`263`	`+*op->resvalue=JsonbPGetDatum(JsonbValueToJsonb(res));`
	`264`	`+}`
	`265`	`+else`
	`266`	`+{`
	`267`	`+*op->resnull= true;`
	`268`	`+*op->resvalue=PointerGetDatum(NULL);`
	`269`	`+}`
`257`	`270`	`}`
`258`	`271`
`259`	`272`	`/*`
`@@ -340,12 +353,22 @@ jsonb_subscript_fetch_old(ExprState *state,`
`340`	`353`	`else`
`341`	`354`	`{`
`342`	`355`	`JsonbjsonbSource=DatumGetJsonbP(op->resvalue);`
	`356`	`+JsonbValueresbuf;`
	`357`	`+JsonbValue*res=jsonb_get_element(jsonbSource,`
	`358`	`+sbsrefstate->upperindex,`
	`359`	`+sbsrefstate->numupper,`
	`360`	`+&resbuf);`
`343`	`361`
`344`		`-sbsrefstate->prevvalue=jsonb_get_element(jsonbSource,`
`345`		`-sbsrefstate->upperindex,`
`346`		`-sbsrefstate->numupper,`
`347`		`-&sbsrefstate->prevnull,`
`348`		`- false);`
	`362`	`+if (res!=NULL)`
	`363`	`+{`
	`364`	`+sbsrefstate->prevnull= false;`
	`365`	`+sbsrefstate->prevvalue=JsonbPGetDatum(JsonbValueToJsonb(res));`
	`366`	`+}`
	`367`	`+else`
	`368`	`+{`
	`369`	`+sbsrefstate->prevnull= true;`
	`370`	`+sbsrefstate->prevvalue=PointerGetDatum(NULL);`
	`371`	`+}`
`349`	`372`	`}`
`350`	`373`	`}`
`351`	`374`

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!

Commit67079ae

File tree

5 files changed

5 files changed

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

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

0 commit comments