Commitd4417ee

Nikita Glukhov

committed

fixup! Add non-uniquified json values for improving compatibility with text jsons

1 parent9d3d76b commitd4417eeCopy full SHA for d4417ee

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2801,7 +2801,8 @@ JsontIteratorNext(JsonIterator *pit, JsonValue val, bool skipNested)`
`2801`	`2801`	`switch (it->state)`
`2802`	`2802`	`{`
`2803`	`2803`	`caseJTI_ARRAY_START:`
`2804`		`-JsonValueInitArray(val,-1,0,it->isScalar, false);`
	`2804`	`+JsonValueInitArray(val,it->isScalar ?1 :-1,0,it->isScalar,`
	`2805`	`+ false);`
`2805`	`2806`	`it->state=it->isScalar ?JTI_ARRAY_ELEM_SCALAR :JTI_ARRAY_ELEM;`
`2806`	`2807`	`returnWJB_BEGIN_ARRAY;`
`2807`	`2808`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -864,8 +864,9 @@ JsonbcIteratorNext(JsonIterator *pit, JsonValue val, bool skipNested)`
`864`	`864`	`* v->val.array.elems is not actually set, because we aren't doing`
`865`	`865`	`* a full conversion`
`866`	`866`	`*/`
`867`		`-JsonValueInitArray(val,it->childrenSize>0 ?-1 :0,0,`
`868`		`-it->isScalar, true);`
	`867`	`+JsonValueInitArray(val,`
	`868`	`+it->childrenSize>0 ?it->isScalar ?1 :-1 :0,`
	`869`	`+0,it->isScalar, true);`
`869`	`870`
`870`	`871`	`it->childrenPtr=it->children;`
`871`	`872`	`it->curDataOffset=0;`

Comments

(0)