Commitaa41d7d

Nikita Malakhov

authored and

Nikita Glukhov

committed

Minor changes to build jsonb_toaster and make it work

1 parent4263788 commitaa41d7dCopy full SHA for aa41d7d

File tree

+19

-9

lines changed

+19

-9

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,12 @@ jsonb_recv(PG_FUNCTION_ARGS)`
`108`	`108`	`Datum`
`109`	`109`	`jsonb_out(PG_FUNCTION_ARGS)`
`110`	`110`	`{`
	`111`	`+Jsonb*jb;`
	`112`	`+char*out;`
	`113`	`+`
`111`	`114`	`jsonbInitIterators();`
`112`	`115`
`113`		`-Jsonb*jb=PG_GETARG_JSONB_P(0);`
`114`		`-char*out;`
	`116`	`+jb=PG_GETARG_JSONB_P(0);`
`115`	`117`
`116`	`118`	`out=JsonToCString(JsonbRoot(jb),NULL);`
`117`	`119`
`@@ -129,13 +131,16 @@ jsonb_out(PG_FUNCTION_ARGS)`
`129`	`131`	`Datum`
`130`	`132`	`jsonb_send(PG_FUNCTION_ARGS)`
`131`	`133`	`{`
`132`		`-jsonbInitIterators();`
`133`		`-`
`134`		`-Jsonb*jb=PG_GETARG_JSONB_P(0);`
	`134`	`+Jsonb*jb;`
`135`	`135`	`StringInfoDatabuf;`
`136`		`-StringInfojtext=makeStringInfo();`
	`136`	`+StringInfojtext;`
`137`	`137`	`intversion=1;`
`138`	`138`
	`139`	`+jsonbInitIterators();`
	`140`	`+`
	`141`	`+jb=PG_GETARG_JSONB_P(0);`
	`142`	`+jtext=makeStringInfo();`
	`143`	`+`
`139`	`144`	`(void)JsonToCString(JsonbRoot(jb),jtext);`
`140`	`145`
`141`	`146`	`jsonbFreeIterators();`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2368,9 +2368,11 @@ convertJsonbBinary(StringInfo buffer, JEntry pheader, const JsonbValue val,`
`2368`	`2368`	`appendToBuffer(buffer, (void*)jbc,jc->len);`
`2369`	`2369`	`*pheader=JENTRY_ISCONTAINER \| (buffer->len-base_offset);`
`2370`	`2370`	`}`
	`2371`	`+#if0/* XXX jsonv */`
`2371`	`2372`	`elseif (jc->ops==&jsonvContainerOps&& !JsonContainerIsScalar(jc))`
`2372`	`2373`	`convertJsonbValue(buffer,pheader,`
`2373`	`2374`	`(constJsonValue*)JsonContainerDataPtr(jc),level);`
	`2375`	`+#endif`
`2374`	`2376`	`else`
`2375`	`2377`	`convertJsonbValue(buffer,pheader,JsonValueUnpackBinary(val),level);`
`2376`	`2378`	`}`
`@@ -2649,7 +2651,7 @@ jsonbzInitContainer(JsonContainerData jc, CompressedJsonb cjb,`
`2649`	`2651`	`JsonbContainerHdrheader=pheader ?*pheader :jbc->header;`
`2650`	`2652`
`2651`	`2653`	`(CompressedJsonb)&jc->_data=*cjb;`
`2652`		`-((CompressedJsonb*)&jc->_data)->header=header;`
	`2654`	`+/((CompressedJsonb ) &jc->_data)->header = header; */`
`2653`	`2655`
`2654`	`2656`	`jc->ops=&jsonbzContainerOps;`
`2655`	`2657`	`jc->len=len;`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -734,11 +734,13 @@ numeric_in(PG_FUNCTION_ARGS)`
`734`	`734`	`Datum`
`735`	`735`	`numeric_out(PG_FUNCTION_ARGS)`
`736`	`736`	`{`
`737`		`-Assert(!VARATT_IS_COMPRESSED(PG_GETARG_DATUM(0)));`
`738`		`-Numericnum=PG_GETARG_NUMERIC(0);`
	`737`	`+Numericnum;`
`739`	`738`	`NumericVarx;`
`740`	`739`	`char*str;`
`741`	`740`
	`741`	`+Assert(!VARATT_IS_COMPRESSED(PG_GETARG_DATUM(0)));`
	`742`	`+num=PG_GETARG_NUMERIC(0);`
	`743`	`+`
`742`	`744`	`/*`
`743`	`745`	`* Handle NaN and infinities`
`744`	`746`	`*/`

Comments

(0)