Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
ca27c92c
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ca27c92c
编写于
12月 11, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into feature/slguan
# Conflicts: # src/util/src/version.c
上级
5cfd2145
7301d83d
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
15 addition
and
6 deletion
+15
-6
packaging/release.sh
packaging/release.sh
+1
-0
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+2
-1
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+1
-1
src/inc/tglobalcfg.h
src/inc/tglobalcfg.h
+1
-0
src/system/detail/src/dnodeService.c
src/system/detail/src/dnodeService.c
+1
-0
src/system/detail/src/mgmtDnode.c
src/system/detail/src/mgmtDnode.c
+1
-1
src/util/src/tglobalcfg.c
src/util/src/tglobalcfg.c
+3
-0
src/util/src/version.c
src/util/src/version.c
+5
-3
未找到文件。
packaging/release.sh
浏览文件 @
ca27c92c
...
...
@@ -109,6 +109,7 @@ build_time=$(date +"%F %R")
echo
"char version[64] =
\"
${
version
}
\"
;"
>
${
versioninfo
}
echo
"char compatible_version[64] =
\"
${
compatible_version
}
\"
;"
>>
${
versioninfo
}
echo
"char gitinfo[128] =
\"
$(
git rev-parse
--verify
HEAD
)
\"
;"
>>
${
versioninfo
}
echo
"char gitinfoOfInternal[128] =
\"\"
;"
>>
${
versioninfo
}
echo
"char buildinfo[512] =
\"
Built by
${
USER
}
at
${
build_time
}
\"
;"
>>
${
versioninfo
}
# 2. cmake executable file
...
...
src/client/src/tscSQLParser.c
浏览文件 @
ca27c92c
...
...
@@ -5373,7 +5373,8 @@ static int32_t checkUpdateTagPrjFunctions(SSqlCmd* pCmd) {
for
(
int32_t
i
=
0
;
i
<
pCmd
->
fieldsInfo
.
numOfOutputCols
;
++
i
)
{
int16_t
functionId
=
tscSqlExprGet
(
pCmd
,
i
)
->
functionId
;
if
(
functionId
==
TSDB_FUNC_TAGPRJ
||
functionId
==
TSDB_FUNC_PRJ
||
functionId
==
TSDB_FUNC_TS
)
{
if
(
functionId
==
TSDB_FUNC_TAGPRJ
||
functionId
==
TSDB_FUNC_PRJ
||
functionId
==
TSDB_FUNC_TS
||
functionId
==
TSDB_FUNC_ARITHM
)
{
continue
;
}
...
...
src/client/src/tscUtil.c
浏览文件 @
ca27c92c
...
...
@@ -246,7 +246,7 @@ bool tscProjectionQueryOnMetric(SSqlCmd* pCmd) {
for
(
int32_t
i
=
0
;
i
<
pCmd
->
fieldsInfo
.
numOfOutputCols
;
++
i
)
{
int32_t
functionId
=
tscSqlExprGet
(
pCmd
,
i
)
->
functionId
;
if
(
functionId
!=
TSDB_FUNC_PRJ
&&
functionId
!=
TSDB_FUNC_TAGPRJ
&&
functionId
!=
TSDB_FUNC_TAG
&&
functionId
!=
TSDB_FUNC_TS
)
{
functionId
!=
TSDB_FUNC_TAG
&&
functionId
!=
TSDB_FUNC_TS
&&
functionId
!=
TSDB_FUNC_ARITHM
)
{
return
false
;
}
}
...
...
src/inc/tglobalcfg.h
浏览文件 @
ca27c92c
...
...
@@ -179,6 +179,7 @@ extern int tsUdpDelay;
extern
char
version
[];
extern
char
compatible_version
[];
extern
char
gitinfo
[];
extern
char
gitinfoOfInternal
[];
extern
char
buildinfo
[];
extern
char
tsTimezone
[
64
];
...
...
src/system/detail/src/dnodeService.c
浏览文件 @
ca27c92c
...
...
@@ -62,6 +62,7 @@ int main(int argc, char *argv[]) {
#endif
printf
(
"gitinfo: %s
\n
"
,
gitinfo
);
printf
(
"gitinfoI: %s
\n
"
,
gitinfoOfInternal
);
printf
(
"buildinfo: %s
\n
"
,
buildinfo
);
return
0
;
}
else
if
(
strcmp
(
argv
[
i
],
"-k"
)
==
0
)
{
...
...
src/system/detail/src/mgmtDnode.c
浏览文件 @
ca27c92c
...
...
@@ -59,7 +59,7 @@ void mgmtCalcNumOfFreeVnodes(SDnodeObj *pDnode) {
if
(
pVload
->
vgId
!=
0
)
{
mTrace
(
"%d-dnode:%s, calc free vnodes, exist vnode:%d, vgroup:%d, state:%d %s, dropstate:%d %s, syncstatus:%d %s"
,
totalVnodes
,
taosIpStr
(
pDnode
->
privateIp
),
i
,
pVload
->
vgId
,
pVload
->
status
,
taosGet
D
nodeStatusStr
(
pVload
->
status
),
pVload
->
status
,
taosGet
V
nodeStatusStr
(
pVload
->
status
),
pVload
->
dropStatus
,
taosGetVnodeDropStatusStr
(
pVload
->
dropStatus
),
pVload
->
syncStatus
,
taosGetVnodeSyncStatusStr
(
pVload
->
syncStatus
));
totalVnodes
++
;
...
...
src/util/src/tglobalcfg.c
浏览文件 @
ca27c92c
...
...
@@ -788,6 +788,9 @@ static void doInitGlobalConfig() {
tsInitConfigOption
(
cfg
++
,
"gitinfo"
,
gitinfo
,
TSDB_CFG_VTYPE_STRING
,
TSDB_CFG_CTYPE_B_SHOW
|
TSDB_CFG_CTYPE_B_CLIENT
,
0
,
0
,
0
,
TSDB_CFG_UTYPE_NONE
);
tsInitConfigOption
(
cfg
++
,
"gitinfoOfInternal"
,
gitinfoOfInternal
,
TSDB_CFG_VTYPE_STRING
,
TSDB_CFG_CTYPE_B_SHOW
|
TSDB_CFG_CTYPE_B_CLIENT
,
0
,
0
,
0
,
TSDB_CFG_UTYPE_NONE
);
tsInitConfigOption
(
cfg
++
,
"buildinfo"
,
buildinfo
,
TSDB_CFG_VTYPE_STRING
,
TSDB_CFG_CTYPE_B_SHOW
|
TSDB_CFG_CTYPE_B_CLIENT
,
0
,
0
,
0
,
TSDB_CFG_UTYPE_NONE
);
...
...
src/util/src/version.c
浏览文件 @
ca27c92c
char
version
[
64
]
=
"1.6.4.1"
;
char
version
[
64
]
=
"1.6.4.2"
;
char
compatible_version
[
64
]
=
"1.6.1.0"
;
char
gitinfo
[
128
]
=
"893fac9da79ef9b88355fcd18d29057adf909bbd"
;
char
buildinfo
[
512
]
=
"Built by ubuntu at 2019-12-02 22:21"
;
char
gitinfo
[
128
]
=
"b9a62d60dc1d4a41452a9bc94e3a0924485c3a75"
;
char
gitinfoOfInternal
[
128
]
=
"e6445addc77e8c96dcb57221fa6ab5dcde0458f7"
;
char
buildinfo
[
512
]
=
"Built by root at 2019-12-10 10:31"
;
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录