Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
26b4478d
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
26b4478d
编写于
8月 13, 2020
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into feature/query
上级
d1382a7a
adb47354
变更
24
隐藏空白更改
内联
并排
Showing
24 changed file
with
168 addition
and
49 deletion
+168
-49
README.md
README.md
+1
-0
packaging/release.sh
packaging/release.sh
+38
-17
packaging/tools/install.sh
packaging/tools/install.sh
+8
-2
packaging/tools/install_client.sh
packaging/tools/install_client.sh
+9
-2
packaging/tools/make_install.sh
packaging/tools/make_install.sh
+12
-0
packaging/tools/makeclient.sh
packaging/tools/makeclient.sh
+1
-1
packaging/tools/makepkg.sh
packaging/tools/makepkg.sh
+1
-1
packaging/tools/post.sh
packaging/tools/post.sh
+2
-1
packaging/tools/preun.sh
packaging/tools/preun.sh
+5
-2
packaging/tools/set_core.sh
packaging/tools/set_core.sh
+20
-0
src/common/src/tglobal.c
src/common/src/tglobal.c
+1
-1
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
...r/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
+1
-1
src/connector/jdbc/src/test/java/TestAsyncTSDBSubscribe.java
src/connector/jdbc/src/test/java/TestAsyncTSDBSubscribe.java
+7
-5
src/inc/taosdef.h
src/inc/taosdef.h
+1
-0
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+4
-0
src/plugins/monitor/src/monitorMain.c
src/plugins/monitor/src/monitorMain.c
+1
-1
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+1
-1
src/tsdb/src/tsdbRead.c
src/tsdb/src/tsdbRead.c
+2
-2
src/util/src/version.c
src/util/src/version.c
+5
-5
tests/pytest/client/client.py
tests/pytest/client/client.py
+1
-7
tests/pytest/client/version.py
tests/pytest/client/version.py
+41
-0
tests/pytest/fulltest.sh
tests/pytest/fulltest.sh
+1
-0
tests/pytest/regressiontest.sh
tests/pytest/regressiontest.sh
+1
-0
tests/tsim/src/simExe.c
tests/tsim/src/simExe.c
+4
-0
未找到文件。
README.md
浏览文件 @
26b4478d
[
![Build Status
](
https://travis-ci.org/taosdata/TDengine.svg?branch=master
)
](https://travis-ci.org/taosdata/TDengine)
[
![Build status
](
https://ci.appveyor.com/api/projects/status/kf3pwh2or5afsgl9/branch/master?svg=true
)
](https://ci.appveyor.com/project/sangshuduo/tdengine-2n8ge/branch/master)
[
![Coverage Status
](
https://coveralls.io/repos/github/taosdata/TDengine/badge.svg?branch=develop
)
](https://coveralls.io/github/taosdata/TDengine?branch=develop)
[
![CII Best Practices
](
https://bestpractices.coreinfrastructure.org/projects/4201/badge
)
](https://bestpractices.coreinfrastructure.org/projects/4201)
[
![TDengine
](
TDenginelogo.png
)
](https://www.taosdata.com)
...
...
packaging/release.sh
浏览文件 @
26b4478d
...
...
@@ -10,6 +10,7 @@ set -e
# -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
# -V [stable | beta]
# -l [full | lite]
# -n [2.0.0.3]
# set parameters by default value
verMode
=
edge
# [cluster, edge]
...
...
@@ -17,8 +18,9 @@ verType=stable # [stable, beta]
cpuType
=
x64
# [aarch32 | aarch64 | x64 | x86 | mips64 ...]
osType
=
Linux
# [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
pagMode
=
full
# [full | lite]
verNumber
=
""
while
getopts
"hv:V:c:o:l:"
arg
while
getopts
"hv:V:c:o:l:
n:
"
arg
do
case
$arg
in
v
)
...
...
@@ -37,12 +39,21 @@ do
#echo "pagMode=$OPTARG"
pagMode
=
$(
echo
$OPTARG
)
;;
n
)
#echo "verNumber=$OPTARG"
verNumber
=
$(
echo
$OPTARG
)
;;
o
)
#echo "osType=$OPTARG"
osType
=
$(
echo
$OPTARG
)
;;
h
)
echo
"Usage:
`
basename
$0
`
-v [cluster | edge] -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...] -V [stable | beta] -l [full | lite]"
echo
"Usage:
`
basename
$0
`
-v [cluster | edge] "
echo
" -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] "
echo
" -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...] "
echo
" -V [stable | beta] "
echo
" -l [full | lite] "
echo
" -n [version number] "
exit
0
;;
?
)
#unknow option
...
...
@@ -52,7 +63,7 @@ do
esac
done
echo
"verMode=
${
verMode
}
verType=
${
verType
}
cpuType=
${
cpuType
}
osType=
${
osType
}
pagMode=
${
pagMode
}
"
echo
"verMode=
${
verMode
}
verType=
${
verType
}
cpuType=
${
cpuType
}
osType=
${
osType
}
pagMode=
${
pagMode
}
verNumber=
${
verNumber
}
"
curr_dir
=
$(
pwd
)
...
...
@@ -80,7 +91,6 @@ function is_valid_version() {
if
[[
$1
=
~
$rx
]]
;
then
return
0
fi
return
1
}
...
...
@@ -89,26 +99,25 @@ function vercomp () {
echo
0
exit
0
fi
local
IFS
=
.
local
i
ver1
=(
$1
)
ver2
=(
$2
)
# fill empty fields in ver1 with zeros
for
((
i
=
${#
ver1
[@]
}
;
i<
${#
ver2
[@]
}
;
i++
))
;
do
ver1[i]
=
0
done
for
((
i
=
0
;
i<
${#
ver1
[@]
}
;
i++
))
;
do
if
[[
-z
${
ver2
[i]
}
]]
then
if
[[
-z
${
ver2
[i]
}
]]
;
then
# fill empty fields in ver2 with zeros
ver2[i]
=
0
fi
if
((
10#
${
ver1
[i]
}
>
10#
${
ver2
[i]
}
))
then
if
((
10#
${
ver1
[i]
}
>
10#
${
ver2
[i]
}
))
;
then
echo
1
exit
0
fi
if
((
10#
${
ver1
[i]
}
< 10#
${
ver2
[i]
}
))
then
if
((
10#
${
ver1
[i]
}
< 10#
${
ver2
[i]
}
))
;
then
echo
2
exit
0
fi
...
...
@@ -120,10 +129,11 @@ function vercomp () {
version
=
$(
cat
${
versioninfo
}
|
grep
" version"
|
cut
-d
'"'
-f2
)
compatible_version
=
$(
cat
${
versioninfo
}
|
grep
" compatible_version"
|
cut
-d
'"'
-f2
)
while
true
;
do
read
-p
"Do you want to release a new version? [y/N]: "
is_version_change
if
[
-z
${
verNumber
}
]
;
then
while
true
;
do
read
-p
"Do you want to release a new version? [y/N]: "
is_version_change
if
[[
(
"
${
is_version_change
}
"
==
"y"
)
||
(
"
${
is_version_change
}
"
==
"Y"
)
]]
;
then
if
[[
(
"
${
is_version_change
}
"
==
"y"
)
||
(
"
${
is_version_change
}
"
==
"Y"
)
]]
;
then
read
-p
"Please enter the new version: "
tversion
while
true
;
do
if
(!
is_valid_version
$tversion
)
||
[
"
$(
vercomp
$tversion
$version
)
"
=
'2'
]
;
then
...
...
@@ -152,13 +162,24 @@ while true; do
done
break
elif
[[
(
"
${
is_version_change
}
"
==
"n"
)
||
(
"
${
is_version_change
}
"
==
"N"
)
]]
;
then
elif
[[
(
"
${
is_version_change
}
"
==
"n"
)
||
(
"
${
is_version_change
}
"
==
"N"
)
]]
;
then
echo
"Use old version:
${
version
}
compatible version:
${
compatible_version
}
."
break
else
else
continue
fi
done
fi
done
else
echo
"old version:
$version
, new version:
$verNumber
"
#if ( ! is_valid_version $verNumber ) || [[ "$(vercomp $version $verNumber)" == '2' ]]; then
# echo "please enter correct version"
# exit 0
#else
version
=
${
verNumber
}
#fi
fi
echo
"=======================new version number:
${
version
}
======================================"
# output the version info to the buildinfo file.
build_time
=
$(
date
+
"%F %R"
)
...
...
packaging/tools/install.sh
浏览文件 @
26b4478d
...
...
@@ -168,6 +168,7 @@ function install_bin() {
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosdemo
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/rmtaos
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/tarbitrator
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/set_core
||
:
${
csudo
}
cp
-r
${
script_dir
}
/bin/
*
${
install_main_dir
}
/bin
&&
${
csudo
}
chmod
0555
${
install_main_dir
}
/bin/
*
...
...
@@ -176,6 +177,7 @@ function install_bin() {
[
-x
${
install_main_dir
}
/bin/taosd
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/taosd
${
bin_link_dir
}
/taosd
||
:
[
-x
${
install_main_dir
}
/bin/taosdemo
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/taosdemo
${
bin_link_dir
}
/taosdemo
||
:
[
-x
${
install_main_dir
}
/bin/remove.sh
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/remove.sh
${
bin_link_dir
}
/rmtaos
||
:
[
-x
${
install_main_dir
}
/bin/set_core.sh
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/set_core.sh
${
bin_link_dir
}
/set_core
||
:
[
-x
${
install_main_dir
}
/bin/tarbitrator
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/tarbitrator
${
bin_link_dir
}
/tarbitrator
||
:
if
[
"
$verMode
"
==
"cluster"
]
;
then
...
...
@@ -196,8 +198,10 @@ function install_lib() {
${
csudo
}
ln
-s
${
install_main_dir
}
/driver/libtaos.
*
${
lib_link_dir
}
/libtaos.so.1
${
csudo
}
ln
-s
${
lib_link_dir
}
/libtaos.so.1
${
lib_link_dir
}
/libtaos.so
${
csudo
}
ln
-s
${
install_main_dir
}
/driver/libtaos.
*
${
lib64_link_dir
}
/libtaos.so.1
||
:
${
csudo
}
ln
-s
${
lib64_link_dir
}
/libtaos.so.1
${
lib64_link_dir
}
/libtaos.so
||
:
if
[
-d
${
lib64_link_dir
}
]
;
then
${
csudo
}
ln
-s
${
install_main_dir
}
/driver/libtaos.
*
${
lib64_link_dir
}
/libtaos.so.1
||
:
${
csudo
}
ln
-s
${
lib64_link_dir
}
/libtaos.so.1
${
lib64_link_dir
}
/libtaos.so
||
:
fi
#if [ "$verMode" == "cluster" ]; then
# # Compatible with version 1.5
...
...
@@ -205,6 +209,8 @@ function install_lib() {
# ${csudo} ln -s ${install_main_dir}/connector/taos-jdbcdriver-1.0.2-dist.jar ${v15_java_app_dir}/JDBCDriver-1.0.2-dist.jar
# ${csudo} chmod 777 ${v15_java_app_dir} || :
#fi
${
csudo
}
ldconfig
}
function
install_header
()
{
...
...
packaging/tools/install_client.sh
浏览文件 @
26b4478d
...
...
@@ -88,6 +88,7 @@ function install_bin() {
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosdump
||
:
fi
${
csudo
}
rm
-f
${
bin_link_dir
}
/rmtaos
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/set_core
||
:
${
csudo
}
cp
-r
${
script_dir
}
/bin/
*
${
install_main_dir
}
/bin
&&
${
csudo
}
chmod
0555
${
install_main_dir
}
/bin/
*
...
...
@@ -97,6 +98,7 @@ function install_bin() {
[
-x
${
install_main_dir
}
/bin/taosdump
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/taosdump
${
bin_link_dir
}
/taosdump
||
:
fi
[
-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/set_core.sh
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/set_core.sh
${
bin_link_dir
}
/set_core
||
:
}
function
clean_lib
()
{
...
...
@@ -115,12 +117,17 @@ function install_lib() {
if
[
"
$osType
"
!=
"Darwin"
]
;
then
${
csudo
}
ln
-s
${
install_main_dir
}
/driver/libtaos.
*
${
lib_link_dir
}
/libtaos.so.1
${
csudo
}
ln
-s
${
lib_link_dir
}
/libtaos.so.1
${
lib_link_dir
}
/libtaos.so
${
csudo
}
ln
-s
${
install_main_dir
}
/driver/libtaos.
*
${
lib64_link_dir
}
/libtaos.so.1
||
:
${
csudo
}
ln
-s
${
lib64_link_dir
}
/libtaos.so.1
${
lib64_link_dir
}
/libtaos.so
||
:
if
[
-d
"
${
lib64_link_dir
}
"
]
;
then
${
csudo
}
ln
-s
${
install_main_dir
}
/driver/libtaos.
*
${
lib64_link_dir
}
/libtaos.so.1
||
:
${
csudo
}
ln
-s
${
lib64_link_dir
}
/libtaos.so.1
${
lib64_link_dir
}
/libtaos.so
||
:
fi
else
${
csudo
}
ln
-s
${
install_main_dir
}
/driver/libtaos.
*
${
lib_link_dir
}
/libtaos.1.dylib
${
csudo
}
ln
-s
${
lib_link_dir
}
/libtaos.1.dylib
${
lib_link_dir
}
/libtaos.dylib
fi
${
csudo
}
ldconfig
}
function
install_header
()
{
...
...
packaging/tools/make_install.sh
浏览文件 @
26b4478d
...
...
@@ -34,6 +34,7 @@ cfg_install_dir="/etc/taos"
if
[
"
$osType
"
!=
"Darwin"
]
;
then
bin_link_dir
=
"/usr/bin"
lib_link_dir
=
"/usr/lib"
lib64_link_dir
=
"/usr/lib64"
inc_link_dir
=
"/usr/include"
else
bin_link_dir
=
"/usr/local/bin"
...
...
@@ -141,6 +142,7 @@ function install_bin() {
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosd
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosdemo
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosdump
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/set_core
||
:
fi
${
csudo
}
rm
-f
${
bin_link_dir
}
/rmtaos
||
:
...
...
@@ -149,6 +151,7 @@ function install_bin() {
if
[
"
$osType
"
!=
"Darwin"
]
;
then
${
csudo
}
cp
-r
${
script_dir
}
/remove.sh
${
install_main_dir
}
/bin
${
csudo
}
cp
-r
${
script_dir
}
/set_core.sh
${
install_main_dir
}
/bin
else
${
csudo
}
cp
-r
${
script_dir
}
/remove_client.sh
${
install_main_dir
}
/bin
fi
...
...
@@ -161,6 +164,7 @@ function install_bin() {
[
-x
${
install_main_dir
}
/bin/taosd
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/taosd
${
bin_link_dir
}
/taosd
||
:
[
-x
${
install_main_dir
}
/bin/taosdump
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/taosdump
${
bin_link_dir
}
/taosdump
||
:
[
-x
${
install_main_dir
}
/bin/taosdemo
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/taosdemo
${
bin_link_dir
}
/taosdemo
||
:
[
-x
${
install_main_dir
}
/set_core.sh
]
&&
${
csudo
}
ln
-s
${
install_main_dir
}
/bin/set_core.sh
${
bin_link_dir
}
/set_core
||
:
fi
if
[
"
$osType
"
!=
"Darwin"
]
;
then
...
...
@@ -173,17 +177,25 @@ function install_bin() {
function
install_lib
()
{
# Remove links
${
csudo
}
rm
-f
${
lib_link_dir
}
/libtaos.
*
||
:
${
csudo
}
rm
-f
${
lib64_link_dir
}
/libtaos.
*
||
:
versioninfo
=
$(
${
script_dir
}
/get_version.sh
${
source_dir
}
/src/util/src/version.c
)
if
[
"
$osType
"
!=
"Darwin"
]
;
then
${
csudo
}
cp
${
binary_dir
}
/build/lib/libtaos.so.
${
versioninfo
}
${
install_main_dir
}
/driver
&&
${
csudo
}
chmod
777
${
install_main_dir
}
/driver/
*
${
csudo
}
ln
-sf
${
install_main_dir
}
/driver/libtaos.so.
${
versioninfo
}
${
lib_link_dir
}
/libtaos.so.1
${
csudo
}
ln
-sf
${
lib_link_dir
}
/libtaos.so.1
${
lib_link_dir
}
/libtaos.so
if
[
-d
"
${
lib64_link_dir
}
"
]
;
then
${
csudo
}
ln
-sf
${
install_main_dir
}
/driver/libtaos.so.
${
versioninfo
}
${
lib64_link_dir
}
/libtaos.so.1
${
csudo
}
ln
-sf
${
lib64_link_dir
}
/libtaos.so.1
${
lib64_link_dir
}
/libtaos.so
fi
else
${
csudo
}
cp
${
binary_dir
}
/build/lib/libtaos.
${
versioninfo
}
.dylib
${
install_main_dir
}
/driver
&&
${
csudo
}
chmod
777
${
install_main_dir
}
/driver/
*
${
csudo
}
ln
-sf
${
install_main_dir
}
/driver/libtaos.
${
versioninfo
}
.dylib
${
lib_link_dir
}
/libtaos.1.dylib
${
csudo
}
ln
-sf
${
lib_link_dir
}
/libtaos.1.dylib
${
lib_link_dir
}
/libtaos.dylib
fi
${
csudo
}
ldconfig
}
function
install_header
()
{
...
...
packaging/tools/makeclient.sh
浏览文件 @
26b4478d
...
...
@@ -45,7 +45,7 @@ if [ "$osType" != "Darwin" ]; then
strip
${
build_dir
}
/bin/taos
bin_files
=
"
${
build_dir
}
/bin/taos
${
script_dir
}
/remove_client.sh"
else
bin_files
=
"
${
build_dir
}
/bin/taos
${
build_dir
}
/bin/taosdump
${
script_dir
}
/remove_client.sh"
bin_files
=
"
${
build_dir
}
/bin/taos
${
build_dir
}
/bin/taosdump
${
script_dir
}
/remove_client.sh
${
script_dir
}
/set_core.sh
"
fi
lib_files
=
"
${
build_dir
}
/lib/libtaos.so.
${
version
}
"
else
...
...
packaging/tools/makepkg.sh
浏览文件 @
26b4478d
...
...
@@ -36,7 +36,7 @@ if [ "$pagMode" == "lite" ]; then
strip
${
build_dir
}
/bin/taos
bin_files
=
"
${
build_dir
}
/bin/taosd
${
build_dir
}
/bin/taos
${
script_dir
}
/remove.sh"
else
bin_files
=
"
${
build_dir
}
/bin/taosd
${
build_dir
}
/bin/taos
${
build_dir
}
/bin/taosdemo
${
build_dir
}
/bin/tarbitrator
${
script_dir
}
/remove.sh"
bin_files
=
"
${
build_dir
}
/bin/taosd
${
build_dir
}
/bin/taos
${
build_dir
}
/bin/taosdemo
${
build_dir
}
/bin/tarbitrator
${
script_dir
}
/remove.sh
${
script_dir
}
/set_core.sh
"
fi
lib_files
=
"
${
build_dir
}
/lib/libtaos.so.
${
version
}
"
...
...
packaging/tools/post.sh
浏览文件 @
26b4478d
...
...
@@ -90,6 +90,7 @@ function install_bin() {
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosd
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosdemo
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/rmtaos
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/set_core
||
:
${
csudo
}
chmod
0555
${
bin_dir
}
/
*
...
...
@@ -97,7 +98,7 @@ function install_bin() {
[
-x
${
bin_dir
}
/taos
]
&&
${
csudo
}
ln
-s
${
bin_dir
}
/taos
${
bin_link_dir
}
/taos
||
:
[
-x
${
bin_dir
}
/taosd
]
&&
${
csudo
}
ln
-s
${
bin_dir
}
/taosd
${
bin_link_dir
}
/taosd
||
:
[
-x
${
bin_dir
}
/taosdemo
]
&&
${
csudo
}
ln
-s
${
bin_dir
}
/taosdemo
${
bin_link_dir
}
/taosdemo
||
:
# [ -x ${bin_dir}/remove.sh ] && ${csudo} ln -s ${bin_dir}/remove.sh ${bin_link_dir}/rmtaos
|| :
[
-x
${
bin_dir
}
/set_core.sh
]
&&
${
csudo
}
ln
-s
${
bin_dir
}
/set_core.sh
${
bin_link_dir
}
/set_core
||
:
}
function
install_config
()
{
...
...
packaging/tools/preun.sh
浏览文件 @
26b4478d
...
...
@@ -8,6 +8,7 @@ NC='\033[0m'
bin_link_dir
=
"/usr/bin"
lib_link_dir
=
"/usr/lib"
lib64_link_dir
=
"/usr/lib64"
inc_link_dir
=
"/usr/include"
data_link_dir
=
"/usr/local/taos/data"
...
...
@@ -104,10 +105,12 @@ ${csudo} rm -f ${bin_link_dir}/taos || :
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosd
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosdemo
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/taosdump
||
:
${
csudo
}
rm
-f
${
bin_link_dir
}
/set_core
||
:
${
csudo
}
rm
-f
${
cfg_link_dir
}
/
*
||
:
${
csudo
}
rm
-f
${
inc_link_dir
}
/taos.h
||
:
${
csudo
}
rm
-f
${
inc_link_dir
}
/taoserror.h
||
:
${
csudo
}
rm
-f
${
lib_link_dir
}
/libtaos.
*
||
:
${
csudo
}
rm
-f
${
inc_link_dir
}
/taoserror.h
||
:
${
csudo
}
rm
-f
${
lib_link_dir
}
/libtaos.
*
||
:
${
csudo
}
rm
-f
${
lib64_link_dir
}
/libtaos.
*
||
:
${
csudo
}
rm
-f
${
log_link_dir
}
||
:
${
csudo
}
rm
-f
${
data_link_dir
}
||
:
...
...
packaging/tools/set_core.sh
0 → 100755
浏览文件 @
26b4478d
#!/bin/bash
#
# This file is used to set config for core when taosd crash
set
-e
# set -x
csudo
=
""
if
command
-v
sudo
>
/dev/null
;
then
csudo
=
"sudo"
fi
#ulimit -c unlimited
${
csudo
}
sed
-i
'/ulimit -c unlimited/d'
/etc/profile
||
:
${
csudo
}
sed
-i
'$a\ulimit -c unlimited'
/etc/profile
||
:
source
/etc/profile
${
csudo
}
mkdir
-p
/coredump
||
:
${
csudo
}
sysctl
-w
kernel.core_pattern
=
'/coredump/core-%e-%p'
||
:
${
csudo
}
echo
'/coredump/core-%e-%p'
|
${
csudo
}
tee
/proc/sys/kernel/core_pattern
||
:
src/common/src/tglobal.c
浏览文件 @
26b4478d
...
...
@@ -54,7 +54,7 @@ int8_t tsDaylight = 0;
char
tsTimezone
[
TSDB_TIMEZONE_LEN
]
=
{
0
};
char
tsLocale
[
TSDB_LOCALE_LEN
]
=
{
0
};
char
tsCharset
[
TSDB_LOCALE_LEN
]
=
{
0
};
// default encode string
int32_t
tsEnableCoreFile
=
0
;
int32_t
tsEnableCoreFile
=
1
;
int32_t
tsMaxBinaryDisplayWidth
=
30
;
/*
...
...
src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
浏览文件 @
26b4478d
...
...
@@ -158,9 +158,9 @@ public class TSDBStatement implements Statement {
throw
new
SQLException
(
TSDBConstants
.
FixErrMsg
(
TSDBConstants
.
JNI_CONNECTION_NULL
));
}
else
if
(
resultSetPointer
==
TSDBConstants
.
JNI_NULL_POINTER
)
{
// no result set is retrieved
this
.
connecter
.
freeResultSet
(
pSql
);
res
=
false
;
}
this
.
connecter
.
freeResultSet
(
pSql
);
return
res
;
}
...
...
src/connector/jdbc/src/test/java/TestAsyncTSDBSubscribe.java
浏览文件 @
26b4478d
...
...
@@ -42,12 +42,14 @@ public class TestAsyncTSDBSubscribe {
long
subscribId
=
0
;
try
{
Class
.
forName
(
"com.taosdata.jdbc.TSDBDriver"
);
Properties
properties
=
new
Properties
();
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_HOST
,
host
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_HOST
,
host
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
dbName
+
"?user=root&password=taosdata"
,
properties
);
String
rawSql
=
"select * from "
+
tName
+
";"
;
TSDBSubscribe
subscribe
=
((
TSDBConnection
)
connection
).
createSubscribe
();
...
...
src/inc/taosdef.h
浏览文件 @
26b4478d
...
...
@@ -242,6 +242,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
#define TSDB_MAX_BYTES_PER_ROW 16384
#define TSDB_MAX_TAGS_LEN 16384
#define TSDB_MAX_TAGS 128
#define TSDB_MAX_TAG_CONDITIONS 1024
#define TSDB_AUTH_LEN 16
#define TSDB_KEY_LEN 16
...
...
src/kit/shell/src/shellEngine.c
浏览文件 @
26b4478d
...
...
@@ -379,6 +379,10 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
}
*/
#ifdef WINDOWS
if
(
tt
<
0
)
tt
=
0
;
#endif
struct
tm
*
ptm
=
localtime
(
&
tt
);
size_t
pos
=
strftime
(
buf
,
32
,
"%Y-%m-%d %H:%M:%S"
,
ptm
);
...
...
src/plugins/monitor/src/monitorMain.c
浏览文件 @
26b4478d
...
...
@@ -35,7 +35,7 @@
#define SQL_LENGTH 1024
#define LOG_LEN_STR 100
#define IP_LEN_STR
18
#define IP_LEN_STR
TSDB_EP_LEN
#define CHECK_INTERVAL 1000
typedef
enum
{
...
...
src/query/src/qExecutor.c
浏览文件 @
26b4478d
...
...
@@ -5542,7 +5542,7 @@ static int32_t buildAirthmeticExprFromMsg(SExprInfo *pArithExprInfo, SQueryTable
qDebug
(
"qmsg:%p create arithmetic expr from binary string: %s"
,
pQueryMsg
,
pArithExprInfo
->
base
.
arg
[
0
].
argValue
.
pz
);
tExprNode
*
pExprNode
=
NULL
;
TRY
(
TSDB_MAX_TAGS
)
{
TRY
(
TSDB_MAX_TAG
_CONDITION
S
)
{
pExprNode
=
exprTreeFromBinary
(
pArithExprInfo
->
base
.
arg
[
0
].
argValue
.
pz
,
pArithExprInfo
->
base
.
arg
[
0
].
argBytes
);
}
CATCH
(
code
)
{
CLEANUP_EXECUTE
();
...
...
src/tsdb/src/tsdbRead.c
浏览文件 @
26b4478d
...
...
@@ -2402,7 +2402,7 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, TSKEY skey, co
int32_t
ret
=
TSDB_CODE_SUCCESS
;
tExprNode
*
expr
=
NULL
;
TRY
(
TSDB_MAX_TAGS
)
{
TRY
(
TSDB_MAX_TAG
_CONDITION
S
)
{
expr
=
exprTreeFromTableName
(
tbnameCond
);
if
(
expr
==
NULL
)
{
expr
=
exprTreeFromBinary
(
pTagCond
,
len
);
...
...
@@ -2596,4 +2596,4 @@ static int tsdbCheckInfoCompar(const void* key1, const void* key2) {
ASSERT
(
false
);
return
0
;
}
}
\ No newline at end of file
}
src/util/src/version.c
浏览文件 @
26b4478d
char
version
[
12
]
=
"2.0.0.
0
"
;
char
version
[
12
]
=
"2.0.0.
6
"
;
char
compatible_version
[
12
]
=
"2.0.0.0"
;
char
gitinfo
[
48
]
=
"
8df8b7d9930342dd34ba13df160a7d538fad7bc7
"
;
char
gitinfoOfInternal
[
48
]
=
"
bad4f040145fba581d1ab0c5dd718a5ede3e209
f"
;
char
buildinfo
[
64
]
=
"Built by
root at 2020-08-03 17:23
"
;
char
gitinfo
[
48
]
=
"
e9a20fafbe9e3b0b12cbdf55604163b4b9a41b41
"
;
char
gitinfoOfInternal
[
48
]
=
"
dd679db0b9edeedad68574c1e031544711a9831
f"
;
char
buildinfo
[
64
]
=
"Built by
at 2020-08-12 07:59
"
;
void
libtaos_2_0_0_
0
_Linux_x64
()
{};
void
libtaos_2_0_0_
6
_Linux_x64
()
{};
tests/pytest/client/client.py
浏览文件 @
26b4478d
...
...
@@ -27,13 +27,7 @@ class TDTestCase:
ret
=
tdSql
.
query
(
'select database()'
)
tdSql
.
checkData
(
0
,
0
,
"db"
)
ret
=
tdSql
.
query
(
'select server_version()'
)
tdSql
.
checkData
(
0
,
0
,
"2.0.0.0"
)
ret
=
tdSql
.
query
(
'select client_version()'
)
tdSql
.
checkData
(
0
,
0
,
"2.0.0.0"
)
ret
=
tdSql
.
query
(
'select server_status()'
)
tdSql
.
checkData
(
0
,
0
,
1
)
...
...
tests/pytest/client/version.py
0 → 100644
浏览文件 @
26b4478d
###################################################################
# Copyright (c) 2016 by TAOS Technologies, Inc.
# All rights reserved.
#
# This file is proprietary and confidential to TAOS Technologies.
# No part of this file may be reproduced, stored, transmitted,
# disclosed or used in any form or by any means other than as
# expressly provided by the written permission from Jianhui Tao
#
###################################################################
# -*- coding: utf-8 -*-
import
sys
from
util.log
import
*
from
util.cases
import
*
from
util.sql
import
*
class
TDTestCase
:
def
init
(
self
,
conn
,
logSql
):
tdLog
.
debug
(
"start to execute %s"
%
__file__
)
tdSql
.
init
(
conn
.
cursor
(),
logSql
)
def
run
(
self
):
tdSql
.
prepare
()
ret
=
tdSql
.
query
(
'select server_version()'
)
tdSql
.
checkData
(
0
,
0
,
"2.0.0.6"
)
ret
=
tdSql
.
query
(
'select client_version()'
)
tdSql
.
checkData
(
0
,
0
,
"2.0.0.6"
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
tdCases
.
addWindows
(
__file__
,
TDTestCase
())
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
tests/pytest/fulltest.sh
浏览文件 @
26b4478d
...
...
@@ -158,6 +158,7 @@ python3 ./test.py -f alter/alter_table_crash.py
# client
python3 ./test.py
-f
client/client.py
python3 ./test.py
-f
client/version.py
# Misc
python3 testCompress.py
...
...
tests/pytest/regressiontest.sh
浏览文件 @
26b4478d
...
...
@@ -152,6 +152,7 @@ python3 ./test.py -f alter/alter_table_crash.py
# client
python3 ./test.py
-f
client/client.py
python3 ./test.py
-f
client/version.py
# Misc
python3 testCompress.py
...
...
tests/tsim/src/simExe.c
浏览文件 @
26b4478d
...
...
@@ -791,6 +791,10 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
}
*/
#ifdef WINDOWS
if
(
tt
<
0
)
tt
=
0
;
#endif
tp
=
localtime
(
&
tt
);
strftime
(
timeStr
,
64
,
"%y-%m-%d %H:%M:%S"
,
tp
);
sprintf
(
value
,
"%s.%03d"
,
timeStr
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录