Merge remote-tracking branch 'origin/master'

Aleksander Alekseev · Aleksander Alekseev · commit a6705851c842 · 2022-04-21T16:02:39.000+03:00
diff --git a/zson.c b/zson.c
@@ -485,7 +485,7 @@ zson_fastdecompress(const Dict* pdict,
 	return true;
 }
 
-// jsonb -> zson, no compression version
+// jsonb -> zson
 Datum
 jsonb_to_zson(PG_FUNCTION_ARGS)
 {
@@ -541,7 +541,7 @@ jsonb_to_zson(PG_FUNCTION_ARGS)
 	PG_RETURN_BYTEA_P(encoded_buff);
 }
 
-// zson -> jsonb, no compression version
+// zson -> jsonb
 Datum
 zson_to_jsonb(PG_FUNCTION_ARGS)
 {

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ zson_fastdecompress(const Dict* pdict,`
`485`	`485`	`return true;`
`486`	`486`	`}`
`487`	`487`
`488`		`-// jsonb -> zson, no compression version`
	`488`	`+// jsonb -> zson`
`489`	`489`	`Datum`
`490`	`490`	`jsonb_to_zson(PG_FUNCTION_ARGS)`
`491`	`491`	`{`
`@@ -541,7 +541,7 @@ jsonb_to_zson(PG_FUNCTION_ARGS)`
`541`	`541`	`PG_RETURN_BYTEA_P(encoded_buff);`
`542`	`542`	`}`
`543`	`543`
`544`		`-// zson -> jsonb, no compression version`
	`544`	`+// zson -> jsonb`
`545`	`545`	`Datum`
`546`	`546`	`zson_to_jsonb(PG_FUNCTION_ARGS)`
`547`	`547`	`{`