Merge pull request #5220 from taosdata/hotfix/sangshuduo/TD-2984-combine-taosdemo-and-taosdemox
Hotfix/sangshuduo/td 2984 combine taosdemo and taosdemox
Showing
with
4827 addition
and
6380 deletion
+4827
-6380
- deps/libcurl/lib/win64/libcurl_a.lib deps/libcurl/lib/win64/libcurl_a.lib +0 -0
- packaging/deb/DEBIAN/prerm packaging/deb/DEBIAN/prerm +0 -1
- packaging/deb/makedeb.sh packaging/deb/makedeb.sh +0 -1
- packaging/rpm/tdengine.spec packaging/rpm/tdengine.spec +0 -2
- packaging/tools/install.sh packaging/tools/install.sh +0 -2
- packaging/tools/install_client.sh packaging/tools/install_client.sh +0 -2
- packaging/tools/install_client_power.sh packaging/tools/install_client_power.sh +0 -2
- packaging/tools/install_power.sh packaging/tools/install_power.sh +0 -2
- packaging/tools/makeclient.sh packaging/tools/makeclient.sh +1 -1
- packaging/tools/makeclient_power.sh packaging/tools/makeclient_power.sh +0 -1
- packaging/tools/makepkg.sh packaging/tools/makepkg.sh +1 -1
- packaging/tools/makepkg_power.sh packaging/tools/makepkg_power.sh +0 -1
- packaging/tools/post.sh packaging/tools/post.sh +0 -2
- packaging/tools/remove.sh packaging/tools/remove.sh +0 -1
- packaging/tools/remove_client.sh packaging/tools/remove_client.sh +0 -1
- packaging/tools/remove_client_power.sh packaging/tools/remove_client_power.sh +0 -1
- packaging/tools/remove_power.sh packaging/tools/remove_power.sh +0 -1
- src/kit/CMakeLists.txt src/kit/CMakeLists.txt +0 -1
- src/kit/taosdemo/CMakeLists.txt src/kit/taosdemo/CMakeLists.txt +36 -10
- src/kit/taosdemo/insert.json src/kit/taosdemo/insert.json +0 -0
- src/kit/taosdemo/query.json src/kit/taosdemo/query.json +0 -0
- src/kit/taosdemo/subscribe.json src/kit/taosdemo/subscribe.json +0 -0
- src/kit/taosdemo/taosdemo.c src/kit/taosdemo/taosdemo.c +4760 -1152
- src/kit/taosdemox/CMakeLists.txt src/kit/taosdemox/CMakeLists.txt +0 -47
- src/kit/taosdemox/taosdemox.c src/kit/taosdemox/taosdemox.c +0 -5125
- tests/pytest/cluster/clusterEnvSetup/taosdemoWrapper.py tests/pytest/cluster/clusterEnvSetup/taosdemoWrapper.py +5 -5
- tests/pytest/tools/lowaTest.py tests/pytest/tools/lowaTest.py +1 -1
- tests/pytest/tools/taosdemoTest.py tests/pytest/tools/taosdemoTest.py +12 -7
- tests/pytest/tools/taosdemoTest2.py tests/pytest/tools/taosdemoTest2.py +11 -10
- 未找到文件。
文件已添加
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
src/kit/taosdemox/taosdemox.c
已删除
100644 → 0
想要评论请 注册 或 登录