Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
91a60312
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
91a60312
编写于
4月 07, 2021
作者:
W
wu champion
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into test/TD-3295
上级
7db5c29d
70cec08d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
82 addition
and
5 deletion
+82
-5
Jenkinsfile
Jenkinsfile
+28
-5
tests/pytest/fulltest.sh
tests/pytest/fulltest.sh
+1
-0
tests/pytest/insert/bug3654.py
tests/pytest/insert/bug3654.py
+53
-0
未找到文件。
Jenkinsfile
浏览文件 @
91a60312
...
...
@@ -42,8 +42,24 @@ def pre_test(){
killall -9 taosd ||echo "no taosd running"
killall -9 gdb || echo "no gdb running"
cd ${WKC}
git reset --hard HEAD~10 >/dev/null
git checkout develop
git reset --hard HEAD~10 >/dev/null
'''
script
{
if
(
env
.
CHANGE_TARGET
==
'master'
)
{
sh
'''
cd ${WKC}
git checkout master
'''
}
else
{
sh
'''
cd ${WKC}
git checkout develop
'''
}
}
sh
'''
cd ${WKC}
git pull >/dev/null
git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
...
...
@@ -53,15 +69,22 @@ def pre_test(){
'''
script
{
if
(
env
.
CHANGE_TARGET
==
'master'
)
{
sh
'git checkout master'
sh
'''
cd ${WK}
git checkout master
'''
}
else
{
sh
'git checkout develop'
sh
'''
cd ${WK}
git checkout develop
'''
}
}
sh
'''
git pull >/dev/null
cd ${WK}
git pull >/dev/null
export TZ=Asia/Harbin
date
git clean -dfx
...
...
tests/pytest/fulltest.sh
浏览文件 @
91a60312
...
...
@@ -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/insert/bug3654.py
0 → 100644
浏览文件 @
91a60312
###################################################################
# 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录