Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loser646
TDengine
提交
233437a7
T
TDengine
项目概览
loser646
/
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,发现更多精彩内容 >>
提交
233437a7
编写于
10月 14, 2020
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/release/s103' into release/s103
上级
7f70eff9
90c2b1f5
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
11 addition
and
9 deletion
+11
-9
cmake/version.inc
cmake/version.inc
+1
-1
packaging/docker/Dockerfile
packaging/docker/Dockerfile
+4
-2
packaging/docker/dockerbuild.sh
packaging/docker/dockerbuild.sh
+1
-1
snap/snapcraft.yaml
snap/snapcraft.yaml
+2
-2
src/connector/go
src/connector/go
+1
-1
src/os/src/linux/CMakeLists.txt
src/os/src/linux/CMakeLists.txt
+1
-1
src/wal/src/walMain.c
src/wal/src/walMain.c
+1
-1
未找到文件。
cmake/version.inc
浏览文件 @
233437a7
...
...
@@ -4,7 +4,7 @@ PROJECT(TDengine)
IF
(
DEFINED
VERNUMBER
)
SET
(
TD_VER_NUMBER
$
{
VERNUMBER
})
ELSE
()
SET
(
TD_VER_NUMBER
"2.0.
4.0
"
)
SET
(
TD_VER_NUMBER
"2.0.
5.1
"
)
ENDIF
()
IF
(
DEFINED
VERCOMPATIBLE
)
...
...
packaging/docker/Dockerfile
浏览文件 @
233437a7
FROM
centos:7
FROM
ubuntu:16
WORKDIR
/root
ARG
version
RUN
echo
$version
COPY
tdengine.tar.gz /root/
RUN
tar
-zxf
tdengine.tar.gz
WORKDIR
/root/TDengine-server/
WORKDIR
/root/TDengine-server
-$version
/
RUN
sh install.sh
-e
no
...
...
packaging/docker/dockerbuild.sh
浏览文件 @
233437a7
#!/bin/bash
set
-x
docker build
--rm
-f
"Dockerfile"
-t
tdengine/tdengine:
$1
"."
docker build
--rm
-f
"Dockerfile"
-t
tdengine/tdengine:
$1
"."
--build-arg
version
=
$1
docker login
-u
tdengine
-p
$2
#replace the docker registry username and password
docker push tdengine/tdengine:
$1
snap/snapcraft.yaml
浏览文件 @
233437a7
name
:
tdengine
base
:
core18
version
:
'
RELEASE_VERSION
'
version
:
'
2.0.5.1
'
icon
:
snap/gui/t-dengine.svg
summary
:
an open-source big data platform designed and optimized for IoT.
description
:
|
...
...
@@ -72,7 +72,7 @@ parts:
-
usr/bin/taosd
-
usr/bin/taos
-
usr/bin/taosdemo
-
usr/lib/libtaos.so.
RELEASE_VERSION
-
usr/lib/libtaos.so.
2.0.5.1
-
usr/lib/libtaos.so.1
-
usr/lib/libtaos.so
...
...
go
@
8d7bf743
比较
8c58c512
...
8d7bf743
Subproject commit 8
c58c512b6acda8bcdfa48fdc7140227b5221766
Subproject commit 8
d7bf743852897110cbdcc7c4322cd7a74d4167b
src/os/src/linux/CMakeLists.txt
浏览文件 @
233437a7
...
...
@@ -4,4 +4,4 @@ PROJECT(TDengine)
AUX_SOURCE_DIRECTORY
(
. SRC
)
ADD_LIBRARY
(
os
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
os m rt
)
TARGET_LINK_LIBRARIES
(
os m rt
z
)
src/wal/src/walMain.c
浏览文件 @
233437a7
...
...
@@ -427,7 +427,7 @@ static int walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp) {
if
(
!
taosCheckChecksumWhole
((
uint8_t
*
)
pHead
,
sizeof
(
SWalHead
)))
{
wWarn
(
"wal:%s, cksum is messed up, skip the rest of file"
,
name
);
terrno
=
TSDB_CODE_WAL_FILE_CORRUPTED
;
ASSERT
(
false
);
//
ASSERT(false);
break
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录