fix case

bbcf017e · cpwu · 545a9f1f · bbcf017e
隐藏空白更改
内联并排

Showing with 0 addition and 6 deletion

tests/system-test/2-query/sample.py tests/system-test/2-query/sample.py +0 -6

未找到文件。
--- a/tests/system-test/2-query/sample.py
+++ b/tests/system-test/2-query/sample.py
@@ -860,15 +860,9 @@ class TDTestCase:
        tdSql.checkRows(1000)

        # bug need fix
-<<<<<<< HEAD
-        tdSql.query(f"select c1 ,t1, sample(c1,2) from db.stb1 partition by c1 ")
-        tdSql.query(f"select sample(c1,2) from db.stb1 partition by c1 ")
-        # tdSql.query(f"select c1 ,ind, sample(c1,2) from {dbname}.sample_db.st partition by c1 ")
-=======
        tdSql.query("select c1 ,t1, sample(c1,2) from db.stb1 partition by c1 ")
        tdSql.query("select sample(c1,2) from db.stb1 partition by c1 ")
        tdSql.query("select c1 ,ind, sample(c1,2) from sample_db.st partition by c1 ")
->>>>>>> 3.0

    def run(self):
        import traceback