Merge pull request #711 from taosdata/feat/TD-26563

fix: timestampstart use now with interlace 1
taosdata · Oct 13, 2023 · 93c48d1 · 93c48d1
2 parents ccdb38e + 6e089c6
commit 93c48d1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/benchInsert.c b/src/benchInsert.c
@@ -1532,7 +1532,7 @@ static void *syncWriteInterlace(void *sarg) {
                         int64_t disorderTs = getDisorderTs(stbInfo,
                                 &disorderRange);
                         char time_string[BIGINT_BUFF_LEN];
-                        if(stbInfo->useNow) {
+                        if(stbInfo->useNow && stbInfo->interlaceRows == 1) {
                             snprintf(time_string, BIGINT_BUFF_LEN, "now");
                         } else {
                             snprintf(time_string, BIGINT_BUFF_LEN, "%"PRId64"",

diff --git a/src/benchJsonOpt.c b/src/benchJsonOpt.c
@@ -889,11 +889,6 @@ static int getStableInfo(tools_cJSON *dbinfos, int index) {
             superTable->interlaceRows = (uint32_t)stbInterlaceRows->valueint;
         }
 
-        // force set 
-        if(superTable->useNow) {
-            superTable->interlaceRows = 1;
-        }
-
         // disorder
         tools_cJSON *disorderRatio =
             tools_cJSON_GetObjectItem(stbInfo, "disorder_ratio");