Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
66b44a78
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
66b44a78
编写于
11月 04, 2022
作者:
haoranc
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '3.0' of
https://github.com/taosdata/TDengine
into test/TD-20160
上级
5312b4b9
a2692a3d
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
19 addition
and
2 deletion
+19
-2
cmake/taosadapter_CMakeLists.txt.in
cmake/taosadapter_CMakeLists.txt.in
+1
-1
docs/en/28-releases/01-tdengine.md
docs/en/28-releases/01-tdengine.md
+4
-0
docs/en/28-releases/02-tools.md
docs/en/28-releases/02-tools.md
+4
-0
docs/zh/28-releases/01-tdengine.md
docs/zh/28-releases/01-tdengine.md
+4
-0
docs/zh/28-releases/02-tools.md
docs/zh/28-releases/02-tools.md
+4
-0
packaging/tools/make_install.bat
packaging/tools/make_install.bat
+1
-0
source/libs/transport/src/transCli.c
source/libs/transport/src/transCli.c
+1
-1
未找到文件。
cmake/taosadapter_CMakeLists.txt.in
浏览文件 @
66b44a78
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# taosadapter
# taosadapter
ExternalProject_Add(taosadapter
ExternalProject_Add(taosadapter
GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
GIT_TAG
a11131c
GIT_TAG
8c3d57d
SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
BINARY_DIR ""
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE
#BUILD_IN_SOURCE TRUE
...
...
docs/en/28-releases/01-tdengine.md
浏览文件 @
66b44a78
...
@@ -6,6 +6,10 @@ description: TDengine release history, Release Notes and download links.
...
@@ -6,6 +6,10 @@ description: TDengine release history, Release Notes and download links.
import Release from "/components/ReleaseV3";
import Release from "/components/ReleaseV3";
## 3.0.1.6
<Release
type=
"tdengine"
version=
"3.0.1.6"
/>
## 3.0.1.5
## 3.0.1.5
<Release
type=
"tdengine"
version=
"3.0.1.5"
/>
<Release
type=
"tdengine"
version=
"3.0.1.5"
/>
...
...
docs/en/28-releases/02-tools.md
浏览文件 @
66b44a78
...
@@ -6,6 +6,10 @@ description: taosTools release history, Release Notes, download links.
...
@@ -6,6 +6,10 @@ description: taosTools release history, Release Notes, download links.
import Release from "/components/ReleaseV3";
import Release from "/components/ReleaseV3";
## 2.2.7
<Release
type=
"tools"
version=
"2.2.7"
/>
## 2.2.6
## 2.2.6
<Release
type=
"tools"
version=
"2.2.6"
/>
<Release
type=
"tools"
version=
"2.2.6"
/>
...
...
docs/zh/28-releases/01-tdengine.md
浏览文件 @
66b44a78
...
@@ -6,6 +6,10 @@ description: TDengine 发布历史、Release Notes 及下载链接
...
@@ -6,6 +6,10 @@ description: TDengine 发布历史、Release Notes 及下载链接
import Release from "/components/ReleaseV3";
import Release from "/components/ReleaseV3";
## 3.0.1.6
<Release
type=
"tdengine"
version=
"3.0.1.6"
/>
## 3.0.1.5
## 3.0.1.5
<Release
type=
"tdengine"
version=
"3.0.1.5"
/>
<Release
type=
"tdengine"
version=
"3.0.1.5"
/>
...
...
docs/zh/28-releases/02-tools.md
浏览文件 @
66b44a78
...
@@ -6,6 +6,10 @@ description: taosTools 的发布历史、Release Notes 和下载链接
...
@@ -6,6 +6,10 @@ description: taosTools 的发布历史、Release Notes 和下载链接
import Release from "/components/ReleaseV3";
import Release from "/components/ReleaseV3";
## 2.2.7
<Release
type=
"tools"
version=
"2.2.7"
/>
## 2.2.6
## 2.2.6
<Release
type=
"tools"
version=
"2.2.6"
/>
<Release
type=
"tools"
version=
"2.2.6"
/>
...
...
packaging/tools/make_install.bat
浏览文件 @
66b44a78
...
@@ -67,3 +67,4 @@ if exist C:\\TDengine\\driver\\taosws.dll (
...
@@ -67,3 +67,4 @@ if exist C:\\TDengine\\driver\\taosws.dll (
copy
/y
C
:\\TDengine\\driver\\taosws.dll
C
:\\Windows\\System32
>
nul
copy
/y
C
:\\TDengine\\driver\\taosws.dll
C
:\\Windows\\System32
>
nul
)
)
sc
query
"taosd"
>
nul
||
sc
create
"taosd"
binPath
=
"C:\\TDengine\\taosd.exe --win_service"
start
=
DEMAND
sc
query
"taosd"
>
nul
||
sc
create
"taosd"
binPath
=
"C:\\TDengine\\taosd.exe --win_service"
start
=
DEMAND
sc
query
"taosadapter"
>
nul
||
sc
create
"taosadapter"
binPath
=
"C:\\TDengine\\taosadapter.exe"
start
=
DEMAND
source/libs/transport/src/transCli.c
浏览文件 @
66b44a78
...
@@ -427,7 +427,7 @@ void cliHandleExceptImpl(SCliConn* pConn, int32_t code) {
...
@@ -427,7 +427,7 @@ void cliHandleExceptImpl(SCliConn* pConn, int32_t code) {
if
(
pCtx
==
NULL
||
pCtx
->
pSem
==
NULL
)
{
if
(
pCtx
==
NULL
||
pCtx
->
pSem
==
NULL
)
{
if
(
transMsg
.
info
.
ahandle
==
NULL
)
{
if
(
transMsg
.
info
.
ahandle
==
NULL
)
{
if
(
REQUEST_NO_RESP
(
&
pMsg
->
msg
)
||
pMsg
->
type
==
Release
)
destroyCmsg
(
pMsg
);
if
(
pMsg
==
NULL
||
REQUEST_NO_RESP
(
&
pMsg
->
msg
)
||
pMsg
->
type
==
Release
)
destroyCmsg
(
pMsg
);
once
=
true
;
once
=
true
;
continue
;
continue
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录