From 33bbdb8c94c3779a1bc1975fd244291d16163985 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Wed, 22 Dec 2021 20:46:35 +0800
Subject: [PATCH] [TD-12362]<fix>: taosdump-supports-json (#9237)

* [TD-12362]<fix>: taosdump-supports-json

* add 5-taos-tools/taosdump/taosdumpTestTypeJson.py

* update taos-tools with detect file exists
---
 src/kit/taos-tools                            |   2 +-
 .../taosdump/taosdumpTestTypeJson.py          | 111 ++++++++++++++++++
 tests/develop-test/fulltest-tools.sh          |   1 +
 3 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py

diff --git a/src/kit/taos-tools b/src/kit/taos-tools
index beca481331..a3611888d4 160000
--- a/src/kit/taos-tools
+++ b/src/kit/taos-tools
@@ -1 +1 @@
-Subproject commit beca4813316f254624d8dbecf54d45a5a232c61d
+Subproject commit a3611888d4257a9baa0ce876b04b47c60cc17279
diff --git a/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py b/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py
new file mode 100644
index 0000000000..14297ee867
--- /dev/null
+++ b/tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py
@@ -0,0 +1,111 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import subprocess
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1<sdsang>: [TD-12362] taosdump supports JSON
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.tmpdir = "tmp"
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosdump" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database db  days 11 keep 3649 blocks 8 ")
+
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table st(ts timestamp, c1 int) tags(jtag JSON)")
+        tdSql.execute("create table t1 using st tags('{\"location\": \"beijing\"}')")
+        tdSql.execute("insert into t1 values(1500000000000, 1)")
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosdump not found!")
+        else:
+            tdLog.info("taosdump found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        else:
+            print("directory exists")
+            os.system("rm -rf %s" % self.tmpdir)
+            os.makedirs(self.tmpdir)
+
+        os.system("%staosdump --databases db -o %s" % (binPath, self.tmpdir))
+
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s" % (binPath, self.tmpdir))
+
+        tdSql.query("show databases")
+        tdSql.checkRows(1)
+
+        tdSql.execute("use db")
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'st')
+
+        tdSql.query("show tables")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 't1')
+
+        tdSql.query("select jtag->'location' from st")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, "\"beijing\"")
+
+        tdSql.query("select * from st where jtag contains 'location'")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(0, 2, '{\"location\":\"beijing\"}')
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/develop-test/fulltest-tools.sh b/tests/develop-test/fulltest-tools.sh
index e69de29bb2..52e6ac28bf 100755
--- a/tests/develop-test/fulltest-tools.sh
+++ b/tests/develop-test/fulltest-tools.sh
@@ -0,0 +1 @@
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeJson.py
-- 
GitLab