Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
bf97833c
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
bf97833c
编写于
6月 24, 2021
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master' into hotfix/tmq
上级
2e258a89
b6d54b7c
变更
24
展开全部
隐藏空白更改
内联
并排
Showing
24 changed file
with
538 addition
and
242 deletion
+538
-242
.gitmodules
.gitmodules
+3
-0
cmake/define.inc
cmake/define.inc
+5
-0
deps/CMakeLists.txt
deps/CMakeLists.txt
+13
-0
deps/jemalloc
deps/jemalloc
+1
-0
packaging/deb/makedeb.sh
packaging/deb/makedeb.sh
+42
-8
packaging/release.sh
packaging/release.sh
+28
-16
packaging/rpm/makerpm.sh
packaging/rpm/makerpm.sh
+3
-3
packaging/rpm/tdengine.spec
packaging/rpm/tdengine.spec
+63
-18
packaging/tools/install.sh
packaging/tools/install.sh
+178
-131
packaging/tools/make_install.sh
packaging/tools/make_install.sh
+79
-34
packaging/tools/makepkg.sh
packaging/tools/makepkg.sh
+42
-9
src/client/src/tscSub.c
src/client/src/tscSub.c
+1
-0
src/dnode/CMakeLists.txt
src/dnode/CMakeLists.txt
+8
-1
src/dnode/src/dnodeMain.c
src/dnode/src/dnodeMain.c
+2
-0
src/kit/shell/CMakeLists.txt
src/kit/shell/CMakeLists.txt
+9
-2
src/kit/taosdemo/CMakeLists.txt
src/kit/taosdemo/CMakeLists.txt
+10
-3
src/mnode/src/mnodeDnode.c
src/mnode/src/mnodeDnode.c
+2
-0
src/os/inc/osMemory.h
src/os/inc/osMemory.h
+4
-0
src/os/inc/osSysinfo.h
src/os/inc/osSysinfo.h
+1
-0
src/os/src/darwin/darwinSysInfo.c
src/os/src/darwin/darwinSysInfo.c
+8
-3
src/os/src/detail/osSysinfo.c
src/os/src/detail/osSysinfo.c
+8
-3
src/os/src/windows/wSysinfo.c
src/os/src/windows/wSysinfo.c
+6
-1
tests/pytest/dockerCluster/OneMnodeMultipleVnodesTest.py
tests/pytest/dockerCluster/OneMnodeMultipleVnodesTest.py
+2
-3
tests/pytest/dockerCluster/basic.py
tests/pytest/dockerCluster/basic.py
+20
-7
未找到文件。
.gitmodules
浏览文件 @
bf97833c
...
@@ -10,3 +10,6 @@
...
@@ -10,3 +10,6 @@
[submodule "tests/examples/rust"]
[submodule "tests/examples/rust"]
path = tests/examples/rust
path = tests/examples/rust
url = https://github.com/songtianyi/tdengine-rust-bindings.git
url = https://github.com/songtianyi/tdengine-rust-bindings.git
[submodule "deps/jemalloc"]
path = deps/jemalloc
url = https://github.com/jemalloc/jemalloc
cmake/define.inc
浏览文件 @
bf97833c
...
@@ -59,6 +59,11 @@ IF (TD_LINUX_64)
...
@@ -59,6 +59,11 @@ IF (TD_LINUX_64)
MESSAGE
(
STATUS
"linux64 is defined"
)
MESSAGE
(
STATUS
"linux64 is defined"
)
SET
(
COMMON_FLAGS
"-Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE"
)
SET
(
COMMON_FLAGS
"-Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE"
)
ADD_DEFINITIONS
(
-
DUSE_LIBICONV
)
ADD_DEFINITIONS
(
-
DUSE_LIBICONV
)
IF
(
JEMALLOC_ENABLED
)
ADD_DEFINITIONS
(
-
DTD_JEMALLOC_ENABLED
-
I
$
{
CMAKE_BINARY_DIR
}
/
build
/
include
-
L
$
{
CMAKE_BINARY_DIR
}
/
build
/
lib
-
Wl
,
-
rpath
,
$
{
CMAKE_BINARY_DIR
}
/
build
/
lib
-
ljemalloc
)
ENDIF
()
ENDIF
()
ENDIF
()
IF
(
TD_LINUX_32
)
IF
(
TD_LINUX_32
)
...
...
deps/CMakeLists.txt
浏览文件 @
bf97833c
...
@@ -19,3 +19,16 @@ ENDIF ()
...
@@ -19,3 +19,16 @@ ENDIF ()
IF
(
TD_DARWIN AND TD_MQTT
)
IF
(
TD_DARWIN AND TD_MQTT
)
ADD_SUBDIRECTORY
(
MQTT-C
)
ADD_SUBDIRECTORY
(
MQTT-C
)
ENDIF
()
ENDIF
()
IF
(
TD_LINUX_64 AND JEMALLOC_ENABLED
)
MESSAGE
(
"setup dpes/jemalloc, current source dir:"
${
CMAKE_CURRENT_SOURCE_DIR
}
)
MESSAGE
(
"binary dir:"
${
CMAKE_BINARY_DIR
}
)
include
(
ExternalProject
)
ExternalProject_Add
(
jemalloc
PREFIX
"jemalloc"
SOURCE_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/jemalloc
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --prefix=
${
CMAKE_BINARY_DIR
}
/build/
BUILD_COMMAND
${
MAKE
}
)
ENDIF
()
jemalloc
@
ea6b3e97
Subproject commit ea6b3e973b477b8061e0076bb257dbd7f3faa756
packaging/deb/makedeb.sh
浏览文件 @
bf97833c
...
@@ -24,14 +24,14 @@ echo "compile_dir: ${compile_dir}"
...
@@ -24,14 +24,14 @@ echo "compile_dir: ${compile_dir}"
echo
"pkg_dir:
${
pkg_dir
}
"
echo
"pkg_dir:
${
pkg_dir
}
"
if
[
-d
${
pkg_dir
}
]
;
then
if
[
-d
${
pkg_dir
}
]
;
then
rm
-rf
${
pkg_dir
}
rm
-rf
${
pkg_dir
}
fi
fi
mkdir
-p
${
pkg_dir
}
mkdir
-p
${
pkg_dir
}
cd
${
pkg_dir
}
cd
${
pkg_dir
}
libfile
=
"libtaos.so.
${
tdengine_ver
}
"
libfile
=
"libtaos.so.
${
tdengine_ver
}
"
# create install dir
# create install dir
install_home_path
=
"/usr/local/taos"
install_home_path
=
"/usr/local/taos"
mkdir
-p
${
pkg_dir
}${
install_home_path
}
mkdir
-p
${
pkg_dir
}${
install_home_path
}
mkdir
-p
${
pkg_dir
}${
install_home_path
}
/bin
mkdir
-p
${
pkg_dir
}${
install_home_path
}
/bin
...
@@ -42,7 +42,7 @@ mkdir -p ${pkg_dir}${install_home_path}/examples
...
@@ -42,7 +42,7 @@ mkdir -p ${pkg_dir}${install_home_path}/examples
mkdir
-p
${
pkg_dir
}${
install_home_path
}
/include
mkdir
-p
${
pkg_dir
}${
install_home_path
}
/include
mkdir
-p
${
pkg_dir
}${
install_home_path
}
/init.d
mkdir
-p
${
pkg_dir
}${
install_home_path
}
/init.d
mkdir
-p
${
pkg_dir
}${
install_home_path
}
/script
mkdir
-p
${
pkg_dir
}${
install_home_path
}
/script
cp
${
compile_dir
}
/../packaging/cfg/taos.cfg
${
pkg_dir
}${
install_home_path
}
/cfg
cp
${
compile_dir
}
/../packaging/cfg/taos.cfg
${
pkg_dir
}${
install_home_path
}
/cfg
cp
${
compile_dir
}
/../packaging/deb/taosd
${
pkg_dir
}${
install_home_path
}
/init.d
cp
${
compile_dir
}
/../packaging/deb/taosd
${
pkg_dir
}${
install_home_path
}
/init.d
cp
${
compile_dir
}
/../packaging/tools/post.sh
${
pkg_dir
}${
install_home_path
}
/script
cp
${
compile_dir
}
/../packaging/tools/post.sh
${
pkg_dir
}${
install_home_path
}
/script
...
@@ -54,7 +54,7 @@ cp ${compile_dir}/build/bin/taosdemo ${pkg_dir}${install_home_pat
...
@@ -54,7 +54,7 @@ cp ${compile_dir}/build/bin/taosdemo ${pkg_dir}${install_home_pat
cp
${
compile_dir
}
/build/bin/taosdump
${
pkg_dir
}${
install_home_path
}
/bin
cp
${
compile_dir
}
/build/bin/taosdump
${
pkg_dir
}${
install_home_path
}
/bin
cp
${
compile_dir
}
/build/bin/taosd
${
pkg_dir
}${
install_home_path
}
/bin
cp
${
compile_dir
}
/build/bin/taosd
${
pkg_dir
}${
install_home_path
}
/bin
cp
${
compile_dir
}
/build/bin/taos
${
pkg_dir
}${
install_home_path
}
/bin
cp
${
compile_dir
}
/build/bin/taos
${
pkg_dir
}${
install_home_path
}
/bin
cp
${
compile_dir
}
/build/lib/
${
libfile
}
${
pkg_dir
}${
install_home_path
}
/driver
cp
${
compile_dir
}
/build/lib/
${
libfile
}
${
pkg_dir
}${
install_home_path
}
/driver
cp
${
compile_dir
}
/../src/inc/taos.h
${
pkg_dir
}${
install_home_path
}
/include
cp
${
compile_dir
}
/../src/inc/taos.h
${
pkg_dir
}${
install_home_path
}
/include
cp
${
compile_dir
}
/../src/inc/taoserror.h
${
pkg_dir
}${
install_home_path
}
/include
cp
${
compile_dir
}
/../src/inc/taoserror.h
${
pkg_dir
}${
install_home_path
}
/include
cp
-r
${
top_dir
}
/tests/examples/
*
${
pkg_dir
}${
install_home_path
}
/examples
cp
-r
${
top_dir
}
/tests/examples/
*
${
pkg_dir
}${
install_home_path
}
/examples
...
@@ -67,7 +67,41 @@ fi
...
@@ -67,7 +67,41 @@ fi
cp
-r
${
top_dir
}
/src/connector/python
${
pkg_dir
}${
install_home_path
}
/connector
cp
-r
${
top_dir
}
/src/connector/python
${
pkg_dir
}${
install_home_path
}
/connector
cp
-r
${
top_dir
}
/src/connector/go
${
pkg_dir
}${
install_home_path
}
/connector
cp
-r
${
top_dir
}
/src/connector/go
${
pkg_dir
}${
install_home_path
}
/connector
cp
-r
${
top_dir
}
/src/connector/nodejs
${
pkg_dir
}${
install_home_path
}
/connector
cp
-r
${
top_dir
}
/src/connector/nodejs
${
pkg_dir
}${
install_home_path
}
/connector
cp
${
compile_dir
}
/build/lib/taos-jdbcdriver
*
dist.
*
${
pkg_dir
}${
install_home_path
}
/connector
||
:
cp
${
compile_dir
}
/build/lib/taos-jdbcdriver
*
.
*
${
pkg_dir
}${
install_home_path
}
/connector
||
:
if
[
-f
${
compile_dir
}
/build/bin/jemalloc-config
]
;
then
install_user_local_path
=
"/usr/local"
mkdir
-p
${
pkg_dir
}${
install_user_local_path
}
/
{
bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3
}
cp
${
compile_dir
}
/build/bin/jemalloc-config
${
pkg_dir
}${
install_user_local_path
}
/bin/
if
[
-f
${
compile_dir
}
/build/bin/jemalloc.sh
]
;
then
cp
${
compile_dir
}
/build/bin/jemalloc.sh
${
pkg_dir
}${
install_user_local_path
}
/bin/
fi
if
[
-f
${
compile_dir
}
/build/bin/jeprof
]
;
then
cp
${
compile_dir
}
/build/bin/jeprof
${
pkg_dir
}${
install_user_local_path
}
/bin/
fi
if
[
-f
${
compile_dir
}
/build/include/jemalloc/jemalloc.h
]
;
then
cp
${
compile_dir
}
/build/include/jemalloc/jemalloc.h
${
pkg_dir
}${
install_user_local_path
}
/include/jemalloc/
fi
if
[
-f
${
compile_dir
}
/build/lib/libjemalloc.so.2
]
;
then
cp
${
compile_dir
}
/build/lib/libjemalloc.so.2
${
pkg_dir
}${
install_user_local_path
}
/lib/
ln
-sf
libjemalloc.so.2
${
pkg_dir
}${
install_user_local_path
}
/lib/libjemalloc.so
fi
if
[
-f
${
compile_dir
}
/build/lib/libjemalloc.a
]
;
then
cp
${
compile_dir
}
/build/lib/libjemalloc.a
${
pkg_dir
}${
install_user_local_path
}
/lib/
fi
if
[
-f
${
compile_dir
}
/build/lib/libjemalloc_pic.a
]
;
then
cp
${
compile_dir
}
/build/lib/libjemalloc_pic.a
${
pkg_dir
}${
install_user_local_path
}
/lib/
fi
if
[
-f
${
compile_dir
}
/build/lib/pkgconfig/jemalloc.pc
]
;
then
cp
${
compile_dir
}
/build/lib/pkgconfig/jemalloc.pc
${
pkg_dir
}${
install_user_local_path
}
/lib/pkgconfig/
fi
if
[
-f
${
compile_dir
}
/build/share/doc/jemalloc/jemalloc.html
]
;
then
cp
${
compile_dir
}
/build/share/doc/jemalloc/jemalloc.html
${
pkg_dir
}${
install_user_local_path
}
/share/doc/jemalloc/
fi
if
[
-f
${
compile_dir
}
/build/share/man/man3/jemalloc.3
]
;
then
cp
${
compile_dir
}
/build/share/man/man3/jemalloc.3
${
pkg_dir
}${
install_user_local_path
}
/share/man/man3/
fi
fi
cp
-r
${
compile_dir
}
/../packaging/deb/DEBIAN
${
pkg_dir
}
/
cp
-r
${
compile_dir
}
/../packaging/deb/DEBIAN
${
pkg_dir
}
/
chmod
755
${
pkg_dir
}
/DEBIAN/
*
chmod
755
${
pkg_dir
}
/DEBIAN/
*
...
@@ -75,7 +109,7 @@ chmod 755 ${pkg_dir}/DEBIAN/*
...
@@ -75,7 +109,7 @@ chmod 755 ${pkg_dir}/DEBIAN/*
# modify version of control
# modify version of control
debver
=
"Version: "
$tdengine_ver
debver
=
"Version: "
$tdengine_ver
sed
-i
"2c
$debver
"
${
pkg_dir
}
/DEBIAN/control
sed
-i
"2c
$debver
"
${
pkg_dir
}
/DEBIAN/control
#get taos version, then set deb name
#get taos version, then set deb name
...
@@ -90,7 +124,7 @@ fi
...
@@ -90,7 +124,7 @@ fi
if
[
"
$verType
"
==
"beta"
]
;
then
if
[
"
$verType
"
==
"beta"
]
;
then
debname
=
${
debname
}
-
${
verType
}
".deb"
debname
=
${
debname
}
-
${
verType
}
".deb"
elif
[
"
$verType
"
==
"stable"
]
;
then
elif
[
"
$verType
"
==
"stable"
]
;
then
debname
=
${
debname
}
".deb"
debname
=
${
debname
}
".deb"
else
else
echo
"unknow verType, nor stabel or beta"
echo
"unknow verType, nor stabel or beta"
...
@@ -101,7 +135,7 @@ fi
...
@@ -101,7 +135,7 @@ fi
dpkg
-b
${
pkg_dir
}
$debname
dpkg
-b
${
pkg_dir
}
$debname
echo
"make deb package success!"
echo
"make deb package success!"
cp
${
pkg_dir
}
/
*
.deb
${
output_dir
}
cp
${
pkg_dir
}
/
*
.deb
${
output_dir
}
# clean tmep dir
# clean tmep dir
rm
-rf
${
pkg_dir
}
rm
-rf
${
pkg_dir
}
...
...
packaging/release.sh
浏览文件 @
bf97833c
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
set
-e
set
-e
#set -x
#set -x
# releas
h.sh -v [cluster | edge]
# releas
e.sh -v [cluster | edge]
# -c [aarch32 | aarch64 | x64 | x86 | mips64 ...]
# -c [aarch32 | aarch64 | x64 | x86 | mips64 ...]
# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
# -V [stable | beta]
# -V [stable | beta]
# -l [full | lite]
# -l [full | lite]
...
@@ -22,11 +22,12 @@ cpuType=x64 # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
...
@@ -22,11 +22,12 @@ cpuType=x64 # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
osType
=
Linux
# [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
osType
=
Linux
# [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
pagMode
=
full
# [full | lite]
pagMode
=
full
# [full | lite]
soMode
=
dynamic
# [static | dynamic]
soMode
=
dynamic
# [static | dynamic]
allocator
=
glibc
# [glibc | jemalloc]
dbName
=
taos
# [taos | power]
dbName
=
taos
# [taos | power]
verNumber
=
""
verNumber
=
""
verNumberComp
=
"2.0.0.0"
verNumberComp
=
"2.0.0.0"
while
getopts
"hv:V:c:o:l:s:d:n:m:"
arg
while
getopts
"hv:V:c:o:l:s:d:
a:
n:m:"
arg
do
do
case
$arg
in
case
$arg
in
v
)
v
)
...
@@ -53,6 +54,10 @@ do
...
@@ -53,6 +54,10 @@ do
#echo "dbName=$OPTARG"
#echo "dbName=$OPTARG"
dbName
=
$(
echo
$OPTARG
)
dbName
=
$(
echo
$OPTARG
)
;;
;;
a
)
#echo "allocator=$OPTARG"
allocator
=
$(
echo
$OPTARG
)
;;
n
)
n
)
#echo "verNumber=$OPTARG"
#echo "verNumber=$OPTARG"
verNumber
=
$(
echo
$OPTARG
)
verNumber
=
$(
echo
$OPTARG
)
...
@@ -71,20 +76,21 @@ do
...
@@ -71,20 +76,21 @@ do
echo
" -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...] "
echo
" -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...] "
echo
" -V [stable | beta] "
echo
" -V [stable | beta] "
echo
" -l [full | lite] "
echo
" -l [full | lite] "
echo
" -a [glibc | jemalloc] "
echo
" -s [static | dynamic] "
echo
" -s [static | dynamic] "
echo
" -d [taos | power] "
echo
" -d [taos | power] "
echo
" -n [version number] "
echo
" -n [version number] "
echo
" -m [compatible version number] "
echo
" -m [compatible version number] "
exit
0
exit
0
;;
;;
?
)
#unknow option
?
)
#unknow option
echo
"unkonw argument"
echo
"unkonw argument"
exit
1
exit
1
;;
;;
esac
esac
done
done
echo
"verMode=
${
verMode
}
verType=
${
verType
}
cpuType=
${
cpuType
}
osType=
${
osType
}
pagMode=
${
pagMode
}
soMode=
${
soMode
}
dbName=
${
dbName
}
verNumber=
${
verNumber
}
verNumberComp=
${
verNumberComp
}
"
echo
"verMode=
${
verMode
}
verType=
${
verType
}
cpuType=
${
cpuType
}
osType=
${
osType
}
pagMode=
${
pagMode
}
soMode=
${
soMode
}
dbName=
${
dbName
}
allocator=
${
allocator
}
verNumber=
${
verNumber
}
verNumberComp=
${
verNumberComp
}
"
curr_dir
=
$(
pwd
)
curr_dir
=
$(
pwd
)
...
@@ -118,7 +124,7 @@ function vercomp () {
...
@@ -118,7 +124,7 @@ function vercomp () {
echo
0
echo
0
exit
0
exit
0
fi
fi
local
IFS
=
.
local
IFS
=
.
local
i
ver1
=(
$1
)
ver2
=(
$2
)
local
i
ver1
=(
$1
)
ver2
=(
$2
)
...
@@ -164,7 +170,7 @@ if [[ "$verMode" == "cluster" ]]; then
...
@@ -164,7 +170,7 @@ if [[ "$verMode" == "cluster" ]]; then
else
else
gitinfoOfInternal
=
NULL
gitinfoOfInternal
=
NULL
fi
fi
cd
${
curr_dir
}
cd
${
curr_dir
}
# 2. cmake executable file
# 2. cmake executable file
...
@@ -180,12 +186,18 @@ else
...
@@ -180,12 +186,18 @@ else
fi
fi
cd
${
compile_dir
}
cd
${
compile_dir
}
if
[[
"
$allocator
"
==
"jemalloc"
]]
;
then
allocator_macro
=
"-DJEMALLOC_ENABLED=true"
else
allocator_macro
=
""
fi
# check support cpu type
# check support cpu type
if
[[
"
$cpuType
"
==
"x64"
]]
||
[[
"
$cpuType
"
==
"aarch64"
]]
||
[[
"
$cpuType
"
==
"aarch32"
]]
||
[[
"
$cpuType
"
==
"mips64"
]]
;
then
if
[[
"
$cpuType
"
==
"x64"
]]
||
[[
"
$cpuType
"
==
"aarch64"
]]
||
[[
"
$cpuType
"
==
"aarch32"
]]
||
[[
"
$cpuType
"
==
"mips64"
]]
;
then
if
[
"
$verMode
"
!=
"cluster"
]
;
then
if
[
"
$verMode
"
!=
"cluster"
]
;
then
cmake ../
-DCPUTYPE
=
${
cpuType
}
-DOSTYPE
=
${
osType
}
-DSOMODE
=
${
soMode
}
-DDBNAME
=
${
dbName
}
-DVERTYPE
=
${
verType
}
-DVERDATE
=
"
${
build_time
}
"
-DGITINFO
=
${
gitinfo
}
-DGITINFOI
=
${
gitinfoOfInternal
}
-DVERNUMBER
=
${
verNumber
}
-DVERCOMPATIBLE
=
${
verNumberComp
}
-DPAGMODE
=
${
pagMode
}
cmake ../
-DCPUTYPE
=
${
cpuType
}
-DOSTYPE
=
${
osType
}
-DSOMODE
=
${
soMode
}
-DDBNAME
=
${
dbName
}
-DVERTYPE
=
${
verType
}
-DVERDATE
=
"
${
build_time
}
"
-DGITINFO
=
${
gitinfo
}
-DGITINFOI
=
${
gitinfoOfInternal
}
-DVERNUMBER
=
${
verNumber
}
-DVERCOMPATIBLE
=
${
verNumberComp
}
-DPAGMODE
=
${
pagMode
}
${
allocator_macro
}
else
else
cmake ../../
-DCPUTYPE
=
${
cpuType
}
-DOSTYPE
=
${
osType
}
-DSOMODE
=
${
soMode
}
-DDBNAME
=
${
dbName
}
-DVERTYPE
=
${
verType
}
-DVERDATE
=
"
${
build_time
}
"
-DGITINFO
=
${
gitinfo
}
-DGITINFOI
=
${
gitinfoOfInternal
}
-DVERNUMBER
=
${
verNumber
}
-DVERCOMPATIBLE
=
${
verNumberComp
}
cmake ../../
-DCPUTYPE
=
${
cpuType
}
-DOSTYPE
=
${
osType
}
-DSOMODE
=
${
soMode
}
-DDBNAME
=
${
dbName
}
-DVERTYPE
=
${
verType
}
-DVERDATE
=
"
${
build_time
}
"
-DGITINFO
=
${
gitinfo
}
-DGITINFOI
=
${
gitinfoOfInternal
}
-DVERNUMBER
=
${
verNumber
}
-DVERCOMPATIBLE
=
${
verNumberComp
}
${
allocator_macro
}
fi
fi
else
else
echo
"input cpuType=
${
cpuType
}
error!!!"
echo
"input cpuType=
${
cpuType
}
error!!!"
...
@@ -199,9 +211,9 @@ cd ${curr_dir}
...
@@ -199,9 +211,9 @@ cd ${curr_dir}
# 3. Call the corresponding script for packaging
# 3. Call the corresponding script for packaging
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[[
"
$verMode
"
!=
"cluster"
]]
&&
[[
"
$cpuType
"
==
"x64"
]]
&&
[[
"
$dbName
"
==
"taos"
]]
;
then
if
[[
"
$verMode
"
!=
"cluster"
]]
&&
[[
"
$cpuType
"
==
"x64"
]]
&&
[[
"
$dbName
"
==
"taos"
]]
;
then
ret
=
'0'
ret
=
'0'
command
-v
dpkg
>
/dev/null 2>&1
||
{
ret
=
'1'
;
}
command
-v
dpkg
>
/dev/null 2>&1
||
{
ret
=
'1'
;
}
if
[
"
$ret
"
-eq
0
]
;
then
if
[
"
$ret
"
-eq
0
]
;
then
echo
"====do deb package for the ubuntu system===="
echo
"====do deb package for the ubuntu system===="
output_dir
=
"
${
top_dir
}
/debs"
output_dir
=
"
${
top_dir
}
/debs"
if
[
-d
${
output_dir
}
]
;
then
if
[
-d
${
output_dir
}
]
;
then
...
@@ -214,9 +226,9 @@ if [ "$osType" != "Darwin" ]; then
...
@@ -214,9 +226,9 @@ if [ "$osType" != "Darwin" ]; then
echo
"==========dpkg command not exist, so not release deb package!!!"
echo
"==========dpkg command not exist, so not release deb package!!!"
fi
fi
ret
=
'0'
ret
=
'0'
command
-v
rpmbuild
>
/dev/null 2>&1
||
{
ret
=
'1'
;
}
command
-v
rpmbuild
>
/dev/null 2>&1
||
{
ret
=
'1'
;
}
if
[
"
$ret
"
-eq
0
]
;
then
if
[
"
$ret
"
-eq
0
]
;
then
echo
"====do rpm package for the centos system===="
echo
"====do rpm package for the centos system===="
output_dir
=
"
${
top_dir
}
/rpms"
output_dir
=
"
${
top_dir
}
/rpms"
if
[
-d
${
output_dir
}
]
;
then
if
[
-d
${
output_dir
}
]
;
then
...
@@ -229,11 +241,11 @@ if [ "$osType" != "Darwin" ]; then
...
@@ -229,11 +241,11 @@ if [ "$osType" != "Darwin" ]; then
echo
"==========rpmbuild command not exist, so not release rpm package!!!"
echo
"==========rpmbuild command not exist, so not release rpm package!!!"
fi
fi
fi
fi
echo
"====do tar.gz package for all systems===="
echo
"====do tar.gz package for all systems===="
cd
${
script_dir
}
/tools
cd
${
script_dir
}
/tools
if
[[
"
$dbName
"
==
"taos"
]]
;
then
if
[[
"
$dbName
"
==
"taos"
]]
;
then
${
csudo
}
./makepkg.sh
${
compile_dir
}
${
verNumber
}
"
${
build_time
}
"
${
cpuType
}
${
osType
}
${
verMode
}
${
verType
}
${
pagMode
}
${
csudo
}
./makepkg.sh
${
compile_dir
}
${
verNumber
}
"
${
build_time
}
"
${
cpuType
}
${
osType
}
${
verMode
}
${
verType
}
${
pagMode
}
${
csudo
}
./makeclient.sh
${
compile_dir
}
${
verNumber
}
"
${
build_time
}
"
${
cpuType
}
${
osType
}
${
verMode
}
${
verType
}
${
pagMode
}
${
csudo
}
./makeclient.sh
${
compile_dir
}
${
verNumber
}
"
${
build_time
}
"
${
cpuType
}
${
osType
}
${
verMode
}
${
verType
}
${
pagMode
}
${
csudo
}
./makearbi.sh
${
compile_dir
}
${
verNumber
}
"
${
build_time
}
"
${
cpuType
}
${
osType
}
${
verMode
}
${
verType
}
${
pagMode
}
${
csudo
}
./makearbi.sh
${
compile_dir
}
${
verNumber
}
"
${
build_time
}
"
${
cpuType
}
${
osType
}
${
verMode
}
${
verType
}
${
pagMode
}
...
...
packaging/rpm/makerpm.sh
浏览文件 @
bf97833c
#!/bin/bash
#!/bin/bash
#
#
# Generate rpm package for centos
# Generate rpm package for centos
set
-e
set
-e
# set -x
# set -x
...
@@ -60,7 +60,7 @@ ${csudo} rpmbuild --define="_version ${tdengine_ver}" --define="_topdir ${pkg_di
...
@@ -60,7 +60,7 @@ ${csudo} rpmbuild --define="_version ${tdengine_ver}" --define="_topdir ${pkg_di
# copy rpm package to output_dir, and modify package name, then clean temp dir
# copy rpm package to output_dir, and modify package name, then clean temp dir
#${csudo} cp -rf RPMS/* ${output_dir}
#${csudo} cp -rf RPMS/* ${output_dir}
cp_rpm_package
${
pkg_dir
}
/RPMS
cp_rpm_package
${
pkg_dir
}
/RPMS
if
[
"
$verMode
"
==
"cluster"
]
;
then
if
[
"
$verMode
"
==
"cluster"
]
;
then
...
@@ -74,7 +74,7 @@ fi
...
@@ -74,7 +74,7 @@ fi
if
[
"
$verType
"
==
"beta"
]
;
then
if
[
"
$verType
"
==
"beta"
]
;
then
rpmname
=
${
rpmname
}
-
${
verType
}
".rpm"
rpmname
=
${
rpmname
}
-
${
verType
}
".rpm"
elif
[
"
$verType
"
==
"stable"
]
;
then
elif
[
"
$verType
"
==
"stable"
]
;
then
rpmname
=
${
rpmname
}
".rpm"
rpmname
=
${
rpmname
}
".rpm"
else
else
echo
"unknow verType, nor stabel or beta"
echo
"unknow verType, nor stabel or beta"
...
...
packaging/rpm/tdengine.spec
浏览文件 @
bf97833c
%define homepath /usr/local/taos
%define homepath /usr/local/taos
%define userlocalpath /usr/local
%define cfg_install_dir /etc/taos
%define cfg_install_dir /etc/taos
%define __strip /bin/true
%define __strip /bin/true
...
@@ -12,22 +13,22 @@ URL: www.taosdata.com
...
@@ -12,22 +13,22 @@ URL: www.taosdata.com
AutoReqProv: no
AutoReqProv: no
#BuildRoot: %_topdir/BUILDROOT
#BuildRoot: %_topdir/BUILDROOT
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
#Prefix: /usr/local/taos
#Prefix: /usr/local/taos
#BuildRequires:
#BuildRequires:
#Requires:
#Requires:
%description
%description
Big Data Platform Designed and Optimized for IoT
Big Data Platform Designed and Optimized for IoT
#"prep" Nothing needs to be done
#"prep" Nothing needs to be done
#%prep
#%prep
#%setup -q
#%setup -q
#%setup -T
#%setup -T
#"build" Nothing needs to be done
#"build" Nothing needs to be done
#%build
#%build
#%configure
#%configure
#make %{?_smp_mflags}
#make %{?_smp_mflags}
...
@@ -75,9 +76,53 @@ fi
...
@@ -75,9 +76,53 @@ fi
cp -r %{_compiledir}/../src/connector/python %{buildroot}%{homepath}/connector
cp -r %{_compiledir}/../src/connector/python %{buildroot}%{homepath}/connector
cp -r %{_compiledir}/../src/connector/go %{buildroot}%{homepath}/connector
cp -r %{_compiledir}/../src/connector/go %{buildroot}%{homepath}/connector
cp -r %{_compiledir}/../src/connector/nodejs %{buildroot}%{homepath}/connector
cp -r %{_compiledir}/../src/connector/nodejs %{buildroot}%{homepath}/connector
cp %{_compiledir}/build/lib/taos-jdbcdriver*
dist.*
%{buildroot}%{homepath}/connector ||:
cp %{_compiledir}/build/lib/taos-jdbcdriver*
.*
%{buildroot}%{homepath}/connector ||:
cp -r %{_compiledir}/../tests/examples/* %{buildroot}%{homepath}/examples
cp -r %{_compiledir}/../tests/examples/* %{buildroot}%{homepath}/examples
if [ -f %{_compiledir}/build/bin/jemalloc-config ]; then
mkdir -p %{buildroot}%{userlocalpath}/bin
mkdir -p %{buildroot}%{userlocalpath}/lib
mkdir -p %{buildroot}%{userlocalpath}/lib/pkgconfig
mkdir -p %{buildroot}%{userlocalpath}/include
mkdir -p %{buildroot}%{userlocalpath}/include/jemalloc
mkdir -p %{buildroot}%{userlocalpath}/share
mkdir -p %{buildroot}%{userlocalpath}/share/doc
mkdir -p %{buildroot}%{userlocalpath}/share/doc/jemalloc
mkdir -p %{buildroot}%{userlocalpath}/share/man
mkdir -p %{buildroot}%{userlocalpath}/share/man/man3
cp %{_compiledir}/build/bin/jemalloc-config %{buildroot}%{userlocalpath}/bin/
if [ -f %{_compiledir}/build/bin/jemalloc.sh ]; then
cp %{_compiledir}/build/bin/jemalloc.sh %{buildroot}%{userlocalpath}/bin/
fi
if [ -f %{_compiledir}/build/bin/jeprof ]; then
cp %{_compiledir}/build/bin/jeprof %{buildroot}%{userlocalpath}/bin/
fi
if [ -f %{_compiledir}/build/include/jemalloc/jemalloc.h ]; then
cp %{_compiledir}/build/include/jemalloc/jemalloc.h %{buildroot}%{userlocalpath}/include/jemalloc/
fi
if [ -f %{_compiledir}/build/lib/libjemalloc.so.2 ]; then
cp %{_compiledir}/build/lib/libjemalloc.so.2 %{buildroot}%{userlocalpath}/lib/
ln -sf libjemalloc.so.2 %{buildroot}%{userlocalpath}/lib/libjemalloc.so
fi
if [ -f %{_compiledir}/build/lib/libjemalloc.a ]; then
cp %{_compiledir}/build/lib/libjemalloc.a %{buildroot}%{userlocalpath}/lib/
fi
if [ -f %{_compiledir}/build/lib/libjemalloc_pic.a ]; then
cp %{_compiledir}/build/lib/libjemalloc_pic.a %{buildroot}%{userlocalpath}/lib/
fi
if [ -f %{_compiledir}/build/lib/pkgconfig/jemalloc.pc ]; then
cp %{_compiledir}/build/lib/pkgconfig/jemalloc.pc %{buildroot}%{userlocalpath}/lib/pkgconfig/
fi
if [ -f %{_compiledir}/build/share/doc/jemalloc/jemalloc.html ]; then
cp %{_compiledir}/build/share/doc/jemalloc/jemalloc.html %{buildroot}%{userlocalpath}/share/doc/jemalloc/
fi
if [ -f %{_compiledir}/build/share/man/man3/jemalloc.3 ]; then
cp %{_compiledir}/build/share/man/man3/jemalloc.3 %{buildroot}%{userlocalpath}/share/man/man3/
fi
fi
#Scripts executed before installation
#Scripts executed before installation
%pre
%pre
csudo=""
csudo=""
...
@@ -103,7 +148,7 @@ fi
...
@@ -103,7 +148,7 @@ fi
# if taos.cfg already softlink, remove it
# if taos.cfg already softlink, remove it
if [ -f %{cfg_install_dir}/taos.cfg ]; then
if [ -f %{cfg_install_dir}/taos.cfg ]; then
${csudo} rm -f %{homepath}/cfg/taos.cfg || :
${csudo} rm -f %{homepath}/cfg/taos.cfg || :
fi
fi
# there can not libtaos.so*, otherwise ln -s error
# there can not libtaos.so*, otherwise ln -s error
${csudo} rm -f %{homepath}/driver/libtaos* || :
${csudo} rm -f %{homepath}/driver/libtaos* || :
...
@@ -116,18 +161,18 @@ if command -v sudo > /dev/null; then
...
@@ -116,18 +161,18 @@ if command -v sudo > /dev/null; then
fi
fi
cd %{homepath}/script
cd %{homepath}/script
${csudo} ./post.sh
${csudo} ./post.sh
# Scripts executed before uninstall
# Scripts executed before uninstall
%preun
%preun
csudo=""
csudo=""
if command -v sudo > /dev/null; then
if command -v sudo > /dev/null; then
csudo="sudo"
csudo="sudo"
fi
fi
# only remove package to call preun.sh, not but update(2)
# only remove package to call preun.sh, not but update(2)
if [ $1 -eq 0 ];then
if [ $1 -eq 0 ];then
#cd %{homepath}/script
#cd %{homepath}/script
#${csudo} ./preun.sh
#${csudo} ./preun.sh
if [ -f %{homepath}/script/preun.sh ]; then
if [ -f %{homepath}/script/preun.sh ]; then
cd %{homepath}/script
cd %{homepath}/script
${csudo} ./preun.sh
${csudo} ./preun.sh
...
@@ -135,7 +180,7 @@ if [ $1 -eq 0 ];then
...
@@ -135,7 +180,7 @@ if [ $1 -eq 0 ];then
bin_link_dir="/usr/bin"
bin_link_dir="/usr/bin"
lib_link_dir="/usr/lib"
lib_link_dir="/usr/lib"
inc_link_dir="/usr/include"
inc_link_dir="/usr/include"
data_link_dir="/usr/local/taos/data"
data_link_dir="/usr/local/taos/data"
log_link_dir="/usr/local/taos/log"
log_link_dir="/usr/local/taos/log"
cfg_link_dir="/usr/local/taos/cfg"
cfg_link_dir="/usr/local/taos/cfg"
...
@@ -149,20 +194,20 @@ if [ $1 -eq 0 ];then
...
@@ -149,20 +194,20 @@ if [ $1 -eq 0 ];then
${csudo} rm -f ${inc_link_dir}/taos.h || :
${csudo} rm -f ${inc_link_dir}/taos.h || :
${csudo} rm -f ${inc_link_dir}/taoserror.h || :
${csudo} rm -f ${inc_link_dir}/taoserror.h || :
${csudo} rm -f ${lib_link_dir}/libtaos.* || :
${csudo} rm -f ${lib_link_dir}/libtaos.* || :
${csudo} rm -f ${log_link_dir} || :
${csudo} rm -f ${log_link_dir} || :
${csudo} rm -f ${data_link_dir} || :
${csudo} rm -f ${data_link_dir} || :
pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
if [ -n "$pid" ]; then
if [ -n "$pid" ]; then
${csudo} kill -9 $pid || :
${csudo} kill -9 $pid || :
fi
fi
fi
fi
fi
fi
# Scripts executed after uninstall
# Scripts executed after uninstall
%postun
%postun
# clean build dir
# clean build dir
%clean
%clean
csudo=""
csudo=""
...
...
packaging/tools/install.sh
浏览文件 @
bf97833c
此差异已折叠。
点击以展开。
packaging/tools/make_install.sh
浏览文件 @
bf97833c
#!/bin/bash
#!/bin/bash
#
#
# This file is used to install TAOS time-series database on linux systems. The operating system
# This file is used to install TAOS time-series database on linux systems. The operating system
# is required to use systemd to manage services at boot
# is required to use systemd to manage services at boot
set
-e
set
-e
# set -x
# set -x
# -----------------------Variables definition
---------------------
# -----------------------Variables definition
source_dir
=
$1
source_dir
=
$1
binary_dir
=
$2
binary_dir
=
$2
osType
=
$3
osType
=
$3
...
@@ -71,9 +71,9 @@ if [ "$osType" != "Darwin" ]; then
...
@@ -71,9 +71,9 @@ if [ "$osType" != "Darwin" ]; then
service_mod
=
0
service_mod
=
0
elif
$(
which service &> /dev/null
)
;
then
elif
$(
which service &> /dev/null
)
;
then
service_mod
=
1
service_mod
=
1
service_config_dir
=
"/etc/init.d"
service_config_dir
=
"/etc/init.d"
if
$(
which chkconfig &> /dev/null
)
;
then
if
$(
which chkconfig &> /dev/null
)
;
then
initd_mod
=
1
initd_mod
=
1
elif
$(
which insserv &> /dev/null
)
;
then
elif
$(
which insserv &> /dev/null
)
;
then
initd_mod
=
2
initd_mod
=
2
elif
$(
which update-rc.d &> /dev/null
)
;
then
elif
$(
which update-rc.d &> /dev/null
)
;
then
...
@@ -123,9 +123,9 @@ function kill_taosd() {
...
@@ -123,9 +123,9 @@ function kill_taosd() {
function
install_main_path
()
{
function
install_main_path
()
{
#create install main dir and all sub dir
#create install main dir and all sub dir
${
csudo
}
rm
-rf
${
install_main_dir
}
||
:
${
csudo
}
rm
-rf
${
install_main_dir
}
||
:
${
csudo
}
mkdir
-p
${
install_main_dir
}
${
csudo
}
mkdir
-p
${
install_main_dir
}
${
csudo
}
mkdir
-p
${
install_main_dir
}
/cfg
${
csudo
}
mkdir
-p
${
install_main_dir
}
/cfg
${
csudo
}
mkdir
-p
${
install_main_dir
}
/bin
${
csudo
}
mkdir
-p
${
install_main_dir
}
/bin
${
csudo
}
mkdir
-p
${
install_main_dir
}
/connector
${
csudo
}
mkdir
-p
${
install_main_dir
}
/connector
${
csudo
}
mkdir
-p
${
install_main_dir
}
/driver
${
csudo
}
mkdir
-p
${
install_main_dir
}
/driver
${
csudo
}
mkdir
-p
${
install_main_dir
}
/examples
${
csudo
}
mkdir
-p
${
install_main_dir
}
/examples
...
@@ -176,6 +176,49 @@ function install_bin() {
...
@@ -176,6 +176,49 @@ function install_bin() {
[
-x
${
install_main_dir
}
/bin/remove_client.sh
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/remove_client.sh
${
bin_link_dir
}
/rmtaos
||
:
[
-x
${
install_main_dir
}
/bin/remove_client.sh
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/remove_client.sh
${
bin_link_dir
}
/rmtaos
||
:
fi
fi
}
}
function
install_jemalloc
()
{
if
[
"
$osType
"
!=
"Darwin"
]
;
then
/usr/bin/install
-c
-d
/usr/local/bin
if
[
-f
${
binary_dir
}
/build/bin/jemalloc-config
]
;
then
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/bin/jemalloc-config /usr/local/bin
fi
if
[
-f
${
binary_dir
}
/build/bin/jemalloc.sh
]
;
then
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/bin/jemalloc.sh /usr/local/bin
fi
if
[
-f
${
binary_dir
}
/build/bin/jeprof
]
;
then
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/bin/jeprof /usr/local/bin
fi
if
[
-f
${
binary_dir
}
/build/include/jemalloc/jemalloc.h
]
;
then
/usr/bin/install
-c
-d
/usr/local/include/jemalloc
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
fi
if
[
-f
${
binary_dir
}
/build/lib/libjemalloc.so.2
]
;
then
/usr/bin/install
-c
-d
/usr/local/lib
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc.so.2 /usr/local/lib
ln
-sf
libjemalloc.so.2 /usr/local/lib/libjemalloc.so
/usr/bin/install
-c
-d
/usr/local/lib
if
[
-f
${
binary_dir
}
/build/lib/libjemalloc.a
]
;
then
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc.a /usr/local/lib
fi
if
[
-f
${
binary_dir
}
/build/lib/libjemalloc_pic.a
]
;
then
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc_pic.a /usr/local/lib
fi
if
[
-f
${
binary_dir
}
/build/lib/pkgconfig/jemalloc.pc
]
;
then
/usr/bin/install
-c
-d
/usr/local/lib/pkgconfig
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
fi
fi
if
[
-f
${
binary_dir
}
/build/share/doc/jemalloc/jemalloc.html
]
;
then
/usr/bin/install
-c
-d
/usr/local/share/doc/jemalloc
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
fi
if
[
-f
${
binary_dir
}
/build/share/man/man3/jemalloc.3
]
;
then
/usr/bin/install
-c
-d
/usr/local/share/man/man3
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/share/man/man3/jemalloc.3 /usr/local/share/man/man3
fi
fi
}
function
install_lib
()
{
function
install_lib
()
{
# Remove links
# Remove links
...
@@ -183,12 +226,12 @@ function install_lib() {
...
@@ -183,12 +226,12 @@ function install_lib() {
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
"
$osType
"
!=
"Darwin"
]
;
then
${
csudo
}
rm
-f
${
lib64_link_dir
}
/libtaos.
*
||
:
${
csudo
}
rm
-f
${
lib64_link_dir
}
/libtaos.
*
||
:
fi
fi
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
"
$osType
"
!=
"Darwin"
]
;
then
${
csudo
}
cp
${
binary_dir
}
/build/lib/libtaos.so.
${
verNumber
}
${
install_main_dir
}
/driver
&&
${
csudo
}
chmod
777
${
install_main_dir
}
/driver/
*
${
csudo
}
cp
${
binary_dir
}
/build/lib/libtaos.so.
${
verNumber
}
${
install_main_dir
}
/driver
&&
${
csudo
}
chmod
777
${
install_main_dir
}
/driver/
*
${
csudo
}
ln
-sf
${
install_main_dir
}
/driver/libtaos.
*
${
lib_link_dir
}
/libtaos.so.1
${
csudo
}
ln
-sf
${
install_main_dir
}
/driver/libtaos.
*
${
lib_link_dir
}
/libtaos.so.1
${
csudo
}
ln
-sf
${
lib_link_dir
}
/libtaos.so.1
${
lib_link_dir
}
/libtaos.so
${
csudo
}
ln
-sf
${
lib_link_dir
}
/libtaos.so.1
${
lib_link_dir
}
/libtaos.so
if
[
-d
"
${
lib64_link_dir
}
"
]
;
then
if
[
-d
"
${
lib64_link_dir
}
"
]
;
then
${
csudo
}
ln
-sf
${
install_main_dir
}
/driver/libtaos.
*
${
lib64_link_dir
}
/libtaos.so.1
${
csudo
}
ln
-sf
${
install_main_dir
}
/driver/libtaos.
*
${
lib64_link_dir
}
/libtaos.so.1
${
csudo
}
ln
-sf
${
lib64_link_dir
}
/libtaos.so.1
${
lib64_link_dir
}
/libtaos.so
${
csudo
}
ln
-sf
${
lib64_link_dir
}
/libtaos.so.1
${
lib64_link_dir
}
/libtaos.so
...
@@ -198,7 +241,9 @@ function install_lib() {
...
@@ -198,7 +241,9 @@ function install_lib() {
${
csudo
}
ln
-sf
${
install_main_dir
}
/driver/libtaos.1.dylib
${
lib_link_dir
}
/libtaos.1.dylib
${
csudo
}
ln
-sf
${
install_main_dir
}
/driver/libtaos.1.dylib
${
lib_link_dir
}
/libtaos.1.dylib
${
csudo
}
ln
-sf
${
lib_link_dir
}
/libtaos.1.dylib
${
lib_link_dir
}
/libtaos.dylib
${
csudo
}
ln
-sf
${
lib_link_dir
}
/libtaos.1.dylib
${
lib_link_dir
}
/libtaos.dylib
fi
fi
install_jemalloc
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
"
$osType
"
!=
"Darwin"
]
;
then
${
csudo
}
ldconfig
${
csudo
}
ldconfig
fi
fi
...
@@ -206,26 +251,26 @@ function install_lib() {
...
@@ -206,26 +251,26 @@ function install_lib() {
function
install_header
()
{
function
install_header
()
{
${
csudo
}
rm
-f
${
inc_link_dir
}
/taos.h
${
inc_link_dir
}
/taoserror.h
||
:
${
csudo
}
rm
-f
${
inc_link_dir
}
/taos.h
${
inc_link_dir
}
/taoserror.h
||
:
${
csudo
}
cp
-f
${
source_dir
}
/src/inc/taos.h
${
source_dir
}
/src/inc/taoserror.h
${
install_main_dir
}
/include
&&
${
csudo
}
chmod
644
${
install_main_dir
}
/include/
*
${
csudo
}
cp
-f
${
source_dir
}
/src/inc/taos.h
${
source_dir
}
/src/inc/taoserror.h
${
install_main_dir
}
/include
&&
${
csudo
}
chmod
644
${
install_main_dir
}
/include/
*
${
csudo
}
ln
-s
${
install_main_dir
}
/include/taos.h
${
inc_link_dir
}
/taos.h
${
csudo
}
ln
-s
${
install_main_dir
}
/include/taos.h
${
inc_link_dir
}
/taos.h
${
csudo
}
ln
-s
${
install_main_dir
}
/include/taoserror.h
${
inc_link_dir
}
/taoserror.h
${
csudo
}
ln
-s
${
install_main_dir
}
/include/taoserror.h
${
inc_link_dir
}
/taoserror.h
}
}
function
install_config
()
{
function
install_config
()
{
#${csudo} rm -f ${install_main_dir}/cfg/taos.cfg || :
#${csudo} rm -f ${install_main_dir}/cfg/taos.cfg || :
if
[
!
-f
${
cfg_install_dir
}
/taos.cfg
]
;
then
if
[
!
-f
${
cfg_install_dir
}
/taos.cfg
]
;
then
${
csudo
}
mkdir
-p
${
cfg_install_dir
}
${
csudo
}
mkdir
-p
${
cfg_install_dir
}
[
-f
${
script_dir
}
/../cfg/taos.cfg
]
&&
${
csudo
}
cp
${
script_dir
}
/../cfg/taos.cfg
${
cfg_install_dir
}
[
-f
${
script_dir
}
/../cfg/taos.cfg
]
&&
${
csudo
}
cp
${
script_dir
}
/../cfg/taos.cfg
${
cfg_install_dir
}
${
csudo
}
chmod
644
${
cfg_install_dir
}
/
*
${
csudo
}
chmod
644
${
cfg_install_dir
}
/
*
fi
fi
${
csudo
}
cp
-f
${
script_dir
}
/../cfg/taos.cfg
${
install_main_dir
}
/cfg/taos.cfg.org
${
csudo
}
cp
-f
${
script_dir
}
/../cfg/taos.cfg
${
install_main_dir
}
/cfg/taos.cfg.org
${
csudo
}
ln
-s
${
cfg_install_dir
}
/taos.cfg
${
install_main_dir
}
/cfg
${
csudo
}
ln
-s
${
cfg_install_dir
}
/taos.cfg
${
install_main_dir
}
/cfg
}
}
function
install_log
()
{
function
install_log
()
{
${
csudo
}
rm
-rf
${
log_dir
}
||
:
${
csudo
}
rm
-rf
${
log_dir
}
||
:
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
"
$osType
"
!=
"Darwin"
]
;
then
...
@@ -239,7 +284,7 @@ function install_log() {
...
@@ -239,7 +284,7 @@ function install_log() {
function
install_data
()
{
function
install_data
()
{
${
csudo
}
mkdir
-p
${
data_dir
}
${
csudo
}
mkdir
-p
${
data_dir
}
${
csudo
}
ln
-s
${
data_dir
}
${
install_main_dir
}
/data
${
csudo
}
ln
-s
${
data_dir
}
${
install_main_dir
}
/data
}
}
function
install_connector
()
{
function
install_connector
()
{
...
@@ -254,8 +299,8 @@ function install_connector() {
...
@@ -254,8 +299,8 @@ function install_connector() {
echo
"WARNING: go connector not found, please check if want to use it!"
echo
"WARNING: go connector not found, please check if want to use it!"
fi
fi
${
csudo
}
cp
-rf
${
source_dir
}
/src/connector/python
${
install_main_dir
}
/connector
${
csudo
}
cp
-rf
${
source_dir
}
/src/connector/python
${
install_main_dir
}
/connector
${
csudo
}
cp
${
binary_dir
}
/build/lib/
*
.jar
${
install_main_dir
}
/connector &> /dev/null
&&
${
csudo
}
chmod
777
${
install_main_dir
}
/connector/
*
.jar
||
echo
&> /dev/null
${
csudo
}
cp
${
binary_dir
}
/build/lib/
*
.jar
${
install_main_dir
}
/connector &> /dev/null
&&
${
csudo
}
chmod
777
${
install_main_dir
}
/connector/
*
.jar
||
echo
&> /dev/null
}
}
function
install_examples
()
{
function
install_examples
()
{
...
@@ -264,8 +309,8 @@ function install_examples() {
...
@@ -264,8 +309,8 @@ function install_examples() {
function
clean_service_on_sysvinit
()
{
function
clean_service_on_sysvinit
()
{
#restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
#restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
#${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
#${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
if
pidof taosd &> /dev/null
;
then
if
pidof taosd &> /dev/null
;
then
${
csudo
}
service taosd stop
||
:
${
csudo
}
service taosd stop
||
:
fi
fi
...
@@ -277,9 +322,9 @@ function clean_service_on_sysvinit() {
...
@@ -277,9 +322,9 @@ function clean_service_on_sysvinit() {
elif
((
${
initd_mod
}
==
3
))
;
then
elif
((
${
initd_mod
}
==
3
))
;
then
${
csudo
}
update-rc.d
-f
taosd remove
||
:
${
csudo
}
update-rc.d
-f
taosd remove
||
:
fi
fi
${
csudo
}
rm
-f
${
service_config_dir
}
/taosd
||
:
${
csudo
}
rm
-f
${
service_config_dir
}
/taosd
||
:
if
$(
which init &> /dev/null
)
;
then
if
$(
which init &> /dev/null
)
;
then
${
csudo
}
init q
||
:
${
csudo
}
init q
||
:
fi
fi
...
@@ -298,10 +343,10 @@ function install_service_on_sysvinit() {
...
@@ -298,10 +343,10 @@ function install_service_on_sysvinit() {
${
csudo
}
cp
-f
${
script_dir
}
/../rpm/taosd
${
install_main_dir
}
/init.d
${
csudo
}
cp
-f
${
script_dir
}
/../rpm/taosd
${
install_main_dir
}
/init.d
${
csudo
}
cp
${
script_dir
}
/../rpm/taosd
${
service_config_dir
}
&&
${
csudo
}
chmod
a+x
${
service_config_dir
}
/taosd
${
csudo
}
cp
${
script_dir
}
/../rpm/taosd
${
service_config_dir
}
&&
${
csudo
}
chmod
a+x
${
service_config_dir
}
/taosd
fi
fi
#restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
#restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
#${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
#${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
if
((
${
initd_mod
}
==
1
))
;
then
if
((
${
initd_mod
}
==
1
))
;
then
${
csudo
}
chkconfig
--add
taosd
||
:
${
csudo
}
chkconfig
--add
taosd
||
:
${
csudo
}
chkconfig
--level
2345 taosd on
||
:
${
csudo
}
chkconfig
--level
2345 taosd on
||
:
...
@@ -323,7 +368,7 @@ function clean_service_on_systemd() {
...
@@ -323,7 +368,7 @@ function clean_service_on_systemd() {
${
csudo
}
systemctl disable taosd &> /dev/null
||
echo
&> /dev/null
${
csudo
}
systemctl disable taosd &> /dev/null
||
echo
&> /dev/null
${
csudo
}
rm
-f
${
taosd_service_config
}
${
csudo
}
rm
-f
${
taosd_service_config
}
}
}
# taos:2345:respawn:/etc/init.d/taosd start
# taos:2345:respawn:/etc/init.d/taosd start
...
@@ -383,7 +428,7 @@ function update_TDengine() {
...
@@ -383,7 +428,7 @@ function update_TDengine() {
sleep
1
sleep
1
fi
fi
fi
fi
install_main_path
install_main_path
install_log
install_log
...
@@ -431,16 +476,16 @@ function install_TDengine() {
...
@@ -431,16 +476,16 @@ function install_TDengine() {
# Start to install
# Start to install
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
"
$osType
"
!=
"Darwin"
]
;
then
echo
-e
"
${
GREEN
}
Start to install TDEngine...
${
NC
}
"
echo
-e
"
${
GREEN
}
Start to install TDEngine...
${
NC
}
"
else
else
echo
-e
"
${
GREEN
}
Start to install TDEngine Client ...
${
NC
}
"
echo
-e
"
${
GREEN
}
Start to install TDEngine Client ...
${
NC
}
"
fi
fi
install_main_path
install_main_path
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
"
$osType
"
!=
"Darwin"
]
;
then
install_data
install_data
fi
fi
install_log
install_log
install_header
install_header
install_lib
install_lib
install_connector
install_connector
...
@@ -452,7 +497,7 @@ function install_TDengine() {
...
@@ -452,7 +497,7 @@ function install_TDengine() {
install_service
install_service
fi
fi
install_config
install_config
if
[
"
$osType
"
!=
"Darwin"
]
;
then
if
[
"
$osType
"
!=
"Darwin"
]
;
then
# Ask if to start the service
# Ask if to start the service
...
...
packaging/tools/makepkg.sh
浏览文件 @
bf97833c
...
@@ -30,12 +30,12 @@ else
...
@@ -30,12 +30,12 @@ else
install_dir
=
"
${
release_dir
}
/TDengine-server-
${
version
}
"
install_dir
=
"
${
release_dir
}
/TDengine-server-
${
version
}
"
fi
fi
# Directories and files
.
# Directories and files
if
[
"
$pagMode
"
==
"lite"
]
;
then
if
[
"
$pagMode
"
==
"lite"
]
;
then
strip
${
build_dir
}
/bin/taosd
strip
${
build_dir
}
/bin/taosd
strip
${
build_dir
}
/bin/taos
strip
${
build_dir
}
/bin/taos
bin_files
=
"
${
build_dir
}
/bin/taosd
${
build_dir
}
/bin/taos
${
script_dir
}
/remove.sh"
bin_files
=
"
${
build_dir
}
/bin/taosd
${
build_dir
}
/bin/taos
${
script_dir
}
/remove.sh"
else
else
bin_files
=
"
${
build_dir
}
/bin/taosd
${
build_dir
}
/bin/taos
${
build_dir
}
/bin/taosdump
${
build_dir
}
/bin/taosdemo
${
build_dir
}
/bin/tarbitrator
\
bin_files
=
"
${
build_dir
}
/bin/taosd
${
build_dir
}
/bin/taos
${
build_dir
}
/bin/taosdump
${
build_dir
}
/bin/taosdemo
${
build_dir
}
/bin/tarbitrator
\
${
script_dir
}
/remove.sh
${
script_dir
}
/set_core.sh
${
script_dir
}
/startPre.sh
${
script_dir
}
/taosd-dump-cfg.gdb"
${
script_dir
}
/remove.sh
${
script_dir
}
/set_core.sh
${
script_dir
}
/startPre.sh
${
script_dir
}
/taosd-dump-cfg.gdb"
fi
fi
...
@@ -73,10 +73,43 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taos
...
@@ -73,10 +73,43 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taos
mkdir
-p
${
install_dir
}
/init.d
&&
cp
${
init_file_tarbitrator_deb
}
${
install_dir
}
/init.d/tarbitratord.deb
||
:
mkdir
-p
${
install_dir
}
/init.d
&&
cp
${
init_file_tarbitrator_deb
}
${
install_dir
}
/init.d/tarbitratord.deb
||
:
mkdir
-p
${
install_dir
}
/init.d
&&
cp
${
init_file_tarbitrator_rpm
}
${
install_dir
}
/init.d/tarbitratord.rpm
||
:
mkdir
-p
${
install_dir
}
/init.d
&&
cp
${
init_file_tarbitrator_rpm
}
${
install_dir
}
/init.d/tarbitratord.rpm
||
:
if
[
-f
${
build_dir
}
/bin/jemalloc-config
]
;
then
mkdir
-p
${
install_dir
}
/jemalloc/
{
bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3
}
cp
${
build_dir
}
/bin/jemalloc-config
${
install_dir
}
/jemalloc/bin
if
[
-f
${
build_dir
}
/bin/jemalloc.sh
]
;
then
cp
${
build_dir
}
/bin/jemalloc.sh
${
install_dir
}
/jemalloc/bin
fi
if
[
-f
${
build_dir
}
/bin/jeprof
]
;
then
cp
${
build_dir
}
/bin/jeprof
${
install_dir
}
/jemalloc/bin
fi
if
[
-f
${
build_dir
}
/include/jemalloc/jemalloc.h
]
;
then
cp
${
build_dir
}
/include/jemalloc/jemalloc.h
${
install_dir
}
/jemalloc/include/jemalloc
fi
if
[
-f
${
build_dir
}
/lib/libjemalloc.so.2
]
;
then
cp
${
build_dir
}
/lib/libjemalloc.so.2
${
install_dir
}
/jemalloc/lib
ln
-sf
libjemalloc.so.2
${
install_dir
}
/jemalloc/lib/libjemalloc.so
fi
if
[
-f
${
build_dir
}
/lib/libjemalloc.a
]
;
then
cp
${
build_dir
}
/lib/libjemalloc.a
${
install_dir
}
/jemalloc/lib
fi
if
[
-f
${
build_dir
}
/lib/libjemalloc_pic.a
]
;
then
cp
${
build_dir
}
/lib/libjemalloc_pic.a
${
install_dir
}
/jemalloc/lib
fi
if
[
-f
${
build_dir
}
/lib/pkgconfig/jemalloc.pc
]
;
then
cp
${
build_dir
}
/lib/pkgconfig/jemalloc.pc
${
install_dir
}
/jemalloc/lib/pkgconfig
fi
if
[
-f
${
build_dir
}
/share/doc/jemalloc/jemalloc.html
]
;
then
cp
${
build_dir
}
/share/doc/jemalloc/jemalloc.html
${
install_dir
}
/jemalloc/share/doc/jemalloc
fi
if
[
-f
${
build_dir
}
/share/man/man3/jemalloc.3
]
;
then
cp
${
build_dir
}
/share/man/man3/jemalloc.3
${
install_dir
}
/jemalloc/share/man/man3
fi
fi
if
[
"
$verMode
"
==
"cluster"
]
;
then
if
[
"
$verMode
"
==
"cluster"
]
;
then
sed
's/verMode=edge/verMode=cluster/g'
${
install_dir
}
/bin/remove.sh
>>
remove_temp.sh
sed
's/verMode=edge/verMode=cluster/g'
${
install_dir
}
/bin/remove.sh
>>
remove_temp.sh
mv
remove_temp.sh
${
install_dir
}
/bin/remove.sh
mv
remove_temp.sh
${
install_dir
}
/bin/remove.sh
mkdir
-p
${
install_dir
}
/nginxd
&&
cp
-r
${
nginx_dir
}
/
*
${
install_dir
}
/nginxd
mkdir
-p
${
install_dir
}
/nginxd
&&
cp
-r
${
nginx_dir
}
/
*
${
install_dir
}
/nginxd
cp
${
nginx_dir
}
/png/taos.png
${
install_dir
}
/nginxd/admin/images/taos.png
cp
${
nginx_dir
}
/png/taos.png
${
install_dir
}
/nginxd/admin/images/taos.png
rm
-rf
${
install_dir
}
/nginxd/png
rm
-rf
${
install_dir
}
/nginxd/png
...
@@ -132,7 +165,7 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
...
@@ -132,7 +165,7 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
if
[
-d
${
examples_dir
}
/JDBC/taosdemo/target
]
;
then
if
[
-d
${
examples_dir
}
/JDBC/taosdemo/target
]
;
then
rm
-rf
${
examples_dir
}
/JDBC/taosdemo/target
rm
-rf
${
examples_dir
}
/JDBC/taosdemo/target
fi
fi
cp
-r
${
examples_dir
}
/JDBC
${
install_dir
}
/examples
cp
-r
${
examples_dir
}
/JDBC
${
install_dir
}
/examples
cp
-r
${
examples_dir
}
/matlab
${
install_dir
}
/examples
cp
-r
${
examples_dir
}
/matlab
${
install_dir
}
/examples
cp
-r
${
examples_dir
}
/python
${
install_dir
}
/examples
cp
-r
${
examples_dir
}
/python
${
install_dir
}
/examples
...
@@ -142,7 +175,7 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
...
@@ -142,7 +175,7 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
cp
-r
${
examples_dir
}
/C#
${
install_dir
}
/examples
cp
-r
${
examples_dir
}
/C#
${
install_dir
}
/examples
fi
fi
# Copy driver
# Copy driver
mkdir
-p
${
install_dir
}
/driver
mkdir
-p
${
install_dir
}
/driver
cp
${
lib_files
}
${
install_dir
}
/driver
cp
${
lib_files
}
${
install_dir
}
/driver
# Copy connector
# Copy connector
...
@@ -168,7 +201,7 @@ fi
...
@@ -168,7 +201,7 @@ fi
# exit 1
# exit 1
cd
${
release_dir
}
cd
${
release_dir
}
if
[
"
$verMode
"
==
"cluster"
]
;
then
if
[
"
$verMode
"
==
"cluster"
]
;
then
pkg_name
=
${
install_dir
}
-
${
osType
}
-
${
cpuType
}
pkg_name
=
${
install_dir
}
-
${
osType
}
-
${
cpuType
}
...
@@ -185,8 +218,8 @@ fi
...
@@ -185,8 +218,8 @@ fi
if
[
"
$verType
"
==
"beta"
]
;
then
if
[
"
$verType
"
==
"beta"
]
;
then
pkg_name
=
${
pkg_name
}
-
${
verType
}
pkg_name
=
${
pkg_name
}
-
${
verType
}
elif
[
"
$verType
"
==
"stable"
]
;
then
elif
[
"
$verType
"
==
"stable"
]
;
then
pkg_name
=
${
pkg_name
}
pkg_name
=
${
pkg_name
}
else
else
echo
"unknow verType, nor stabel or beta"
echo
"unknow verType, nor stabel or beta"
exit
1
exit
1
...
...
src/client/src/tscSub.c
浏览文件 @
bf97833c
...
@@ -509,6 +509,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
...
@@ -509,6 +509,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
}
}
pSub
->
pSql
=
pSql
;
pSub
->
pSql
=
pSql
;
pSql
->
pSubscription
=
pSub
;
pSql
->
pSubscription
=
pSub
;
pSub
->
lastSyncTime
=
0
;
// no table list now, force to update it
// no table list now, force to update it
tscDebug
(
"begin table synchronization"
);
tscDebug
(
"begin table synchronization"
);
...
...
src/dnode/CMakeLists.txt
浏览文件 @
bf97833c
...
@@ -10,8 +10,15 @@ INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
...
@@ -10,8 +10,15 @@ INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
INCLUDE_DIRECTORIES
(
inc
)
INCLUDE_DIRECTORIES
(
inc
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
AUX_SOURCE_DIRECTORY
(
src SRC
)
IF
(
TD_LINUX_64 AND JEMALLOC_ENABLED
)
ADD_DEFINITIONS
(
-DTD_JEMALLOC_ENABLED -I
${
CMAKE_BINARY_DIR
}
/build/include -L
${
CMAKE_BINARY_DIR
}
/build/lib -Wl,-rpath,
${
CMAKE_BINARY_DIR
}
/build/lib -ljemalloc
)
SET
(
LINK_JEMALLOC
"-L
${
CMAKE_BINARY_DIR
}
/build/lib -ljemalloc"
)
ELSE
()
SET
(
LINK_JEMALLOC
""
)
ENDIF
()
ADD_EXECUTABLE
(
taosd
${
SRC
}
)
ADD_EXECUTABLE
(
taosd
${
SRC
}
)
TARGET_LINK_LIBRARIES
(
taosd mnode monitor http tsdb twal vnode cJson lz4 balance sync
)
TARGET_LINK_LIBRARIES
(
taosd mnode monitor http tsdb twal vnode cJson lz4 balance sync
${
LINK_JEMALLOC
}
)
IF
(
TD_SOMODE_STATIC
)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
taosd taos_static
)
TARGET_LINK_LIBRARIES
(
taosd taos_static
)
...
...
src/dnode/src/dnodeMain.c
浏览文件 @
bf97833c
...
@@ -253,6 +253,8 @@ static int32_t dnodeInitStorage() {
...
@@ -253,6 +253,8 @@ static int32_t dnodeInitStorage() {
dnodeCheckDataDirOpenned
(
tsDnodeDir
);
dnodeCheckDataDirOpenned
(
tsDnodeDir
);
taosGetDisk
();
taosPrintDiskInfo
();
dInfo
(
"dnode storage is initialized at %s"
,
tsDnodeDir
);
dInfo
(
"dnode storage is initialized at %s"
,
tsDnodeDir
);
return
0
;
return
0
;
}
}
...
...
src/kit/shell/CMakeLists.txt
浏览文件 @
bf97833c
...
@@ -11,10 +11,17 @@ IF (TD_LINUX)
...
@@ -11,10 +11,17 @@ IF (TD_LINUX)
LIST
(
REMOVE_ITEM SRC ./src/shellDarwin.c
)
LIST
(
REMOVE_ITEM SRC ./src/shellDarwin.c
)
ADD_EXECUTABLE
(
shell
${
SRC
}
)
ADD_EXECUTABLE
(
shell
${
SRC
}
)
IF
(
TD_LINUX_64 AND JEMALLOC_ENABLED
)
ADD_DEFINITIONS
(
-DTD_JEMALLOC_ENABLED -I
${
CMAKE_BINARY_DIR
}
/build/include -L
${
CMAKE_BINARY_DIR
}
/build/lib -Wl,-rpath,
${
CMAKE_BINARY_DIR
}
/build/lib -ljemalloc
)
SET
(
LINK_JEMALLOC
"-L
${
CMAKE_BINARY_DIR
}
/build/lib -ljemalloc"
)
ELSE
()
SET
(
LINK_JEMALLOC
""
)
ENDIF
()
IF
(
TD_SOMODE_STATIC
)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
shell taos_static
)
TARGET_LINK_LIBRARIES
(
shell taos_static
${
LINK_JEMALLOC
}
)
ELSE
()
ELSE
()
TARGET_LINK_LIBRARIES
(
shell taos
)
TARGET_LINK_LIBRARIES
(
shell taos
${
LINK_JEMALLOC
}
)
ENDIF
()
ENDIF
()
SET_TARGET_PROPERTIES
(
shell PROPERTIES OUTPUT_NAME taos
)
SET_TARGET_PROPERTIES
(
shell PROPERTIES OUTPUT_NAME taos
)
...
...
src/kit/taosdemo/CMakeLists.txt
浏览文件 @
bf97833c
...
@@ -55,14 +55,21 @@ ENDIF ()
...
@@ -55,14 +55,21 @@ ENDIF ()
MESSAGE
(
"TD_VERSION_NUMBER is:"
${
TD_VERSION_NUMBER
}
)
MESSAGE
(
"TD_VERSION_NUMBER is:"
${
TD_VERSION_NUMBER
}
)
ADD_DEFINITIONS
(
-DTD_VERNUMBER=
"
${
TD_VERSION_NUMBER
}
"
)
ADD_DEFINITIONS
(
-DTD_VERNUMBER=
"
${
TD_VERSION_NUMBER
}
"
)
IF
(
TD_LINUX_64 AND JEMALLOC_ENABLED
)
ADD_DEFINITIONS
(
-DTD_JEMALLOC_ENABLED -I
${
CMAKE_BINARY_DIR
}
/build/include -L
${
CMAKE_BINARY_DIR
}
/build/lib -Wl,-rpath,
${
CMAKE_BINARY_DIR
}
/build/lib -ljemalloc
)
SET
(
LINK_JEMALLOC
"-L
${
CMAKE_BINARY_DIR
}
/build/lib -ljemalloc"
)
ELSE
()
SET
(
LINK_JEMALLOC
""
)
ENDIF
()
IF
(
TD_LINUX
)
IF
(
TD_LINUX
)
AUX_SOURCE_DIRECTORY
(
. SRC
)
AUX_SOURCE_DIRECTORY
(
. SRC
)
ADD_EXECUTABLE
(
taosdemo
${
SRC
}
)
ADD_EXECUTABLE
(
taosdemo
${
SRC
}
)
IF
(
TD_SOMODE_STATIC
)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
taosdemo taos_static cJson
)
TARGET_LINK_LIBRARIES
(
taosdemo taos_static cJson
${
LINK_JEMALLOC
}
)
ELSE
()
ELSE
()
TARGET_LINK_LIBRARIES
(
taosdemo taos cJson
)
TARGET_LINK_LIBRARIES
(
taosdemo taos cJson
${
LINK_JEMALLOC
}
)
ENDIF
()
ENDIF
()
ELSEIF
(
TD_WINDOWS
)
ELSEIF
(
TD_WINDOWS
)
AUX_SOURCE_DIRECTORY
(
. SRC
)
AUX_SOURCE_DIRECTORY
(
. SRC
)
...
@@ -71,7 +78,7 @@ ELSEIF (TD_WINDOWS)
...
@@ -71,7 +78,7 @@ ELSEIF (TD_WINDOWS)
IF
(
TD_SOMODE_STATIC
)
IF
(
TD_SOMODE_STATIC
)
TARGET_LINK_LIBRARIES
(
taosdemo taos_static cJson
)
TARGET_LINK_LIBRARIES
(
taosdemo taos_static cJson
)
ELSE
()
ELSE
()
TARGET_LINK_LIBRARIES
(
taosdemo taos cJson
}
)
TARGET_LINK_LIBRARIES
(
taosdemo taos cJson
)
ENDIF
()
ENDIF
()
ELSEIF
(
TD_DARWIN
)
ELSEIF
(
TD_DARWIN
)
# missing a few dependencies, such as <argp.h>
# missing a few dependencies, such as <argp.h>
...
...
src/mnode/src/mnodeDnode.c
浏览文件 @
bf97833c
...
@@ -101,6 +101,8 @@ static int32_t mnodeDnodeActionInsert(SSdbRow *pRow) {
...
@@ -101,6 +101,8 @@ static int32_t mnodeDnodeActionInsert(SSdbRow *pRow) {
pDnode
->
offlineReason
=
TAOS_DN_OFF_STATUS_NOT_RECEIVED
;
pDnode
->
offlineReason
=
TAOS_DN_OFF_STATUS_NOT_RECEIVED
;
}
}
pDnode
->
customScore
=
0
;
dnodeUpdateEp
(
pDnode
->
dnodeId
,
pDnode
->
dnodeEp
,
pDnode
->
dnodeFqdn
,
&
pDnode
->
dnodePort
);
dnodeUpdateEp
(
pDnode
->
dnodeId
,
pDnode
->
dnodeEp
,
pDnode
->
dnodeFqdn
,
&
pDnode
->
dnodePort
);
mnodeUpdateDnodeEps
();
mnodeUpdateDnodeEps
();
...
...
src/os/inc/osMemory.h
浏览文件 @
bf97833c
...
@@ -22,6 +22,10 @@
...
@@ -22,6 +22,10 @@
extern
"C"
{
extern
"C"
{
#endif
#endif
#ifdef TD_JEMALLOC_ENABLED
#include <jemalloc/jemalloc.h>
#endif
typedef
enum
{
typedef
enum
{
TAOS_ALLOC_MODE_DEFAULT
=
0
,
TAOS_ALLOC_MODE_DEFAULT
=
0
,
TAOS_ALLOC_MODE_RANDOM_FAIL
=
1
,
TAOS_ALLOC_MODE_RANDOM_FAIL
=
1
,
...
...
src/os/inc/osSysinfo.h
浏览文件 @
bf97833c
...
@@ -36,6 +36,7 @@ bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) ;
...
@@ -36,6 +36,7 @@ bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) ;
bool
taosGetProcMemory
(
float
*
memoryUsedMB
)
;
bool
taosGetProcMemory
(
float
*
memoryUsedMB
)
;
bool
taosGetSysMemory
(
float
*
memoryUsedMB
);
bool
taosGetSysMemory
(
float
*
memoryUsedMB
);
void
taosPrintOsInfo
();
void
taosPrintOsInfo
();
void
taosPrintDiskInfo
();
int
taosSystem
(
const
char
*
cmd
)
;
int
taosSystem
(
const
char
*
cmd
)
;
void
taosKillSystem
();
void
taosKillSystem
();
bool
taosGetSystemUid
(
char
*
uid
);
bool
taosGetSystemUid
(
char
*
uid
);
...
...
src/os/src/darwin/darwinSysInfo.c
浏览文件 @
bf97833c
...
@@ -137,9 +137,6 @@ void taosPrintOsInfo() {
...
@@ -137,9 +137,6 @@ void taosPrintOsInfo() {
// uInfo(" os openMax: %" PRId64, tsOpenMax);
// uInfo(" os openMax: %" PRId64, tsOpenMax);
// uInfo(" os streamMax: %" PRId64, tsStreamMax);
// uInfo(" os streamMax: %" PRId64, tsStreamMax);
uInfo
(
" os numOfCores: %d"
,
tsNumOfCores
);
uInfo
(
" os numOfCores: %d"
,
tsNumOfCores
);
uInfo
(
" os totalDisk: %f(GB)"
,
tsTotalDataDirGB
);
uInfo
(
" os usedDisk: %f(GB)"
,
tsUsedDataDirGB
);
uInfo
(
" os availDisk: %f(GB)"
,
tsAvailDataDirGB
);
uInfo
(
" os totalMemory: %d(MB)"
,
tsTotalMemoryMB
);
uInfo
(
" os totalMemory: %d(MB)"
,
tsTotalMemoryMB
);
struct
utsname
buf
;
struct
utsname
buf
;
...
@@ -155,6 +152,14 @@ void taosPrintOsInfo() {
...
@@ -155,6 +152,14 @@ void taosPrintOsInfo() {
uInfo
(
"=================================="
);
uInfo
(
"=================================="
);
}
}
void
taosPrintDiskInfo
()
{
uInfo
(
"=================================="
);
uInfo
(
" os totalDisk: %f(GB)"
,
tsTotalDataDirGB
);
uInfo
(
" os usedDisk: %f(GB)"
,
tsUsedDataDirGB
);
uInfo
(
" os availDisk: %f(GB)"
,
tsAvailDataDirGB
);
uInfo
(
"=================================="
);
}
void
taosKillSystem
()
{
void
taosKillSystem
()
{
uError
(
"function taosKillSystem, exit!"
);
uError
(
"function taosKillSystem, exit!"
);
exit
(
0
);
exit
(
0
);
...
...
src/os/src/detail/osSysinfo.c
浏览文件 @
bf97833c
...
@@ -506,9 +506,6 @@ void taosPrintOsInfo() {
...
@@ -506,9 +506,6 @@ void taosPrintOsInfo() {
uInfo
(
" os openMax: %"
PRId64
,
tsOpenMax
);
uInfo
(
" os openMax: %"
PRId64
,
tsOpenMax
);
uInfo
(
" os streamMax: %"
PRId64
,
tsStreamMax
);
uInfo
(
" os streamMax: %"
PRId64
,
tsStreamMax
);
uInfo
(
" os numOfCores: %d"
,
tsNumOfCores
);
uInfo
(
" os numOfCores: %d"
,
tsNumOfCores
);
uInfo
(
" os totalDisk: %f(GB)"
,
tsTotalDataDirGB
);
uInfo
(
" os usedDisk: %f(GB)"
,
tsUsedDataDirGB
);
uInfo
(
" os availDisk: %f(GB)"
,
tsAvailDataDirGB
);
uInfo
(
" os totalMemory: %d(MB)"
,
tsTotalMemoryMB
);
uInfo
(
" os totalMemory: %d(MB)"
,
tsTotalMemoryMB
);
struct
utsname
buf
;
struct
utsname
buf
;
...
@@ -523,6 +520,14 @@ void taosPrintOsInfo() {
...
@@ -523,6 +520,14 @@ void taosPrintOsInfo() {
uInfo
(
" os machine: %s"
,
buf
.
machine
);
uInfo
(
" os machine: %s"
,
buf
.
machine
);
}
}
void
taosPrintDiskInfo
()
{
uInfo
(
"=================================="
);
uInfo
(
" os totalDisk: %f(GB)"
,
tsTotalDataDirGB
);
uInfo
(
" os usedDisk: %f(GB)"
,
tsUsedDataDirGB
);
uInfo
(
" os availDisk: %f(GB)"
,
tsAvailDataDirGB
);
uInfo
(
"=================================="
);
}
void
taosKillSystem
()
{
void
taosKillSystem
()
{
// SIGINT
// SIGINT
uInfo
(
"taosd will shut down soon"
);
uInfo
(
"taosd will shut down soon"
);
...
...
src/os/src/windows/wSysinfo.c
浏览文件 @
bf97833c
...
@@ -205,10 +205,15 @@ void taosGetSystemInfo() {
...
@@ -205,10 +205,15 @@ void taosGetSystemInfo() {
void
taosPrintOsInfo
()
{
void
taosPrintOsInfo
()
{
uInfo
(
" os numOfCores: %d"
,
tsNumOfCores
);
uInfo
(
" os numOfCores: %d"
,
tsNumOfCores
);
uInfo
(
" os totalMemory: %d(MB)"
,
tsTotalMemoryMB
);
uInfo
(
"=================================="
);
}
void
taosPrintDiskInfo
()
{
uInfo
(
"=================================="
);
uInfo
(
" os totalDisk: %f(GB)"
,
tsTotalDataDirGB
);
uInfo
(
" os totalDisk: %f(GB)"
,
tsTotalDataDirGB
);
uInfo
(
" os usedDisk: %f(GB)"
,
tsUsedDataDirGB
);
uInfo
(
" os usedDisk: %f(GB)"
,
tsUsedDataDirGB
);
uInfo
(
" os availDisk: %f(GB)"
,
tsAvailDataDirGB
);
uInfo
(
" os availDisk: %f(GB)"
,
tsAvailDataDirGB
);
uInfo
(
" os totalMemory: %d(MB)"
,
tsTotalMemoryMB
);
uInfo
(
"=================================="
);
uInfo
(
"=================================="
);
}
}
...
...
tests/pytest/dockerCluster/OneMnodeMultipleVnodesTest.py
浏览文件 @
bf97833c
...
@@ -12,9 +12,6 @@
...
@@ -12,9 +12,6 @@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
from
basic
import
*
from
basic
import
*
from
util.sql
import
tdSql
class
TDTestCase
:
class
TDTestCase
:
...
@@ -36,4 +33,6 @@ td = TDTestCase()
...
@@ -36,4 +33,6 @@ td = TDTestCase()
td
.
init
()
td
.
init
()
## usage: python3 OneMnodeMultipleVnodesTest.py
tests/pytest/dockerCluster/basic.py
浏览文件 @
bf97833c
...
@@ -44,7 +44,16 @@ class BuildDockerCluser:
...
@@ -44,7 +44,16 @@ class BuildDockerCluser:
"jnidebugFlag"
:
"135"
,
"jnidebugFlag"
:
"135"
,
"qdebugFlag"
:
"135"
,
"qdebugFlag"
:
"135"
,
"maxSQLLength"
:
"1048576"
"maxSQLLength"
:
"1048576"
}
}
cmd
=
"mkdir -p %s"
%
self
.
dockerDir
self
.
execCmd
(
cmd
)
cmd
=
"cp *.yml %s"
%
self
.
dockerDir
self
.
execCmd
(
cmd
)
cmd
=
"cp Dockerfile %s"
%
self
.
dockerDir
self
.
execCmd
(
cmd
)
# execute command, and return the output
# execute command, and return the output
# ref: https://blog.csdn.net/wowocpp/article/details/80775650
# ref: https://blog.csdn.net/wowocpp/article/details/80775650
...
@@ -81,7 +90,7 @@ class BuildDockerCluser:
...
@@ -81,7 +90,7 @@ class BuildDockerCluser:
def
removeFile
(
self
,
rootDir
,
index
,
dir
):
def
removeFile
(
self
,
rootDir
,
index
,
dir
):
cmd
=
"rm -rf %s/node%d/%s/*"
%
(
rootDir
,
index
,
dir
)
cmd
=
"rm -rf %s/node%d/%s/*"
%
(
rootDir
,
index
,
dir
)
self
.
execCmd
(
cmd
)
self
.
execCmd
(
cmd
)
def
clearEnv
(
self
):
def
clearEnv
(
self
):
cmd
=
"cd %s && docker-compose down --remove-orphans"
%
self
.
dockerDir
cmd
=
"cd %s && docker-compose down --remove-orphans"
%
self
.
dockerDir
self
.
execCmd
(
cmd
)
self
.
execCmd
(
cmd
)
...
@@ -108,10 +117,14 @@ class BuildDockerCluser:
...
@@ -108,10 +117,14 @@ class BuildDockerCluser:
self
.
execCmd
(
cmd
)
self
.
execCmd
(
cmd
)
def
updateLocalhosts
(
self
):
def
updateLocalhosts
(
self
):
cmd
=
"grep '172.27.0.7 *tdnode1' /etc/hosts"
cmd
=
"grep '172.27.0.7 *tdnode1' /etc/hosts
| sed 's: ::g'
"
result
=
self
.
execCmdAndGetOutput
(
cmd
)
result
=
self
.
execCmdAndGetOutput
(
cmd
)
if
result
and
not
result
.
isspace
():
print
(
result
)
if
result
is
None
or
result
.
isspace
():
print
(
"=========="
)
cmd
=
"echo '172.27.0.7 tdnode1' >> /etc/hosts"
cmd
=
"echo '172.27.0.7 tdnode1' >> /etc/hosts"
display
=
"echo %s"
%
cmd
self
.
execCmd
(
display
)
self
.
execCmd
(
cmd
)
self
.
execCmd
(
cmd
)
def
deploy
(
self
):
def
deploy
(
self
):
...
@@ -138,13 +151,13 @@ class BuildDockerCluser:
...
@@ -138,13 +151,13 @@ class BuildDockerCluser:
if
self
.
numOfNodes
<
2
or
self
.
numOfNodes
>
10
:
if
self
.
numOfNodes
<
2
or
self
.
numOfNodes
>
10
:
print
(
"the number of nodes must be between 2 and 10"
)
print
(
"the number of nodes must be between 2 and 10"
)
exit
(
0
)
exit
(
0
)
self
.
clearEnv
()
self
.
createDirs
()
self
.
updateLocalhosts
()
self
.
updateLocalhosts
()
self
.
deploy
()
self
.
deploy
()
def
run
(
self
):
def
run
(
self
):
cmd
=
"./buildClusterEnv.sh -n %d -v %s -d %s"
%
(
self
.
numOfNodes
,
self
.
getTaosdVersion
(),
self
.
dockerDir
)
cmd
=
"./buildClusterEnv.sh -n %d -v %s -d %s"
%
(
self
.
numOfNodes
,
self
.
getTaosdVersion
(),
self
.
dockerDir
)
display
=
"echo %s"
%
cmd
self
.
execCmd
(
display
)
self
.
execCmd
(
cmd
)
self
.
execCmd
(
cmd
)
self
.
getConnection
()
self
.
getConnection
()
self
.
createDondes
()
self
.
createDondes
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录