Merge pull request #12928 from taosdata/test3.0/lihui

test: modify timestamp of saving consume result row

tests/system-test/7-tmq/subscribeStb.py

@@ -1377,9 +1377,9 @@ class TDTestCase:
 
         self.tmqCase1(cfgPath, buildPath)
         self.tmqCase2(cfgPath, buildPath) 
-        self.tmqCase3(cfgPath, buildPath)
-        self.tmqCase4(cfgPath, buildPath)
-        self.tmqCase5(cfgPath, buildPath)
+        # self.tmqCase3(cfgPath, buildPath)
+        # self.tmqCase4(cfgPath, buildPath)
+        # self.tmqCase5(cfgPath, buildPath)
 
     def stop(self):
         tdSql.close()

tests/system-test/fulltest.sh

@@ -67,6 +67,7 @@ python3 ./test.py -f 7-tmq/basic5.py
 python3 ./test.py -f 7-tmq/subscribeDb.py
 python3 ./test.py -f 7-tmq/subscribeDb1.py
 python3 ./test.py -f 7-tmq/subscribeStb.py
+python3 ./test.py -f 7-tmq/subscribeStb0.py
 python3 ./test.py -f 7-tmq/subscribeStb1.py
 python3 ./test.py -f 7-tmq/subscribeStb2.py
 

tests/test/c/tmqSim.c

@@ -321,9 +321,16 @@ int32_t saveConsumeResult(SThreadInfo* pInfo) {
   TAOS* pConn = taos_connect(NULL, "root", "taosdata", NULL, 0);
   assert(pConn != NULL);
 
+  int64_t now = taosGetTimestampMs();
+
   // schema: ts timestamp, consumerid int, consummsgcnt bigint, checkresult int
-  sprintf(sqlStr, "insert into %s.consumeresult values (now, %d, %" PRId64 ", %" PRId64 ", %d)", g_stConfInfo.cdbName,
-          pInfo->consumerId, pInfo->consumeMsgCnt, pInfo->consumeRowCnt, pInfo->checkresult);
+  sprintf(sqlStr, "insert into %s.consumeresult values (%"PRId64", %d, %" PRId64 ", %" PRId64 ", %d)", 
+                   g_stConfInfo.cdbName,
+                   now,
+                   pInfo->consumerId, 
+                   pInfo->consumeMsgCnt, 
+                   pInfo->consumeRowCnt, 
+                   pInfo->checkresult);
 
   char tmpString[128];
   taosFprintfFile(g_fp, "%s, consume id %d result: %s\n", getCurrentTimeString(tmpString), pInfo->consumerId ,sqlStr);