Commitbe36d1d

Nikita Glukhov

committed

Extract JsonValueFromCString()

1 parente324ad7 commitbe36d1dCopy full SHA for be36d1d

File tree

+15

-10

lines changed

+15

-10

lines changed

Lines changed: 15 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -230,15 +230,8 @@ jsonb_typeof(PG_FUNCTION_ARGS)`
`230`	`230`	`PG_RETURN_TEXT_P(cstring_to_text(result));`
`231`	`231`	`}`
`232`	`232`
`233`		`-/*`
`234`		`- * jsonb_from_cstring`
`235`		`- *`
`236`		`- * Turns json string into a jsonb Datum.`
`237`		`- *`
`238`		`- * Uses the json parser (with hooks) to construct a jsonb.`
`239`		`- */`
`240`		`-staticinlineDatum`
`241`		`-jsonb_from_cstring(char*json,intlen,boolunique_keys)`
	`233`	`+staticJsonbValue*`
	`234`	`+JsonValueFromCString(char*json,intlen,boolunique_keys)`
`242`	`235`	`{`
`243`	`236`	`JsonLexContext*lex;`
`244`	`237`	`JsonbInStatestate;`
`@@ -262,9 +255,21 @@ jsonb_from_cstring(char *json, int len, bool unique_keys)`
`262`	`255`	`pg_parse_json_or_ereport(lex,&sem);`
`263`	`256`
`264`	`257`	`/* after parsing, the item member has the composed jsonb structure */`
`265`		`-PG_RETURN_JSONB_P(JsonbValueToJsonb(state.res));`
	`258`	`+returnstate.res;`
`266`	`259`	`}`
`267`	`260`
	`261`	`+/*`
	`262`	`+ * jsonb_from_cstring`
	`263`	`+ *`
	`264`	`+ * Turns json string into a jsonb Datum.`
	`265`	`+ *`
	`266`	`+ * Uses the json parser (with hooks) to construct a jsonb.`
	`267`	`+ */`
	`268`	`+staticinlineDatum`
	`269`	`+jsonb_from_cstring(char*json,intlen,boolunique_keys)`
	`270`	`+{`
	`271`	`+PG_RETURN_JSONB_P(JsonbValueToJsonb(JsonValueFromCString(json,len,unique_keys)));`
	`272`	`+}`
`268`	`273`
`269`	`274`	`staticvoid`
`270`	`275`	`jsonb_in_object_start(void*pstate)`

Comments

(0)