Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
d15d7688
T
TDengine
项目概览
哥们要飞
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
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,发现更多精彩内容 >>
未验证
提交
d15d7688
编写于
12月 02, 2019
作者:
P
plum-lihui
提交者:
GitHub
12月 02, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #810 from taosdata/release/v1.6.4.0
fix some release scripts
上级
cd8c4f8e
a7f79b50
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
23 addition
and
8 deletion
+23
-8
packaging/release.sh
packaging/release.sh
+3
-3
packaging/tools/install.sh
packaging/tools/install.sh
+2
-2
packaging/tools/release_note
packaging/tools/release_note
+11
-0
src/inc/tsdb.h
src/inc/tsdb.h
+4
-1
src/rpc/src/tudp.c
src/rpc/src/tudp.c
+1
-0
src/util/src/version.c
src/util/src/version.c
+2
-2
未找到文件。
packaging/release.sh
浏览文件 @
d15d7688
...
...
@@ -123,11 +123,11 @@ cd ${compile_dir}
# arm only support lite ver
if
[
-z
"
$armver
"
]
;
then
cmake
${
top_dir
}
/
../
cmake ../
elif
[
"
$armver
"
==
"arm64"
]
;
then
cmake
${
top_dir
}
/../
-DVERSION
=
lite
-DARMVER
=
arm64
cmake
../
-DARMVER
=
arm64
elif
[
"
$armver
"
==
"arm32"
]
;
then
cmake
${
top_dir
}
/../
-DVERSION
=
lite
-DARMVER
=
arm32
cmake
../
-DARMVER
=
arm32
else
echo
"input parameter error!!!"
return
...
...
packaging/tools/install.sh
浏览文件 @
d15d7688
...
...
@@ -313,9 +313,9 @@ vercomp () {
function
is_version_compatible
()
{
curr_version
=
$(
${
bin_dir
}
/taosd
-V
|
cut
-d
' '
-f
2
)
curr_version
=
$(
${
bin_dir
}
/taosd
-V
|
head
-1
|
cut
-d
' '
-f
2
)
min_compatible_version
=
$(
${
script_dir
}
/bin/taosd
-V
|
cut
-d
' '
-f
4
)
min_compatible_version
=
$(
${
script_dir
}
/bin/taosd
-V
|
head
-1
|
cut
-d
' '
-f
4
)
vercomp
$curr_version
$min_compatible_version
case
$?
in
...
...
packaging/tools/release_note
浏览文件 @
d15d7688
taos-1.6.4.0 (Release on 2019-12-01)
Bug fixed:
1.Look for possible causes of file corruption and fix them
2.Encapsulate memory allocation functions to reduce the possibility of crashes
3.Increase Arm64 compilation options
4.Remove most of the warnings in the code
5.Provide a variety of connector usage documents
6.Network connection can be selected in udp and tcp
7.Allow the maximum number of Tags to be 32
8.Bugs reported by the user
taos-1.5.2.6 (Release on 2019-05-13)
Bug fixed:
- Nchar strings sometimes were wrongly truncated on Window
...
...
src/inc/tsdb.h
浏览文件 @
d15d7688
...
...
@@ -147,7 +147,10 @@ extern "C" {
#define TSDB_MAX_MGMT_IPS (TSDB_MAX_MPEERS+1)
#define TSDB_REPLICA_MIN_NUM 1
#define TSDB_REPLICA_MAX_NUM 3
/*
* this is defined in CMakeList.txt
*/
//#define TSDB_REPLICA_MAX_NUM 3
#define TSDB_TBNAME_COLUMN_INDEX (-1)
#define TSDB_MULTI_METERMETA_MAX_NUM 100000 // maximum batch size allowed to load metermeta
...
...
src/rpc/src/tudp.c
浏览文件 @
d15d7688
...
...
@@ -377,6 +377,7 @@ void *taosTransferDataViaTcp(void *argv) {
pThead
->
tcp
=
1
;
pThead
->
msgType
=
(
char
)(
pHeader
->
msgType
-
1
);
pThead
->
msgLen
=
(
int32_t
)
htonl
(
sizeof
(
STaosHeader
));
uint32_t
id
=
pThead
->
sourceId
;
pThead
->
sourceId
=
pThead
->
destId
;
pThead
->
destId
=
id
;
pMonitor
->
ip
=
pTransfer
->
ip
;
pMonitor
->
port
=
pTransfer
->
port
;
pMonitor
->
pSet
=
pSet
;
...
...
src/util/src/version.c
浏览文件 @
d15d7688
char
version
[
64
]
=
"1.6.4.0"
;
char
compatible_version
[
64
]
=
"1.6.1.0"
;
char
gitinfo
[
128
]
=
"
b6e308866e315483915f4c42a2717547ed0b9d36
"
;
char
buildinfo
[
512
]
=
"Built by ubuntu at 2019-1
1-26 21:56
"
;
char
gitinfo
[
128
]
=
"
6d27c11e3b23ae69366df366a6517853648c41f7
"
;
char
buildinfo
[
512
]
=
"Built by ubuntu at 2019-1
2-01 12:27
"
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录