From c27662cf09a5b6c35aa58182fb921e0e9333f879 Mon Sep 17 00:00:00 2001
From: facetosea <285808407@qq.com>
Date: Fri, 7 Mar 2025 09:51:05 +0800
Subject: [PATCH] fix: show variables rows check

---
 tests/pytest/util/sql.py        | 11 +++++++++++
 tests/system-test/2-query/db.py |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py
index 3c79c22bee..fca3eb70e5 100644
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
@@ -704,6 +704,17 @@ class TDSql:
             tdLog.info("sql:%s, elm:%s == expect_elm:%s" % (self.sql, elm, expect_elm))
             return True
         self.print_error_frame_info(elm, expect_elm)
+    
+    def checkGreater(self, elm, expect_elm):
+        if elm > expect_elm:
+            tdLog.info("sql:%s, elm:%s > expect_elm:%s" % (self.sql, elm, expect_elm))
+            return True
+        else:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            args = (caller.filename, caller.lineno, self.sql, elm, expect_elm)
+            tdLog.info("%s(%d) failed: sql:%s, elm:%s <= expect_elm:%s" % args)
+            self.print_error_frame_info(elm, expect_elm)
+            return False
         
     def checkNotEqual(self, elm, expect_elm):
         if elm != expect_elm:
diff --git a/tests/system-test/2-query/db.py b/tests/system-test/2-query/db.py
index 3408f02e8b..2a63249bcc 100644
--- a/tests/system-test/2-query/db.py
+++ b/tests/system-test/2-query/db.py
@@ -46,8 +46,8 @@ class TDTestCase:
         tdSql.checkRows(2)
     
     def case2(self):
-        tdSql.query("show variables")        
-        tdSql.checkRows(87)
+        tdSql.query("show variables") 
+        tdSql.checkGreater(tdSql.getRows(), 80)       
 
         for i in range(self.replicaVar):
             tdSql.query("show dnode %d variables like 'debugFlag'" % (i + 1))
@@ -88,7 +88,7 @@ class TDTestCase:
         
     def show_local_variables_like(self):
         tdSql.query("show local variables")        
-        tdSql.checkRows(85)
+        tdSql.checkGreater(tdSql.getRows(), 80)
 
         tdSql.query("show local variables like 'debugFlag'")
         tdSql.checkRows(1)
@@ -116,7 +116,7 @@ class TDTestCase:
         for zone in zones:
             tdLog.info(f"show {zone} variables")
             tdSql.query(f"show {zone} variables")        
-            tdSql.checkRows(87)
+            tdSql.checkGreater(tdSql.getRows(), 80)
 
             tdLog.info(f"show {zone} variables like 'debugFlag'")
             #tdSql.query(f"show {zone} variables like 'debugFlag'")