Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
XKZJ_WCL
TDengine
提交
4d8341c5
T
TDengine
项目概览
XKZJ_WCL
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4d8341c5
编写于
1月 15, 2020
作者:
S
slguan
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into hotfix/slguan
上级
981d7c5e
0d2351b4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
3 deletion
+42
-3
packaging/docker/Dockerfile
packaging/docker/Dockerfile
+18
-0
packaging/docker/dockerbuild.sh
packaging/docker/dockerbuild.sh
+12
-0
src/client/src/tscServer.c
src/client/src/tscServer.c
+12
-3
未找到文件。
packaging/docker/Dockerfile
0 → 100644
浏览文件 @
4d8341c5
FROM
centos:7
WORKDIR
/root
COPY
tdengine.tar.gz /root/
RUN
tar
-zxf
tdengine.tar.gz
WORKDIR
/root/tdengine/
RUN
sh install.sh
ENV
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib"
ENV
LANG=en_US.UTF-8
ENV
LANGUAGE=en_US:en
ENV
LC_ALL=en_US.UTF-8
EXPOSE
6020 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042
EXPOSE
6043 6044 6045 6046 6047 6048 6049 6050
CMD
["taosd"]
VOLUME
[ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]
packaging/docker/dockerbuild.sh
0 → 100755
浏览文件 @
4d8341c5
#!/bin/bash
set
-x
$1
tar
-zxf
$1
DIR
=
`
echo
$1
|awk
-F
.
'{print($1"."$2"."$3"."$4)}'
`
mv
$DIR
tdengine
tar
-czf
tdengine.tar.gz tdengine
TMP
=
`
echo
$1
|awk
-F
.
'{print($2"."$3"."$4)}'
`
TAG
=
"1."
$TMP
docker build
--rm
-f
"Dockerfile"
-t
tdengine/tdengine:
$TAG
"."
docker login
-u
tdengine
-p
********
#replace the docker registry username and password
docker push tdengine/tdengine:
$TAG
\ No newline at end of file
src/client/src/tscServer.c
浏览文件 @
4d8341c5
...
...
@@ -1090,7 +1090,9 @@ static void tscHandleSubRetrievalError(SRetrieveSupport *trsupport, SSqlObj *pSq
}
}
if
(
atomic_add_fetch_32
(
&
trsupport
->
pState
->
numOfCompleted
,
1
)
<
trsupport
->
pState
->
numOfTotal
)
{
int32_t
numOfTotal
=
trsupport
->
pState
->
numOfTotal
;
int32_t
finished
=
atomic_add_fetch_32
(
&
trsupport
->
pState
->
numOfCompleted
,
1
);
if
(
finished
<
numOfTotal
)
{
// pState may be released by otherthreads, so keep the value in a local variable.
return
tscFreeSubSqlObj
(
trsupport
,
pSql
);
}
...
...
@@ -1215,7 +1217,14 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
return
tscAbortFurtherRetryRetrieval
(
trsupport
,
tres
,
TSDB_CODE_CLI_NO_DISKSPACE
);
}
if
(
atomic_add_fetch_32
(
&
trsupport
->
pState
->
numOfCompleted
,
1
)
<
trsupport
->
pState
->
numOfTotal
)
{
// keep this value local variable, since the pState variable may be released by other threads, if atomic_add opertion
// increases the finished value up to pState->numOfTotal value, which means all subqueries are completed.
// In this case, the comparsion between finished value and released pState->numOfTotal is not safe.
int32_t
numOfTotal
=
trsupport
->
pState
->
numOfTotal
;
int32_t
finished
=
atomic_add_fetch_32
(
&
trsupport
->
pState
->
numOfCompleted
,
1
);
if
(
finished
<
numOfTotal
)
{
tscTrace
(
"%p sub:%p orderOfSub:%d freed, finished subqueries:%d"
,
pPObj
,
pSql
,
trsupport
->
vnodeIdx
,
finished
);
return
tscFreeSubSqlObj
(
trsupport
,
pSql
);
}
...
...
@@ -1223,7 +1232,7 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
pDesc
->
pSchema
->
maxCapacity
=
trsupport
->
pExtMemBuffer
[
idx
]
->
numOfElemsPerPage
;
tscTrace
(
"%p retrieve from %d vnodes completed.final NumOfRows:%d,start to build loser tree"
,
pPObj
,
trsupport
->
pState
->
numOfTotal
,
trsupport
->
pState
->
numOf
Completed
);
trsupport
->
pState
->
numOfTotal
,
trsupport
->
pState
->
numOf
RetrievedRows
);
tscClearInterpInfo
(
&
pPObj
->
cmd
);
tscCreateLocalReducer
(
trsupport
->
pExtMemBuffer
,
trsupport
->
pState
->
numOfTotal
,
pDesc
,
trsupport
->
pFinalColModel
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录