Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
70e9e232
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
70e9e232
编写于
4月 07, 2021
作者:
L
liuyq-617
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/jenkins' of github.com:taosdata/TDengine into fix/jenkins
上级
f9f08a5e
1f89811b
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
76 addition
and
16 deletion
+76
-16
Jenkinsfile
Jenkinsfile
+1
-0
src/kit/taosdemo/CMakeLists.txt
src/kit/taosdemo/CMakeLists.txt
+6
-7
src/kit/taosdemo/taosdemo.c
src/kit/taosdemo/taosdemo.c
+2
-0
src/kit/taosdump/taosdump.c
src/kit/taosdump/taosdump.c
+11
-7
tests/pytest/concurrent_inquiry.sh
tests/pytest/concurrent_inquiry.sh
+1
-1
tests/pytest/fulltest.sh
tests/pytest/fulltest.sh
+1
-0
tests/pytest/handle_taosd_val_log.sh
tests/pytest/handle_taosd_val_log.sh
+1
-1
tests/pytest/insert/bug3654.py
tests/pytest/insert/bug3654.py
+53
-0
未找到文件。
Jenkinsfile
浏览文件 @
70e9e232
...
...
@@ -82,6 +82,7 @@ def pre_test(){
}
}
sh
'''
cd ${WK}
git pull >/dev/null
export TZ=Asia/Harbin
...
...
src/kit/taosdemo/CMakeLists.txt
浏览文件 @
70e9e232
...
...
@@ -9,19 +9,18 @@ IF (GIT_FOUND)
EXECUTE_PROCESS
(
COMMAND
${
GIT_EXECUTABLE
}
log --pretty=oneline -n 1
${
CMAKE_CURRENT_LIST_DIR
}
/taosdemo.c
RESULT_VARIABLE RESULT
OUTPUT_VARIABLE TAOSDEMO_COMMIT
)
EXECUTE_PROCESS
(
COMMAND bash
"-c"
"echo '
${
TAOSDEMO_COMMIT
}
' | awk '{print $1}' | cut -c -9"
RESULT_VARIABLE RESULT
OUTPUT_VARIABLE TAOSDEMO_COMMIT_SHA1
)
STRING
(
SUBSTRING
"
${
TAOSDEMO_COMMIT_SHA1
}
"
0 7 TAOSDEMO_COMMIT_SHA1
)
EXECUTE_PROCESS
(
COMMAND
${
GIT_EXECUTABLE
}
status -z -s
${
CMAKE_CURRENT_LIST_DIR
}
/taosdemo.c
RESULT_VARIABLE RESULT
OUTPUT_VARIABLE TAOSDEMO_STATUS
)
EXECUTE_PROCESS
(
IF
(
TD_LINUX
)
EXECUTE_PROCESS
(
COMMAND bash
"-c"
"echo '
${
TAOSDEMO_STATUS
}
' | awk '{print $1}'"
RESULT_VARIABLE RESULT
OUTPUT_VARIABLE TAOSDEMO_STATUS
)
ENDIF
(
TD_LINUX
)
MESSAGE
(
"taosdemo.c status: "
${
TAOSDEMO_STATUS
}
)
ELSE
()
MESSAGE
(
"Git not found"
)
...
...
@@ -29,9 +28,9 @@ ELSE()
SET
(
TAOSDEMO_STATUS
"unknown"
)
ENDIF
(
GIT_FOUND
)
STRING
(
STRIP
${
TAOSDEMO_COMMIT_SHA1
}
TAOSDEMO_COMMIT_SHA1
)
STRING
(
STRIP
"
${
TAOSDEMO_COMMIT_SHA1
}
"
TAOSDEMO_COMMIT_SHA1
)
MESSAGE
(
"taosdemo's latest commit in short is:"
${
TAOSDEMO_COMMIT_SHA1
}
)
STRING
(
STRIP
${
TAOSDEMO_STATUS
}
TAOSDEMO_STATUS
)
STRING
(
STRIP
"
${
TAOSDEMO_STATUS
}
"
TAOSDEMO_STATUS
)
IF
(
TAOSDEMO_STATUS MATCHES
"M"
)
SET
(
TAOSDEMO_STATUS
"modified"
)
...
...
src/kit/taosdemo/taosdemo.c
浏览文件 @
70e9e232
...
...
@@ -769,6 +769,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
&&
strcasecmp
(
token
,
"BINARY"
)
&&
strcasecmp
(
token
,
"NCHAR"
))
{
printHelp
();
free
(
dupstr
);
ERROR_EXIT
(
"Invalid data_type!
\n
"
);
exit
(
EXIT_FAILURE
);
}
...
...
@@ -776,6 +777,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
token
=
strsep
(
&
running
,
","
);
if
(
index
>=
MAX_NUM_DATATYPE
)
break
;
}
free
(
dupstr
);
sptr
[
index
]
=
NULL
;
}
}
else
if
(
strcmp
(
argv
[
i
],
"-w"
)
==
0
)
{
...
...
src/kit/taosdump/taosdump.c
浏览文件 @
70e9e232
...
...
@@ -483,25 +483,29 @@ static int queryDbImpl(TAOS *taos, char *command) {
static
void
parse_args
(
int
argc
,
char
*
argv
[],
SArguments
*
arguments
)
{
for
(
int
i
=
1
;
i
<
argc
;
i
++
)
{
if
(
strcmp
(
argv
[
i
],
"-E"
)
==
0
)
{
if
(
argv
[
i
+
1
])
{
char
*
tmp
=
argv
[
++
i
];
char
*
tmp
=
strdup
(
argv
[
++
i
]);
if
(
tmp
)
{
int64_t
tmpEpoch
;
if
(
strchr
(
tmp
,
':'
)
&&
strchr
(
tmp
,
'-'
))
{
if
(
TSDB_CODE_SUCCESS
!=
taosParseTime
(
tmp
,
&
tmpEpoch
,
strlen
(
tmp
),
TSDB_TIME_PRECISION_MILLI
,
0
))
{
tmp
,
&
tmpEpoch
,
strlen
(
tmp
),
TSDB_TIME_PRECISION_MILLI
,
0
))
{
fprintf
(
stderr
,
"Input end time error!
\n
"
);
free
(
tmp
);
return
;
}
}
else
{
tmpEpoch
=
atoll
(
tmp
);
}
sprintf
(
argv
[
i
],
"%"
PRId64
""
,
tmpEpoch
);
debugPrint
(
"%s() LN%d, tmp is: %s, argv[%d]: %s
\n
"
,
__func__
,
__LINE__
,
tmp
,
i
,
argv
[
i
]);
__func__
,
__LINE__
,
tmp
,
i
,
argv
[
i
]);
free
(
tmp
);
}
else
{
fprintf
(
stderr
,
"Input end time error!
\n
"
);
return
;
errorPrint
(
"%s() LN%d, strdup() cannot allocate memory
\n
"
,
__func__
,
__LINE__
);
exit
(
-
1
)
;
}
}
else
if
(
strcmp
(
argv
[
i
],
"-g"
)
==
0
)
{
arguments
->
debug_print
=
true
;
...
...
tests/pytest/concurrent_inquiry.sh
浏览文件 @
70e9e232
#!/bin/bash
#!/bin/bash
# This is the script for us to try to cause the TDengine server or client to crash
#
...
...
tests/pytest/fulltest.sh
浏览文件 @
70e9e232
...
...
@@ -22,6 +22,7 @@ python3 ./test.py -f insert/alterTableAndInsert.py
python3 ./test.py
-f
insert/insertIntoTwoTables.py
python3 ./test.py
-f
insert/before_1970.py
python3 bug2265.py
python3 ./test.py
-f
insert/bug3654.py
#table
python3 ./test.py
-f
table/alter_wal0.py
...
...
tests/pytest/handle_taosd_val_log.sh
浏览文件 @
70e9e232
...
...
@@ -21,7 +21,7 @@ rm -rf /var/lib/taos/*
nohup
valgrind
--leak-check
=
yes
$TAOSD_DIR
>
$TDIR
/
$VALGRIND_OUT
2>
$TDIR
/
$VALGRIND_ERR
&
sleep
20
cd
-
./crash_gen.sh
-p
-t
10
-s
2
00
./crash_gen.sh
-p
-t
10
-s
10
00
ps
-ef
|grep valgrind|grep
-v
grep
|awk
'{print $2}'
|xargs
kill
-term
while
true
do
...
...
tests/pytest/insert/bug3654.py
0 → 100644
浏览文件 @
70e9e232
###################################################################
# 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
taos
import
sys
from
util.log
import
*
from
util.sql
import
*
from
util.cases
import
*
class
TDTestCase
:
def
init
(
self
,
conn
,
logSql
):
tdLog
.
debug
(
f
"start to excute
{
__file__
}
"
)
tdSql
.
init
(
conn
.
cursor
())
def
run
(
self
):
tdSql
.
prepare
()
tdLog
.
printNoPrefix
(
"==========step1:create table"
)
tdSql
.
execute
(
"drop database if exists db"
)
tdSql
.
execute
(
"create database db keep 36500,36500,36500"
)
tdSql
.
execute
(
"use db"
)
tdSql
.
execute
(
"create stable if not exists stb1 (ts timestamp, c1 int) tags(t11 int)"
)
tdSql
.
execute
(
"create table t10 using stb1 tags(1)"
)
gapdate
=
(
datetime
.
datetime
.
now
()
-
datetime
.
datetime
(
1970
,
1
,
1
,
8
,
0
,
0
)).
days
tdLog
.
printNoPrefix
(
"==========step2:insert data"
)
tdSql
.
execute
(
f
"insert into t10 values (now-
{
gapdate
}
d, 1)"
)
tdSql
.
execute
(
f
"insert into t10 values (now-
{
gapdate
+
1
}
d, 2)"
)
tdLog
.
printNoPrefix
(
"==========step3:query"
)
tdSql
.
query
(
"select * from t10 where c1=1"
)
tdSql
.
checkRows
(
1
)
tdSql
.
query
(
"select * from t10 where c1=2"
)
tdSql
.
checkRows
(
1
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
f
"
{
__file__
}
successfully executed"
)
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
tdCases
.
addWindows
(
__file__
,
TDTestCase
())
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录