Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Tonvia
TDengine
提交
fbadcfb5
T
TDengine
项目概览
Tonvia
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fbadcfb5
编写于
4月 28, 2021
作者:
S
Steven Li
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master' into feature/crash_gen2
上级
5d1d5cad
bd898af3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
271 addition
and
15 deletion
+271
-15
.appveyor.yml
.appveyor.yml
+33
-14
.drone.yml
.drone.yml
+188
-0
README.md
README.md
+1
-1
src/client/src/tscParseInsert.c
src/client/src/tscParseInsert.c
+36
-0
tests/script/general/parser/function.sim
tests/script/general/parser/function.sim
+13
-0
未找到文件。
.appveyor.yml
浏览文件 @
fbadcfb5
version
:
1.0.{build}
os
:
Visual Studio
2015
image
:
-
Visual Studio
2015
-
macos
environment
:
matrix
:
-
ARCH
:
amd64
-
ARCH
:
x86
matrix
:
exclude
:
-
image
:
macos
ARCH
:
x86
for
:
-
matrix
:
only
:
-
image
:
Visual Studio
2015
clone_folder
:
c:\dev\TDengine
clone_depth
:
1
clone_folder
:
c:\dev\TDengine
clone_depth
:
1
init
:
-
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
init
:
-
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
before_build
:
-
cd c:\dev\TDengine
-
md build
before_build
:
-
cd c:\dev\TDengine
-
md build
build_script
:
-
cd build
-
cmake -G "NMake Makefiles" ..
-
nmake install
build_script
:
-
cd build
-
cmake -G "NMake Makefiles" ..
-
nmake install
-
matrix
:
only
:
- image
:
macos
clone_depth
:
1
build_script
:
-
mkdir debug
-
cd debug
-
cmake .. > /dev/null
-
make > /dev/null
notifications
:
-
provider
:
Email
to
:
-
sangshuduo@gmail.com
on_build_success
:
true
on_build_failure
:
true
on_build_status_changed
:
true
.drone.yml
0 → 100644
浏览文件 @
fbadcfb5
---
kind
:
pipeline
name
:
test_amd64
platform
:
os
:
linux
arch
:
amd64
steps
:
-
name
:
build
image
:
gcc
commands
:
-
apt-get update
-
apt-get install -y cmake build-essential git
-
mkdir debug
-
cd debug
-
cmake ..
-
make
when
:
branch
:
-
develop
-
master
-
name
:
smoke_test
image
:
python:3.8
commands
:
-
pip3 install psutil
-
pip3 install guppy3
-
pip3 install src/connector/python/linux/python3/
-
cd tests
-
./test-all.sh smoke
when
:
branch
:
-
develop
-
master
-
name
:
crash_gen
image
:
python:3.8
commands
:
-
pip3 install requests
-
pip3 install src/connector/python/linux/python3/
-
pip3 install psutil
-
pip3 install guppy3
-
cd tests/pytest
-
./crash_gen.sh -a -p -t 4 -s
2000
when
:
branch
:
-
develop
-
master
---
kind
:
pipeline
name
:
test_arm64
platform
:
os
:
linux
arch
:
arm64
steps
:
-
name
:
build
image
:
gcc
commands
:
-
apt-get update
-
apt-get install -y cmake build-essential
-
mkdir debug
-
cd debug
-
cmake .. -DCPUTYPE=aarch64 > /dev/null
-
make
when
:
branch
:
-
develop
-
master
---
kind
:
pipeline
name
:
test_arm
platform
:
os
:
linux
arch
:
arm
steps
:
-
name
:
build
image
:
gcc
commands
:
-
apt-get update
-
apt-get install -y cmake build-essential
-
mkdir debug
-
cd debug
-
cmake .. -DCPUTYPE=aarch32 > /dev/null
-
make
when
:
branch
:
-
develop
-
master
---
kind
:
pipeline
name
:
build_trusty
platform
:
os
:
linux
arch
:
amd64
steps
:
-
name
:
build
image
:
ubuntu:trusty
commands
:
-
apt-get update
-
apt-get install -y gcc cmake3 build-essential git binutils-2.26
-
mkdir debug
-
cd debug
-
cmake ..
-
make
when
:
branch
:
-
develop
-
master
---
kind
:
pipeline
name
:
build_xenial
platform
:
os
:
linux
arch
:
amd64
steps
:
-
name
:
build
image
:
ubuntu:xenial
commands
:
-
apt-get update
-
apt-get install -y gcc cmake build-essential
-
mkdir debug
-
cd debug
-
cmake ..
-
make
when
:
branch
:
-
develop
-
master
---
kind
:
pipeline
name
:
build_bionic
platform
:
os
:
linux
arch
:
amd64
steps
:
-
name
:
build
image
:
ubuntu:bionic
commands
:
-
apt-get update
-
apt-get install -y gcc cmake build-essential
-
mkdir debug
-
cd debug
-
cmake ..
-
make
when
:
branch
:
-
develop
-
master
---
kind
:
pipeline
name
:
goodbye
platform
:
os
:
linux
arch
:
amd64
steps
:
-
name
:
64-bit
image
:
alpine
commands
:
-
echo 64-bit is good.
when
:
branch
:
-
develop
-
master
depends_on
:
-
test_arm64
-
test_amd64
\ No newline at end of file
README.md
浏览文件 @
fbadcfb5
[
![Build Status
](
https://
travis-ci.org/taosdata/TDengine.svg?branch=master
)
](https://travis-ci.org
/taosdata/TDengine)
[
![Build Status
](
https://
cloud.drone.io/api/badges/taosdata/TDengine/status.svg?ref=refs/heads/master
)
](https://cloud.drone.io
/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)
...
...
src/client/src/tscParseInsert.c
浏览文件 @
fbadcfb5
...
...
@@ -928,6 +928,42 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql, char** boundC
return
tscSQLSyntaxErrMsg
(
pCmd
->
payload
,
") expected"
,
sToken
.
z
);
}
/* parse columns after super table tags values.
* insert into table_name using super_table(tag_name1, tag_name2) tags(tag_val1, tag_val2)
* (normal_col1, normal_col2) values(normal_col1_val, normal_col2_val);
* */
index
=
0
;
sToken
=
tStrGetToken
(
sql
,
&
index
,
false
);
sql
+=
index
;
int
numOfColsAfterTags
=
0
;
if
(
sToken
.
type
==
TK_LP
)
{
if
(
*
boundColumn
!=
NULL
)
{
return
tscSQLSyntaxErrMsg
(
pCmd
->
payload
,
"bind columns again"
,
sToken
.
z
);
}
else
{
*
boundColumn
=
&
sToken
.
z
[
0
];
}
while
(
1
)
{
index
=
0
;
sToken
=
tStrGetToken
(
sql
,
&
index
,
false
);
if
(
sToken
.
type
==
TK_RP
)
{
break
;
}
sql
+=
index
;
++
numOfColsAfterTags
;
}
if
(
numOfColsAfterTags
==
0
&&
(
*
boundColumn
)
!=
NULL
)
{
return
TSDB_CODE_TSC_INVALID_SQL
;
}
sToken
=
tStrGetToken
(
sql
,
&
index
,
false
);
}
sql
=
sToken
.
z
;
if
(
tscValidateName
(
&
tableToken
)
!=
TSDB_CODE_SUCCESS
)
{
return
tscInvalidSQLErrMsg
(
pCmd
->
payload
,
"invalid table name"
,
*
sqlstr
);
}
...
...
tests/script/general/parser/function.sim
浏览文件 @
fbadcfb5
...
...
@@ -393,6 +393,19 @@ if $rows != 24 then
return -1
endi
print ========================> TD-3948
sql drop table if exists meters
sql create stable meters (ts timestamp, current float, voltage int, phase float) tags (location binary(64), groupId int);
sql_error insert into td3948Err1(phase) using meters tags ("Beijng.Chaoyang", 2) (ts, current) values (now, 10.2);
sql_error insert into td3948Err2(phase, voltage) using meters tags ("Beijng.Chaoyang", 2) (ts, current) values (now, 10.2);
sql_error insert into td3948Err3(phase, current) using meters tags ("Beijng.Chaoyang", 2) (ts, current) values (now, 10.2);
sql insert into td3948 using meters tags ("Beijng.Chaoyang", 2) (ts, current) values (now, 10.2);
sql select count(ts) from td3948;
if $rows != 1 then
print expect 1, actual:$rows
return -1
endi
print ========================> TD-2740
sql drop table if exists m1;
sql create table m1(ts timestamp, k int) tags(a int);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录