Minor changes to build jsonb_toaster and make it work

Nikita Malakhov · Nikita Glukhov · commit aa41d7d2a53f · 2022-07-27T18:20:35.000+03:00
diff --git a/contrib/Makefile b/contrib/Makefile
@@ -24,6 +24,7 @@ SUBDIRS = \
 		earthdistance	\
 		file_fdw	\
 		fuzzystrmatch	\
+		jsonb_toaster	\
 		hstore		\
 		intagg		\
 		intarray	\
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -108,10 +108,12 @@ jsonb_recv(PG_FUNCTION_ARGS)
 Datum
 jsonb_out(PG_FUNCTION_ARGS)
 {
+	Jsonb	   *jb;
+	char	   *out;
+
 	jsonbInitIterators();
 
-	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
-	char	   *out;
+	jb = PG_GETARG_JSONB_P(0);
 
 	out = JsonToCString(JsonbRoot(jb), NULL);
 
@@ -129,13 +131,16 @@ jsonb_out(PG_FUNCTION_ARGS)
 Datum
 jsonb_send(PG_FUNCTION_ARGS)
 {
-	jsonbInitIterators();
-
-	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
+	Jsonb	   *jb;
 	StringInfoData buf;
-	StringInfo	jtext = makeStringInfo();
+	StringInfo	jtext;
 	int			version = 1;
 
+	jsonbInitIterators();
+
+	jb = PG_GETARG_JSONB_P(0);
+	jtext = makeStringInfo();
+	
 	(void) JsonToCString(JsonbRoot(jb), jtext);
 
 	jsonbFreeIterators();
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -2368,9 +2368,11 @@ convertJsonbBinary(StringInfo buffer, JEntry *pheader, const JsonbValue *val,
 		appendToBuffer(buffer, (void *) jbc, jc->len);
 		*pheader = JENTRY_ISCONTAINER | (buffer->len - base_offset);
 	}
+#if 0 /* XXX jsonv */
 	else if (jc->ops == &jsonvContainerOps && !JsonContainerIsScalar(jc))
 		convertJsonbValue(buffer, pheader,
 						  (const JsonValue *) JsonContainerDataPtr(jc), level);
+#endif
 	else
 		convertJsonbValue(buffer, pheader, JsonValueUnpackBinary(val), level);
 }
@@ -2649,7 +2651,7 @@ jsonbzInitContainer(JsonContainerData *jc, CompressedJsonb *cjb,
 	JsonbContainerHdr header = pheader ? *pheader : jbc->header;
 
 	*(CompressedJsonb *) &jc->_data = *cjb;
-	((CompressedJsonb *) &jc->_data)->header = header;
+/*	((CompressedJsonb *) &jc->_data)->header = header; */
 
 	jc->ops = &jsonbzContainerOps;
 	jc->len = len;
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
@@ -734,11 +734,13 @@ numeric_in(PG_FUNCTION_ARGS)
 Datum
 numeric_out(PG_FUNCTION_ARGS)
 {
-	Assert(!VARATT_IS_COMPRESSED(PG_GETARG_DATUM(0)));
-	Numeric		num = PG_GETARG_NUMERIC(0);
+	Numeric		num;
 	NumericVar	x;
 	char	   *str;
 
+	Assert(!VARATT_IS_COMPRESSED(PG_GETARG_DATUM(0)));
+	num = PG_GETARG_NUMERIC(0);
+	
 	/*
 	 * Handle NaN and infinities
 	 */
