From e728b26cb3555648b29b79303f7ec38b8aff4d03 Mon Sep 17 00:00:00 2001 From: "cris.pei" Date: Wed, 3 Jul 2024 14:24:22 +0800 Subject: [PATCH] For the float value in json file, the random number granularity is further refined --- src/benchJsonOpt.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/benchJsonOpt.c b/src/benchJsonOpt.c index 3bb4ab4d..b87668a8 100644 --- a/src/benchJsonOpt.c +++ b/src/benchJsonOpt.c @@ -259,6 +259,7 @@ static int getColumnAndTagTypeFromInsertJsonFile( minInDbl = min; } + double valueRange = maxInDbl - minInDbl; tools_cJSON *dataScalingFactor = tools_cJSON_GetObjectItem(column, "scalingFactor"); if (tools_cJSON_IsNumber(dataScalingFactor)) { scalingFactor = dataScalingFactor->valueint; @@ -269,14 +270,13 @@ static int getColumnAndTagTypeFromInsertJsonFile( scalingFactor = 1; } } else { - if (0 < (max - min) && (max - min) <= 1) { + if (0 < valueRange && valueRange <= 1) { scalingFactor = 1000; max = maxInDbl * scalingFactor; min = minInDbl * scalingFactor; } else { scalingFactor = 1; } - } // gen @@ -487,17 +487,18 @@ static int getColumnAndTagTypeFromInsertJsonFile( minInDbl = min; } + double valueRange = maxInDbl - minInDbl; tools_cJSON *dataScalingFactor = tools_cJSON_GetObjectItem(tagObj, "scalingFactor"); if (tools_cJSON_IsNumber(dataScalingFactor)) { scalingFactor = dataScalingFactor->valueint; if (scalingFactor > 1) { - max *= scalingFactor; - min *= scalingFactor; + max = maxInDbl * scalingFactor; + min = minInDbl * scalingFactor; } else { scalingFactor = 1; } } else { - if (0 < (max - min) && (max - min) <= 1) { + if (0 < valueRange && valueRange <= 1) { scalingFactor = 1000; max = maxInDbl * scalingFactor; min = minInDbl * scalingFactor;