Add GUC jsonb_sort_field_values

Nikita Glukhov · Nikita Glukhov · commit d54b299ed5da · 2020-12-08T01:06:56.000+03:00
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -31,8 +31,6 @@
 #include "utils/memutils.h"
 #include "utils/varlena.h"
 
-#define JSONB_SORTED_VALUES 1
-
 /*
  * Maximum number of elements in an array (or key/value pairs in an object).
  * This is limited by two things: the size of the JEntry array must fit
@@ -140,6 +138,7 @@ static JsonbValue *fillCompressedJsonbValue(CompressedJsonb *cjb,
 											uint32 offset, JsonValue *result);
 static JsonbContainer *jsonbzDecompress(JsonContainer *jc);
 
+bool jsonb_sort_field_values = true;	/* GUC */
 
 JsonValue *
 JsonValueUnpackBinary(const JsonValue *jbv)
@@ -1959,7 +1958,7 @@ convertJsonbObject(StringInfo buffer, JEntry *pheader, const JsonbValue *val, in
 	uint32		header;
 	int			nPairs = val->val.object.nPairs;
 	int			reserved_size;
-	bool		sorted_values = JSONB_SORTED_VALUES && nPairs > 1;
+	bool		sorted_values = jsonb_sort_field_values && nPairs > 1;
 	struct
 	{
 		int			size;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -90,6 +90,7 @@
 #include "utils/bytea.h"
 #include "utils/float.h"
 #include "utils/guc_tables.h"
+#include "utils/jsonb.h"
 #include "utils/memutils.h"
 #include "utils/pg_locale.h"
 #include "utils/pg_lsn.h"
@@ -2036,6 +2037,15 @@ static struct config_bool ConfigureNamesBool[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"jsonb_sort_field_values", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Use special binary jsonb format for objects when their field values sorted by length."),
+		},
+		&jsonb_sort_field_values,
+		true,
+		NULL, NULL, NULL
+	},
+
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, false, NULL, NULL, NULL
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
@@ -413,5 +413,6 @@ extern void JsonbHashScalarValueExtended(const JsonbValue *scalarVal,
 extern int reserveFromBuffer(StringInfo buffer, int len);
 extern void appendToBuffer(StringInfo buffer, const void *data, int len);
 
+extern bool jsonb_sort_field_values;	/* GUC */
 
 #endif							/* __JSONB_H__ */
