Add JsonStatsFloat4 JsonStatType

Author: Nikita Glukhov

src/backend/utils/adt/jsonb_selfuncs.c

@@ -554,6 +554,11 @@ jsonStatsConvertArray(Datum jsonbValueArray, JsonStatType type, Oid typid,
 					break;
 
 				case JsonStatNumeric:
+					Assert(jbv.type == jbvNumeric);
+					value = NumericGetDatum(jbv.val.numeric);
+					break;
+
+				case JsonStatFloat4:
 					Assert(jbv.type == jbvNumeric);
 					value = DirectFunctionCall1(numeric_float4,
 												NumericGetDatum(jbv.val.numeric));
@@ -638,6 +643,7 @@ jsonPathStatsExtractData(JsonPathStats pstats, JsonStatType stattype,
 			eqop = NumericEqOperator;
 			ltop = NumericLtOperator;
 			break;
+		case JsonStatFloat4:	/* special internal stats type */
 		default:
 			elog(ERROR, "invalid json statistic type %d", stattype);
 			break;
@@ -666,7 +672,7 @@ jsonPathStatsExtractData(JsonPathStats pstats, JsonStatType stattype,
 		slot->kind = STATISTIC_KIND_MCV;
 		slot->opid = eqop;
 		slot->numbers = jsonStatsConvertArray(jsonGetField(mcv, "numbers"),
-											  JsonStatNumeric, FLOAT4OID,
+											  JsonStatFloat4, FLOAT4OID,
 											  1.0 - nullfrac);
 		slot->values  = jsonStatsConvertArray(jsonGetField(mcv, "values"),
 											  stattype, type, 0);
@@ -678,7 +684,7 @@ jsonPathStatsExtractData(JsonPathStats pstats, JsonStatType stattype,
 		slot->kind = STATISTIC_KIND_HISTOGRAM;
 		slot->opid = ltop;
 		slot->numbers = jsonStatsConvertArray(jsonGetField(hst, "numbers"),
-											  JsonStatNumeric, FLOAT4OID, 1.0);
+											  JsonStatFloat4, FLOAT4OID, 1.0);
 		slot->values  = jsonStatsConvertArray(jsonGetField(hst, "values"),
 											  stattype, type, 0);
 		slot++;

src/include/utils/json_selfuncs.h

@@ -61,6 +61,7 @@ typedef enum JsonStatType
 	JsonStatJsonb,
 	JsonStatJsonbWithoutSubpaths,
 	JsonStatText,
+	JsonStatFloat4,
 	JsonStatString,
 	JsonStatNumeric,
 	JsonStatFreq,