From 3e0446bb9ff069c15f53892718ff4e23a0941591 Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Mon, 24 Jul 2023 10:55:32 +0800 Subject: [PATCH] test: calculate angle according with timestamp and step --- src/benchData.c | 7 +++---- src/benchJsonOpt.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/benchData.c b/src/benchData.c index 6841b968..54b54dd8 100644 --- a/src/benchData.c +++ b/src/benchData.c @@ -595,7 +595,7 @@ static int generateRandDataSQL(SSuperTable *stbInfo, char *sampleDataBuf, int lenOfOneRow, BArray * fields, int64_t loop, bool tag) { - int angle = 0; // 0 ~ 360 + int angle = stbInfo->startTimestamp % 360; // 0 ~ 360 for (int64_t k = 0; k < loop; ++k) { int64_t pos = k * lenOfOneRow; int fieldsSize = fields->size; @@ -726,10 +726,9 @@ static int generateRandDataSQL(SSuperTable *stbInfo, char *sampleDataBuf, } skip_sql: *(sampleDataBuf + pos - 1) = 0; - angle += 1; + angle += stbInfo->timestamp_step; if (angle > 360) { - // 360 is a circle - angle = 0; + angle -= 360; } } diff --git a/src/benchJsonOpt.c b/src/benchJsonOpt.c index 1205f6a8..d3303645 100644 --- a/src/benchJsonOpt.c +++ b/src/benchJsonOpt.c @@ -26,13 +26,21 @@ uint8_t parseFuns(char* funValue, float* multiple, int32_t* addend, int32_t* ran return FUNTYPE_NONE; } - if(strlen(funValue) > 100) { + size_t len = strlen(funValue); + if(len > 100) { return FUNTYPE_NONE; } //parse format 10*sin(x) + 100 * random(5) char value[128]; - strcpy(value, funValue); + size_t n = 0; + for (size_t i = 0; i < len; i++) { + if (funValue[i] != ' ') { + value[n++] = funValue[i]; + } + } + // set end + value[n] = 0; // multiple char* key1 = strstr(value, "*");