Merge pull request #6945 from taosdata/dkj_master

Dkj master pull request to fix metrict_del.sim

src/inc/tcq.h

@@ -27,7 +27,7 @@ typedef struct {
   int32_t  vgId;
   char     user[TSDB_USER_LEN];
   char     pass[TSDB_KEY_LEN];
-  char     db[TSDB_DB_NAME_LEN];
+  char     db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; // size must same with SVnodeObj.db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]
   FCqWrite cqWrite;
 } SCqCfg;
 

tests/script/general/stream/metrics_del.sim

@@ -34,11 +34,11 @@ while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
   
-  $x = -1440
+  $x = 0
   $y = 0
   while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
+    $ts = 1626710400000 + $x  
+    sql insert into $tb values ($ts , $y , $y ) 
     $x = $x + 1
 	$y = $y + 1
   endw