Commitc1b6a48

Nikita Glukhov

committed

Extract JsonValueFromCString()

1 parent5c4d00b commitc1b6a48Copy full SHA for c1b6a48

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
`@@ -221,15 +221,8 @@ jsonb_typeof(PG_FUNCTION_ARGS)`
`221`	`221`	`PG_RETURN_TEXT_P(cstring_to_text(result));`
`222`	`222`	`}`
`223`	`223`
`224`		`-/*`
`225`		`- * jsonb_from_cstring`
`226`		`- *`
`227`		`- * Turns json string into a jsonb Datum.`
`228`		`- *`
`229`		`- * Uses the json parser (with hooks) to construct a jsonb.`
`230`		`- */`
`231`		`-staticinlineDatum`
`232`		`-jsonb_from_cstring(char*json,intlen)`
	`224`	`+staticJsonbValue*`
	`225`	`+JsonValueFromCString(char*json,intlen)`
`233`	`226`	`{`
`234`	`227`	`JsonLexContext*lex;`
`235`	`228`	`JsonbInStatestate;`
`@@ -251,9 +244,21 @@ jsonb_from_cstring(char *json, int len)`
`251`	`244`	`pg_parse_json(lex,&sem);`
`252`	`245`
`253`	`246`	`/* after parsing, the item member has the composed jsonb structure */`
`254`		`-PG_RETURN_JSONB(JsonbValueToJsonb(state.res));`
	`247`	`+returnstate.res;`
`255`	`248`	`}`
`256`	`249`
	`250`	`+/*`
	`251`	`+ * jsonb_from_cstring`
	`252`	`+ *`
	`253`	`+ * Turns json string into a jsonb Datum.`
	`254`	`+ *`
	`255`	`+ * Uses the json parser (with hooks) to construct a jsonb.`
	`256`	`+ */`
	`257`	`+staticinlineDatum`
	`258`	`+jsonb_from_cstring(char*json,intlen)`
	`259`	`+{`
	`260`	`+PG_RETURN_JSONB(JsonbValueToJsonb(JsonValueFromCString(json,len)));`
	`261`	`+}`
`257`	`262`
`258`	`263`	`staticvoid`
`259`	`264`	`jsonb_in_object_start(void*pstate)`

Comments

(0)