From 53b9743ac4e87b191755b211cdb398e4382180c4 Mon Sep 17 00:00:00 2001
From: Yaming Pei <sanwenyuv@sina.com>
Date: Thu, 6 Mar 2025 20:03:13 +0800
Subject: [PATCH] feat: enhanced time format verification

---
 .../tools/benchmark/basic/json/csv-export.json |  2 +-
 tools/taos-tools/src/benchCsv.c                | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/army/tools/benchmark/basic/json/csv-export.json b/tests/army/tools/benchmark/basic/json/csv-export.json
index 2dbe2300a8..2d6f7b7022 100644
--- a/tests/army/tools/benchmark/basic/json/csv-export.json
+++ b/tests/army/tools/benchmark/basic/json/csv-export.json
@@ -1,6 +1,6 @@
 {
     "filetype": "csvfile",
-    "output_path": "./csv/",
+    "output_dir": "./csv/",
     "databases": [
         {
             "dbinfo": {
diff --git a/tools/taos-tools/src/benchCsv.c b/tools/taos-tools/src/benchCsv.c
index 0bb47b0888..39f1a7983f 100644
--- a/tools/taos-tools/src/benchCsv.c
+++ b/tools/taos-tools/src/benchCsv.c
@@ -60,6 +60,24 @@ static int csvValidateParamTsFormat(const char* csv_ts_format) {
         return -1;
     }
 
+    int has_Y = 0, has_m = 0, has_d = 0;
+    const char* p = csv_ts_format;
+    while (*p) {
+        if (*p == '%') {
+            p++;
+            switch (*p) {
+                case 'Y': has_Y = 1; break;
+                case 'm': has_m = 1; break;
+                case 'd': has_d = 1; break;
+            }
+        }
+        p++;
+    }
+ 
+    if (has_Y == 0 || has_m == 0 || has_d == 0) {
+        return -1;
+    }
+
     return 0;
 }