Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
efe1e809
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1185
Star
22015
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
efe1e809
编写于
6月 27, 2020
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into feature/2.0tsdb
上级
6e0bffe4
f30bb802
变更
15
展开全部
隐藏空白更改
内联
并排
Showing
15 changed file
with
256 addition
and
249 deletion
+256
-249
src/connector/grafana/tdengine/package.json
src/connector/grafana/tdengine/package.json
+1
-1
src/connector/jdbc/CMakeLists.txt
src/connector/jdbc/CMakeLists.txt
+1
-1
src/connector/jdbc/pom.xml
src/connector/jdbc/pom.xml
+1
-1
src/connector/jdbc/src/test/java/TestAsyncTSDBSubscribe.java
src/connector/jdbc/src/test/java/TestAsyncTSDBSubscribe.java
+1
-1
src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
+1
-1
src/connector/nodejs/package.json
src/connector/nodejs/package.json
+1
-1
src/connector/python/linux/python2/setup.py
src/connector/python/linux/python2/setup.py
+1
-1
src/connector/python/linux/python2/taos.egg-info/PKG-INFO
src/connector/python/linux/python2/taos.egg-info/PKG-INFO
+1
-1
src/connector/python/linux/python3/setup.py
src/connector/python/linux/python3/setup.py
+1
-1
src/connector/python/linux/python3/taos.egg-info/PKG-INFO
src/connector/python/linux/python3/taos.egg-info/PKG-INFO
+1
-1
src/connector/python/windows/python2/setup.py
src/connector/python/windows/python2/setup.py
+1
-1
src/connector/python/windows/python2/taos.egg-info/PKG-INFO
src/connector/python/windows/python2/taos.egg-info/PKG-INFO
+1
-1
src/connector/python/windows/python3/setup.py
src/connector/python/windows/python3/setup.py
+1
-1
src/connector/python/windows/python3/taos.egg-info/PKG-INFO
src/connector/python/windows/python3/taos.egg-info/PKG-INFO
+1
-1
tests/pytest/crash_gen.py
tests/pytest/crash_gen.py
+242
-235
未找到文件。
src/connector/grafana/tdengine/package.json
浏览文件 @
efe1e809
{
"name"
:
"TDengine"
,
"private"
:
false
,
"version"
:
"
1
.0.0"
,
"version"
:
"
2
.0.0"
,
"description"
:
"grafana datasource plugin for tdengine"
,
"scripts"
:
{
"build"
:
"./node_modules/grunt-cli/bin/grunt"
,
...
...
src/connector/jdbc/CMakeLists.txt
浏览文件 @
efe1e809
...
...
@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
JDBC_CMD_NAME
}
POST_BUILD
COMMAND mvn -Dmaven.test.skip=true install -f
${
CMAKE_CURRENT_SOURCE_DIR
}
/pom.xml
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_CURRENT_SOURCE_DIR
}
/target/taos-jdbcdriver-
1.0.3
-dist.jar
${
LIBRARY_OUTPUT_PATH
}
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_CURRENT_SOURCE_DIR
}
/target/taos-jdbcdriver-
2.0.0
-dist.jar
${
LIBRARY_OUTPUT_PATH
}
COMMAND mvn -Dmaven.test.skip=true clean -f
${
CMAKE_CURRENT_SOURCE_DIR
}
/pom.xml
COMMENT
"build jdbc driver"
)
ADD_CUSTOM_TARGET
(
${
JDBC_TARGET_NAME
}
ALL WORKING_DIRECTORY
${
EXECUTABLE_OUTPUT_PATH
}
DEPENDS
${
JDBC_CMD_NAME
}
)
...
...
src/connector/jdbc/pom.xml
浏览文件 @
efe1e809
...
...
@@ -3,7 +3,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.taosdata.jdbc
</groupId>
<artifactId>
taos-jdbcdriver
</artifactId>
<version>
1.0.3
</version>
<version>
2.0.0
</version>
<packaging>
jar
</packaging>
<name>
JDBCDriver
</name>
<url>
https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc
</url>
...
...
src/connector/jdbc/src/test/java/TestAsyncTSDBSubscribe.java
浏览文件 @
efe1e809
...
...
@@ -8,7 +8,7 @@ import java.util.Properties;
public
class
TestAsyncTSDBSubscribe
{
public
static
void
main
(
String
[]
args
)
throws
SQLException
{
String
usage
=
"java -cp taos-jdbcdriver-
1.0.3
_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName -topic topicName "
+
String
usage
=
"java -cp taos-jdbcdriver-
2.0.0
_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName -topic topicName "
+
"-tname tableName -h host"
;
if
(
args
.
length
<
2
)
{
System
.
err
.
println
(
usage
);
...
...
src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
浏览文件 @
efe1e809
...
...
@@ -10,7 +10,7 @@ import java.util.Properties;
public
class
TestTSDBSubscribe
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
String
usage
=
"java -cp taos-jdbcdriver-
1.0.3
_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName "
+
String
usage
=
"java -cp taos-jdbcdriver-
2.0.0
_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName "
+
"-topic topicName -tname tableName -h host"
;
if
(
args
.
length
<
2
)
{
System
.
err
.
println
(
usage
);
...
...
src/connector/nodejs/package.json
浏览文件 @
efe1e809
{
"name"
:
"td-connector"
,
"version"
:
"
1.6.1
"
,
"version"
:
"
2.0.0
"
,
"description"
:
"A Node.js connector for TDengine."
,
"main"
:
"tdengine.js"
,
"scripts"
:
{
...
...
src/connector/python/linux/python2/setup.py
浏览文件 @
efe1e809
...
...
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools
.
setup
(
name
=
"taos"
,
version
=
"
1.4.15
"
,
version
=
"
2.0.0
"
,
author
=
"Taosdata Inc."
,
author_email
=
"support@taosdata.com"
,
description
=
"TDengine python client package"
,
...
...
src/connector/python/linux/python2/taos.egg-info/PKG-INFO
浏览文件 @
efe1e809
Metadata-Version: 2.1
Name: taos
Version:
1.4.15
Version:
2.0.0
Summary: TDengine python client package
Home-page: https://github.com/pypa/sampleproject
Author: Taosdata Inc.
...
...
src/connector/python/linux/python3/setup.py
浏览文件 @
efe1e809
...
...
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools
.
setup
(
name
=
"taos"
,
version
=
"
1.4.15
"
,
version
=
"
2.0.0
"
,
author
=
"Taosdata Inc."
,
author_email
=
"support@taosdata.com"
,
description
=
"TDengine python client package"
,
...
...
src/connector/python/linux/python3/taos.egg-info/PKG-INFO
浏览文件 @
efe1e809
Metadata-Version: 2.1
Name: taos
Version:
1.4.15
Version:
2.0.0
Summary: TDengine python client package
Home-page: https://github.com/pypa/sampleproject
Author: Taosdata Inc.
...
...
src/connector/python/windows/python2/setup.py
浏览文件 @
efe1e809
...
...
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools
.
setup
(
name
=
"taos"
,
version
=
"
1.4.15
"
,
version
=
"
2.0.0
"
,
author
=
"Taosdata Inc."
,
author_email
=
"support@taosdata.com"
,
description
=
"TDengine python client package"
,
...
...
src/connector/python/windows/python2/taos.egg-info/PKG-INFO
浏览文件 @
efe1e809
Metadata-Version: 2.1
Name: taos
Version:
1.4.15
Version:
2.0.0
Summary: TDengine python client package
Home-page: https://github.com/pypa/sampleproject
Author: Taosdata Inc.
...
...
src/connector/python/windows/python3/setup.py
浏览文件 @
efe1e809
...
...
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools
.
setup
(
name
=
"taos"
,
version
=
"
1.4.15
"
,
version
=
"
2.0.0
"
,
author
=
"Taosdata Inc."
,
author_email
=
"support@taosdata.com"
,
description
=
"TDengine python client package"
,
...
...
src/connector/python/windows/python3/taos.egg-info/PKG-INFO
浏览文件 @
efe1e809
Metadata-Version: 2.1
Name: taos
Version:
1.4.15
Version:
2.0.0
Summary: TDengine python client package
Home-page: https://github.com/pypa/sampleproject
Author: Hongze Cheng
...
...
tests/pytest/crash_gen.py
浏览文件 @
efe1e809
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录