Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
0182f95c
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
Star
22018
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看板
提交
0182f95c
编写于
9月 29, 2021
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-10445]<enhance>: change API name from taos_insert_lines to taos_schemaless_insert
上级
c19535c2
变更
20
展开全部
隐藏空白更改
内联
并排
Showing
20 changed file
with
356 addition
and
409 deletion
+356
-409
src/client/src/TSDBJNIConnector.c
src/client/src/TSDBJNIConnector.c
+1
-1
src/client/src/tscParseLineProtocol.c
src/client/src/tscParseLineProtocol.c
+4
-4
src/connector/python/README.md
src/connector/python/README.md
+2
-2
src/connector/python/examples/insert-lines.py
src/connector/python/examples/insert-lines.py
+2
-2
src/connector/python/taos/__init__.py
src/connector/python/taos/__init__.py
+2
-2
src/connector/python/taos/cinterface.py
src/connector/python/taos/cinterface.py
+6
-23
src/connector/python/taos/connection.py
src/connector/python/taos/connection.py
+4
-4
src/connector/python/taos/error.py
src/connector/python/taos/error.py
+2
-12
src/connector/python/tests/test_lines.py
src/connector/python/tests/test_lines.py
+5
-5
src/inc/taos.h
src/inc/taos.h
+1
-1
tests/examples/c/apitest.c
tests/examples/c/apitest.c
+8
-8
tests/examples/c/schemaless.c
tests/examples/c/schemaless.c
+2
-2
tests/pytest/insert/insertJSONPayload.py
tests/pytest/insert/insertJSONPayload.py
+53
-53
tests/pytest/insert/insertTelnetLines.py
tests/pytest/insert/insertTelnetLines.py
+26
-26
tests/pytest/insert/line_insert.py
tests/pytest/insert/line_insert.py
+7
-7
tests/pytest/insert/openTsdbTelnetLinesInsert.py
tests/pytest/insert/openTsdbTelnetLinesInsert.py
+88
-88
tests/pytest/insert/schemalessInsert.py
tests/pytest/insert/schemalessInsert.py
+96
-96
tests/pytest/tools/schemalessInsertPerformance.py
tests/pytest/tools/schemalessInsertPerformance.py
+10
-10
tests/script/api/openTSDBTest.c
tests/script/api/openTSDBTest.c
+35
-61
tests/tsim/src/simExe.c
tests/tsim/src/simExe.c
+2
-2
未找到文件。
src/client/src/TSDBJNIConnector.c
浏览文件 @
0182f95c
...
...
@@ -1070,7 +1070,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_insertLinesImp(J
c_lines
[
i
]
=
(
char
*
)(
*
env
)
->
GetStringUTFChars
(
env
,
line
,
0
);
}
int
code
=
taos_
insert_lines
(
taos
,
c_lines
,
numLines
,
0
);
int
code
=
taos_
schemaless_insert
(
taos
,
c_lines
,
numLines
,
0
);
for
(
int
i
=
0
;
i
<
numLines
;
++
i
)
{
jstring
line
=
(
jstring
)((
*
env
)
->
GetObjectArrayElement
(
env
,
lines
,
i
));
...
...
src/client/src/tscParseLineProtocol.c
浏览文件 @
0182f95c
...
...
@@ -2132,7 +2132,7 @@ int32_t tscParseLines(char* lines[], int numLines, SArray* points, SArray* faile
return
TSDB_CODE_SUCCESS
;
}
int
taos_insert_
sml_
lines
(
TAOS
*
taos
,
char
*
lines
[],
int
numLines
)
{
int
taos_insert_lines
(
TAOS
*
taos
,
char
*
lines
[],
int
numLines
)
{
int32_t
code
=
0
;
SSmlLinesInfo
*
info
=
tcalloc
(
1
,
sizeof
(
SSmlLinesInfo
));
...
...
@@ -2190,7 +2190,7 @@ cleanup:
}
/**
* taos_
insert lines
() parse and insert data points into database according to
* taos_
schemaless_insert
() parse and insert data points into database according to
* different protocol.
*
* @param $lines input array may contain multiple lines, each line indicates a data point.
...
...
@@ -2210,11 +2210,11 @@ cleanup:
*
*/
int
taos_
insert_lines
(
TAOS
*
taos
,
char
*
lines
[],
int
numLines
,
int
protocol
)
{
int
taos_
schemaless_insert
(
TAOS
*
taos
,
char
*
lines
[],
int
numLines
,
int
protocol
)
{
int
code
;
switch
(
protocol
)
{
case
SML_LINE_PROTOCOL
:
code
=
taos_insert_
sml_
lines
(
taos
,
lines
,
numLines
);
code
=
taos_insert_lines
(
taos
,
lines
,
numLines
);
break
;
case
SML_TELNET_PROTOCOL
:
code
=
taos_insert_telnet_lines
(
taos
,
lines
,
numLines
);
...
...
src/connector/python/README.md
浏览文件 @
0182f95c
...
...
@@ -404,13 +404,13 @@ lines = [
'st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"pass it again",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns'
,
'stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"pass it again_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns'
,
]
conn
.
insert_lines
(
lines
)
conn
.
schemaless_insert
(
lines
)
print
(
"inserted"
)
lines
=
[
'stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"pass it again_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns'
,
]
conn
.
insert_lines
(
lines
)
conn
.
schemaless_insert
(
lines
)
result
=
conn
.
query
(
"show tables"
)
for
row
in
result
:
...
...
src/connector/python/examples/insert-lines.py
浏览文件 @
0182f95c
...
...
@@ -9,10 +9,10 @@ conn.select_db(dbname)
lines
=
[
'st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"pass",c2=false,c4=4f64 1626006833639000000ns'
,
]
conn
.
insert_lines
(
lines
)
conn
.
schemaless_insert
(
lines
)
print
(
"inserted"
)
conn
.
insert_lines
(
lines
)
conn
.
schemaless_insert
(
lines
)
result
=
conn
.
query
(
"show tables"
)
for
row
in
result
:
...
...
src/connector/python/taos/__init__.py
浏览文件 @
0182f95c
...
...
@@ -406,13 +406,13 @@ lines = [
'st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns',
'stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns',
]
conn.
insert_lines
(lines)
conn.
schemaless_insert
(lines)
print("inserted")
lines = [
'stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns',
]
conn.
insert_lines
(lines)
conn.
schemaless_insert
(lines)
result = conn.query("show tables")
for row in result:
...
...
src/connector/python/taos/cinterface.py
浏览文件 @
0182f95c
...
...
@@ -809,40 +809,23 @@ def taos_stmt_use_result(stmt):
return
result
try
:
_libtaos
.
taos_
insert_lines
.
restype
=
c_int
_libtaos
.
taos_
insert_lines
.
argstype
=
c_void_p
,
c_void_p
,
c_int
_libtaos
.
taos_
schemaless_insert
.
restype
=
c_int
_libtaos
.
taos_
schemaless_insert
.
argstype
=
c_void_p
,
c_void_p
,
c_int
except
AttributeError
:
print
(
"WARNING: libtaos(%s) does not support
insert_lines
"
%
taos_get_client_info
())
print
(
"WARNING: libtaos(%s) does not support
schemaless_insert
"
%
taos_get_client_info
())
def
taos_
insert_lines
(
connection
,
lines
,
protocol
):
def
taos_
schemaless_insert
(
connection
,
lines
,
protocol
):
# type: (c_void_p, list[str] | tuple(str)) -> None
num_of_lines
=
len
(
lines
)
lines
=
(
c_char_p
(
line
.
encode
(
"utf-8"
))
for
line
in
lines
)
lines_type
=
ctypes
.
c_char_p
*
num_of_lines
p_lines
=
lines_type
(
*
lines
)
errno
=
_libtaos
.
taos_
insert_lines
(
connection
,
p_lines
,
num_of_lines
,
protocol
)
errno
=
_libtaos
.
taos_
schemaless_insert
(
connection
,
p_lines
,
num_of_lines
,
protocol
)
if
errno
!=
0
:
raise
LinesError
(
"insert lines error"
,
errno
)
def
taos_insert_telnet_lines
(
connection
,
lines
):
# type: (c_void_p, list[str] | tuple(str)) -> None
num_of_lines
=
len
(
lines
)
lines
=
(
c_char_p
(
line
.
encode
(
"utf-8"
))
for
line
in
lines
)
lines_type
=
ctypes
.
c_char_p
*
num_of_lines
p_lines
=
lines_type
(
*
lines
)
errno
=
_libtaos
.
taos_insert_telnet_lines
(
connection
,
p_lines
,
num_of_lines
)
if
errno
!=
0
:
raise
TelnetLinesError
(
"insert telnet lines error"
,
errno
)
def
taos_insert_json_payload
(
connection
,
payload
):
# type: (c_void_p, list[str] | tuple(str)) -> None
payload
=
payload
.
encode
(
"utf-8"
)
errno
=
_libtaos
.
taos_insert_json_payload
(
connection
,
payload
)
if
errno
!=
0
:
raise
JsonPayloadError
(
"insert json payload error"
,
errno
)
raise
SchemalessError
(
"schemaless insert error"
,
errno
)
class
CTaosInterface
(
object
):
def
__init__
(
self
,
config
=
None
):
...
...
src/connector/python/taos/connection.py
浏览文件 @
0182f95c
...
...
@@ -117,7 +117,7 @@ class TaosConnection(object):
stream
=
taos_open_stream
(
self
.
_conn
,
sql
,
callback
,
stime
,
param
,
callback2
)
return
TaosStream
(
stream
)
def
insert_lines
(
self
,
lines
,
protocol
):
def
schemaless_insert
(
self
,
lines
,
protocol
):
# type: (list[str]) -> None
"""
1.Line protocol and schemaless support
...
...
@@ -132,7 +132,7 @@ class TaosConnection(object):
lines = [
'ste,t2=5,t3=L"ste" c1=true,c2=4,c3="string" 1626056811855516532',
]
conn.
insert_lines
(lines)
conn.
schemaless_insert
(lines)
```
2.OpenTSDB telnet style API format support
...
...
@@ -160,13 +160,13 @@ class TaosConnection(object):
```python
try:
conn.
insert_lines
(lines)
conn.
schemaless_insert
(lines)
except SchemalessError as err:
print(err)
```
"""
return
taos_
insert_lines
(
self
.
_conn
,
lines
,
protocol
)
return
taos_
schemaless_insert
(
self
.
_conn
,
lines
,
protocol
)
def
cursor
(
self
):
...
...
src/connector/python/taos/error.py
浏览文件 @
0182f95c
...
...
@@ -80,17 +80,7 @@ class ResultError(DatabaseError):
pass
class
LinesError
(
DatabaseError
):
"""taos_insert_lines errors."""
pass
class
TelnetLinesError
(
DatabaseError
):
"""taos_insert_telnet_lines errors."""
pass
class
JsonPayloadError
(
DatabaseError
):
"""taos_insert_json_payload errors."""
class
SchemalessError
(
DatabaseError
):
"""taos_schemaless_insert errors."""
pass
src/connector/python/tests/test_lines.py
浏览文件 @
0182f95c
...
...
@@ -13,10 +13,10 @@ def conn():
return
connect
()
def
test_
insert_lines
(
conn
):
def
test_
schemaless_insert
(
conn
):
# type: (TaosConnection) -> None
dbname
=
"pytest_taos_
insert_lines
"
dbname
=
"pytest_taos_
schemaless_insert
"
try
:
conn
.
execute
(
"drop database if exists %s"
%
dbname
)
conn
.
execute
(
"create database if not exists %s precision 'us'"
%
dbname
)
...
...
@@ -27,13 +27,13 @@ def test_insert_lines(conn):
'st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns'
,
'stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns'
,
]
conn
.
insert_lines
(
lines
)
conn
.
schemaless_insert
(
lines
)
print
(
"inserted"
)
lines
=
[
'stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns'
,
]
conn
.
insert_lines
(
lines
)
conn
.
schemaless_insert
(
lines
)
print
(
"inserted"
)
result
=
conn
.
query
(
"select * from st"
)
print
(
*
result
.
fields
)
...
...
@@ -54,4 +54,4 @@ def test_insert_lines(conn):
if
__name__
==
"__main__"
:
test_
insert_lines
(
connect
())
test_
schemaless_insert
(
connect
())
src/inc/taos.h
浏览文件 @
0182f95c
...
...
@@ -187,7 +187,7 @@ DLL_EXPORT void taos_close_stream(TAOS_STREAM *tstr);
DLL_EXPORT
int
taos_load_table_info
(
TAOS
*
taos
,
const
char
*
tableNameList
);
DLL_EXPORT
int
taos_
insert_lines
(
TAOS
*
taos
,
char
*
lines
[],
int
numLines
,
int
protocol
);
DLL_EXPORT
int
taos_
schemaless_insert
(
TAOS
*
taos
,
char
*
lines
[],
int
numLines
,
int
protocol
);
#ifdef __cplusplus
}
...
...
tests/examples/c/apitest.c
浏览文件 @
0182f95c
...
...
@@ -980,40 +980,40 @@ int32_t verify_schema_less(TAOS* taos) {
"stf,t1=4i64,t3=
\"
t4
\"
,t2=5f64,t4=5f64 c1=3i64,c3=L
\"
passitagin_stf
\"
,c2=false,c5=5f64,c6=7u64 1626006933641000000ns"
};
code
=
taos_
insert_lines
(
taos
,
lines
,
sizeof
(
lines
)
/
sizeof
(
char
*
),
0
);
code
=
taos_
schemaless_insert
(
taos
,
lines
,
sizeof
(
lines
)
/
sizeof
(
char
*
),
0
);
char
*
lines2
[]
=
{
"stg,t1=3i64,t2=4f64,t3=
\"
t3
\"
c1=3i64,c3=L
\"
passit
\"
,c2=false,c4=4f64 1626006833639000000ns"
,
"stg,t1=4i64,t3=
\"
t4
\"
,t2=5f64,t4=5f64 c1=3i64,c3=L
\"
passitagin
\"
,c2=true,c4=5f64,c5=5f64 1626006833640000000ns"
};
code
=
taos_
insert_lines
(
taos
,
&
lines2
[
0
],
1
,
0
);
code
=
taos_
insert_lines
(
taos
,
&
lines2
[
1
],
1
,
0
);
code
=
taos_
schemaless_insert
(
taos
,
&
lines2
[
0
],
1
,
0
);
code
=
taos_
schemaless_insert
(
taos
,
&
lines2
[
1
],
1
,
0
);
char
*
lines3
[]
=
{
"sth,t1=4i64,t2=5f64,t4=5f64,ID=
\"
childtable
\"
c1=3i64,c3=L
\"
passitagin_stf
\"
,c2=false,c5=5f64,c6=7u64 1626006933641ms"
,
"sth,t1=4i64,t2=5f64,t4=5f64 c1=3i64,c3=L
\"
passitagin_stf
\"
,c2=false,c5=5f64,c6=7u64 1626006933654ms"
};
code
=
taos_
insert_lines
(
taos
,
lines3
,
2
,
0
);
code
=
taos_
schemaless_insert
(
taos
,
lines3
,
2
,
0
);
char
*
lines4
[]
=
{
"st123456,t1=3i64,t2=4f64,t3=
\"
t3
\"
c1=3i64,c3=L
\"
passit
\"
,c2=false,c4=4f64 1626006833639000000ns"
,
"dgtyqodr,t2=5f64,t3=L
\"
ste
\"
c1=tRue,c2=4i64,c3=
\"
iam
\"
1626056811823316532ns"
};
code
=
taos_
insert_lines
(
taos
,
lines4
,
2
,
0
);
code
=
taos_
schemaless_insert
(
taos
,
lines4
,
2
,
0
);
char
*
lines5
[]
=
{
"zqlbgs,id=
\"
zqlbgs_39302_21680
\"
,t0=f,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=
\"
binaryTagValue
\"
,t8=L
\"
ncharTagValue
\"
c0=f,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=
\"
binaryColValue
\"
,c8=L
\"
ncharColValue
\"
,c9=7u64 1626006833639000000ns"
,
"zqlbgs,t9=f,id=
\"
zqlbgs_39302_21680
\"
,t0=f,t1=127i8,t11=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=
\"
binaryTagValue
\"
,t8=L
\"
ncharTagValue
\"
,t10=L
\"
ncharTagValue
\"
c10=f,c0=f,c1=127i8,c12=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=
\"
binaryColValue
\"
,c8=L
\"
ncharColValue
\"
,c9=7u64,c11=L
\"
ncharColValue
\"
1626006833639000000ns"
};
code
=
taos_
insert_lines
(
taos
,
&
lines5
[
0
],
1
,
0
);
code
=
taos_
insert_lines
(
taos
,
&
lines5
[
1
],
1
,
0
);
code
=
taos_
schemaless_insert
(
taos
,
&
lines5
[
0
],
1
,
0
);
code
=
taos_
schemaless_insert
(
taos
,
&
lines5
[
1
],
1
,
0
);
char
*
lines6
[]
=
{
"st123456,t1=3i64,t2=4f64,t3=
\"
t3
\"
c1=3i64,c3=L
\"
passit
\"
,c2=false,c4=4f64 1626006833639000000ns"
,
"dgtyqodr,t2=5f64,t3=L
\"
ste
\"
c1=tRue,c2=4i64,c3=
\"
iam
\"
1626056811823316532ns"
};
code
=
taos_
insert_lines
(
taos
,
lines6
,
2
,
0
);
code
=
taos_
schemaless_insert
(
taos
,
lines6
,
2
,
0
);
return
(
code
);
}
...
...
tests/examples/c/schemaless.c
浏览文件 @
0182f95c
...
...
@@ -77,9 +77,9 @@ int main(int argc, char* argv[]) {
}
//shuffle(lines, numSuperTables * numChildTables * numRowsPerChildTable);
printf
(
"%s
\n
"
,
"begin taos_
insert_lines
"
);
printf
(
"%s
\n
"
,
"begin taos_
schemaless_insert
"
);
int64_t
begin
=
getTimeInUs
();
int32_t
code
=
taos_
insert_lines
(
taos
,
lines
,
numSuperTables
*
numChildTables
*
numRowsPerChildTable
,
0
);
int32_t
code
=
taos_
schemaless_insert
(
taos
,
lines
,
numSuperTables
*
numChildTables
*
numRowsPerChildTable
,
0
);
int64_t
end
=
getTimeInUs
();
printf
(
"code: %d, %s. time used: %"
PRId64
"
\n
"
,
code
,
tstrerror
(
code
),
end
-
begin
);
...
...
tests/pytest/insert/insertJSONPayload.py
浏览文件 @
0182f95c
...
...
@@ -46,8 +46,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe _stb_0_"
)
tdSql
.
checkRows
(
6
)
...
...
@@ -67,8 +67,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb0_0"
)
tdSql
.
checkData
(
1
,
1
,
"BIGINT"
)
...
...
@@ -86,8 +86,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb0_1"
)
tdSql
.
checkData
(
1
,
1
,
"BOOL"
)
...
...
@@ -105,8 +105,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb0_2"
)
tdSql
.
checkData
(
1
,
1
,
"BOOL"
)
...
...
@@ -124,8 +124,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb0_3"
)
tdSql
.
checkData
(
1
,
1
,
"BINARY"
)
...
...
@@ -143,8 +143,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb0_4"
)
tdSql
.
checkData
(
1
,
1
,
"DOUBLE"
)
...
...
@@ -162,8 +162,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb0_5"
)
tdSql
.
checkData
(
1
,
1
,
"DOUBLE"
)
...
...
@@ -184,8 +184,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
print
(
"============= step3 : test tags ================"
)
...
...
@@ -200,8 +200,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb0_8"
)
tdSql
.
checkData
(
2
,
1
,
"BIGINT"
)
...
...
@@ -216,8 +216,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb0_9"
)
tdSql
.
checkData
(
2
,
1
,
"DOUBLE"
)
...
...
@@ -232,8 +232,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb0_10"
)
tdSql
.
checkData
(
2
,
1
,
"DOUBLE"
)
...
...
@@ -258,8 +258,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select ts from stb1_0"
)
tdSql
.
checkData
(
0
,
0
,
"2021-07-11 20:33:53.000000"
)
...
...
@@ -281,8 +281,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select ts from stb1_1"
)
tdSql
.
checkData
(
0
,
0
,
"2021-07-11 20:33:53.610000"
)
...
...
@@ -304,8 +304,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select ts from stb1_2"
)
tdSql
.
checkData
(
0
,
0
,
"2021-07-11 20:33:53.610123"
)
...
...
@@ -315,7 +315,7 @@ class TDTestCase:
{
"metric": "stb1_3",
"timestamp": {
"value": 1
.6260068336101233e+18
,
"value": 1
626006833610123321
,
"type": "ns"
},
"value": 10,
...
...
@@ -327,8 +327,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select ts from stb1_3"
)
tdSql
.
checkData
(
0
,
0
,
"2021-07-11 20:33:53.610123"
)
...
...
@@ -351,8 +351,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
### metric value ###
payload
=
[
'''
...
...
@@ -374,8 +374,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb2_0"
)
tdSql
.
checkData
(
1
,
1
,
"BOOL"
)
...
...
@@ -399,8 +399,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb2_1"
)
tdSql
.
checkData
(
1
,
1
,
"TINYINT"
)
...
...
@@ -424,8 +424,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb2_2"
)
tdSql
.
checkData
(
1
,
1
,
"SMALLINT"
)
...
...
@@ -449,8 +449,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb2_3"
)
tdSql
.
checkData
(
1
,
1
,
"INT"
)
...
...
@@ -474,8 +474,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb2_4"
)
tdSql
.
checkData
(
1
,
1
,
"BIGINT"
)
...
...
@@ -499,8 +499,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb2_5"
)
tdSql
.
checkData
(
1
,
1
,
"FLOAT"
)
...
...
@@ -524,8 +524,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb2_6"
)
tdSql
.
checkData
(
1
,
1
,
"DOUBLE"
)
...
...
@@ -549,8 +549,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb2_7"
)
tdSql
.
checkData
(
1
,
1
,
"BINARY"
)
...
...
@@ -574,8 +574,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb2_8"
)
tdSql
.
checkData
(
1
,
1
,
"NCHAR"
)
...
...
@@ -633,8 +633,8 @@ class TDTestCase:
}
}
'''
]
code
=
self
.
_conn
.
insert_lines
(
payload
,
2
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
payload
,
2
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"describe stb3_0"
)
tdSql
.
checkData
(
2
,
1
,
"BOOL"
)
...
...
tests/pytest/insert/insertTelnetLines.py
浏览文件 @
0182f95c
...
...
@@ -39,8 +39,8 @@ class TDTestCase:
".stb0.3. 1626006833639000000ns 4i8 host=
\"
host0
\"
interface=
\"
eth0
\"
"
,
]
code
=
self
.
_conn
.
insert_lines
(
lines0
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines0
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"show stables"
)
tdSql
.
checkRows
(
4
)
...
...
@@ -68,8 +68,8 @@ class TDTestCase:
"stb1 0 6i8 host=
\"
host0
\"
"
,
]
code
=
self
.
_conn
.
insert_lines
(
lines1
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines1
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb1"
)
tdSql
.
checkRows
(
6
)
...
...
@@ -82,8 +82,8 @@ class TDTestCase:
"stb2_0 1626006833651ms -127i8 host=
\"
host0
\"
"
,
"stb2_0 1626006833652ms 127i8 host=
\"
host0
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines2_0
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines2_0
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb2_0"
)
tdSql
.
checkRows
(
2
)
...
...
@@ -97,8 +97,8 @@ class TDTestCase:
"stb2_1 1626006833651ms -32767i16 host=
\"
host0
\"
"
,
"stb2_1 1626006833652ms 32767i16 host=
\"
host0
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines2_1
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines2_1
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb2_1"
)
tdSql
.
checkRows
(
2
)
...
...
@@ -113,8 +113,8 @@ class TDTestCase:
"stb2_2 1626006833652ms 2147483647i32 host=
\"
host0
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines2_2
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines2_2
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb2_2"
)
tdSql
.
checkRows
(
2
)
...
...
@@ -130,8 +130,8 @@ class TDTestCase:
"stb2_3 1626006833662ms 9223372036854775807 host=
\"
host0
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines2_3
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines2_3
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb2_3"
)
tdSql
.
checkRows
(
3
)
...
...
@@ -154,8 +154,8 @@ class TDTestCase:
"stb2_4 1626006833710ms -3.4E38f32 host=
\"
host0
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines2_4
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines2_4
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb2_4"
)
tdSql
.
checkRows
(
10
)
...
...
@@ -179,8 +179,8 @@ class TDTestCase:
"stb2_5 1626006833710ms 3.15 host=
\"
host0
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines2_5
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines2_5
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb2_5"
)
tdSql
.
checkRows
(
11
)
...
...
@@ -203,8 +203,8 @@ class TDTestCase:
"stb2_6 1626006833700ms FALSE host=
\"
host0
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines2_6
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines2_6
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb2_6"
)
tdSql
.
checkRows
(
10
)
...
...
@@ -220,8 +220,8 @@ class TDTestCase:
"stb2_7 1626006833630ms
\"
binary_val.()[]{}<>
\"
host=
\"
host0
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines2_7
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines2_7
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb2_7"
)
tdSql
.
checkRows
(
3
)
...
...
@@ -236,8 +236,8 @@ class TDTestCase:
"stb2_8 1626006833620ms L
\"
nchar_val数值二
\"
host=
\"
host0
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines2_8
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines2_8
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb2_8"
)
tdSql
.
checkRows
(
2
)
...
...
@@ -254,8 +254,8 @@ class TDTestCase:
"stb3_0 1626006833610ms 2 t1=-127i8 t2=-32767i16 t3=-2147483647i32 t4=-9223372036854775807i64 t5=-3.4E38f32 t6=-1.7E308f64 t7=false t8=
\"
binary_val_2
\"
t9=L
\"
标签值2
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines3_0
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines3_0
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb3_0"
)
tdSql
.
checkRows
(
2
)
...
...
@@ -298,8 +298,8 @@ class TDTestCase:
"stb3_1 1626006833610ms 3 ID=
\"
child_table3
\"
host=
\"
host3
\"
"
]
code
=
self
.
_conn
.
insert_lines
(
lines3_1
,
1
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines3_1
,
1
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from stb3_1"
)
tdSql
.
checkRows
(
3
)
...
...
tests/pytest/insert/line_insert.py
浏览文件 @
0182f95c
...
...
@@ -42,18 +42,18 @@ class TDTestCase:
"stf,t1=4i64,t3=
\"
t4
\"
,t2=5f64,t4=5f64 c1=3i64,c3=L
\"
passitagin_stf
\"
,c2=false,c5=5f64,c6=7u64 1626006933641000000ns"
]
code
=
self
.
_conn
.
insert_lines
(
lines
,
0
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
(
lines
,
0
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
lines2
=
[
"stg,t1=3i64,t2=4f64,t3=
\"
t3
\"
c1=3i64,c3=L
\"
passit
\"
,c2=false,c4=4f64 1626006833639000000ns"
,
"stg,t1=4i64,t3=
\"
t4
\"
,t2=5f64,t4=5f64 c1=3i64,c3=L
\"
passitagin
\"
,c2=true,c4=5f64,c5=5f64 1626006833640000000ns"
]
code
=
self
.
_conn
.
insert_lines
([
lines2
[
0
]
],
0
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
code
=
self
.
_conn
.
schemaless_insert
([
lines2
[
0
]
],
0
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
self
.
_conn
.
insert_lines
([
lines2
[
1
]
],
0
)
print
(
"
insert_lines
result {}"
.
format
(
code
))
self
.
_conn
.
schemaless_insert
([
lines2
[
1
]
],
0
)
print
(
"
schemaless_insert
result {}"
.
format
(
code
))
tdSql
.
query
(
"select * from st"
)
tdSql
.
checkRows
(
4
)
...
...
@@ -73,7 +73,7 @@ class TDTestCase:
tdSql
.
query
(
"describe stf"
)
tdSql
.
checkData
(
2
,
2
,
14
)
self
.
_conn
.
insert_lines
([
self
.
_conn
.
schemaless_insert
([
"sth,t1=4i64,t2=5f64,t4=5f64,ID=
\"
childtable
\"
c1=3i64,c3=L
\"
passitagin_stf
\"
,c2=false,c5=5f64,c6=7u64 1626006933641ms"
,
"sth,t1=4i64,t2=5f64,t4=5f64 c1=3i64,c3=L
\"
passitagin_stf
\"
,c2=false,c5=5f64,c6=7u64 1626006933654ms"
],
0
)
...
...
tests/pytest/insert/openTsdbTelnetLinesInsert.py
浏览文件 @
0182f95c
此差异已折叠。
点击以展开。
tests/pytest/insert/schemalessInsert.py
浏览文件 @
0182f95c
此差异已折叠。
点击以展开。
tests/pytest/tools/schemalessInsertPerformance.py
浏览文件 @
0182f95c
...
...
@@ -14,7 +14,7 @@
import
traceback
import
random
import
string
from
taos.error
import
Line
sError
from
taos.error
import
Schemales
sError
import
datetime
import
time
from
copy
import
deepcopy
...
...
@@ -172,28 +172,28 @@ class TDTestCase:
def
perfTableInsert
(
self
):
table_generator
=
self
.
tableGenerator
()
for
input_sql
in
table_generator
:
self
.
_conn
.
insert_lines
([
input_sql
]
)
self
.
_conn
.
schemaless_insert
([
input_sql
],
0
)
# for i in range(10):
# self._conn.
insert_lines([input_sql]
)
# self._conn.
schemaless_insert([input_sql], 0
)
def
perfDataInsert
(
self
,
count
=
4
):
table_generator
=
self
.
tableGenerator
(
count
=
count
)
ts
=
int
(
time
.
time
())
for
input_sql
in
table_generator
:
print
(
"input_sql-----------"
,
input_sql
)
self
.
_conn
.
insert_lines
([
input_sql
]
)
self
.
_conn
.
schemaless_insert
([
input_sql
],
0
)
for
i
in
range
(
100000
):
ts
-=
1
input_sql_new
=
self
.
replaceLastStr
(
input_sql
,
str
(
ts
))
+
's'
print
(
"input_sql_new---------"
,
input_sql_new
)
self
.
_conn
.
insert_lines
([
input_sql_new
]
)
self
.
_conn
.
schemaless_insert
([
input_sql_new
],
0
)
def
batchInsertTable
(
self
,
batch_list
):
for
insert_list
in
batch_list
:
print
(
threading
.
current_thread
().
name
,
"length="
,
len
(
insert_list
))
print
(
threading
.
current_thread
().
name
,
'firstline'
,
insert_list
[
0
])
print
(
threading
.
current_thread
().
name
,
'lastline:'
,
insert_list
[
-
1
])
self
.
_conn
.
insert_lines
(
insert_list
)
self
.
_conn
.
schemaless_insert
(
insert_list
,
0
)
print
(
threading
.
current_thread
().
name
,
'end'
)
def
genTableThread
(
self
,
thread_count
=
10
):
...
...
@@ -218,7 +218,7 @@ class TDTestCase:
def
createStb
(
self
,
count
=
4
):
input_sql
=
self
.
getPerfSql
(
count
=
count
,
init
=
True
)
self
.
_conn
.
insert_lines
([
input_sql
]
)
self
.
_conn
.
schemaless_insert
([
input_sql
],
0
)
def
threadInsertTable
(
self
,
end_list
,
thread_count
=
10
):
threads
=
list
()
...
...
@@ -238,7 +238,7 @@ class TDTestCase:
# def createTb(self, count=4):
# input_sql = self.getPerfSql(count=count)
# for i in range(10000):
# self._conn.
insert_lines([input_sql]
)
# self._conn.
schemaless_insert([input_sql], 0
)
# def createTb1(self, count=4):
# start_time = time.time()
...
...
@@ -273,8 +273,8 @@ class TDTestCase:
# def test(self):
# sql1 = 'stb,id="init",t0=14865i32,t1="tvnqbjuqck" c0=37i32,c1=217i32,c2=3i32,c3=88i32 1626006833640ms'
# sql2 = 'stb,id="init",t0=14865i32,t1="tvnqbjuqck" c0=38i32,c1=217i32,c2=3i32,c3=88i32 1626006833641ms'
# self._conn.
insert_lines([sql1]
)
# self._conn.
insert_lines([sql2]
)
# self._conn.
schemaless_insert([sql1], 0
)
# self._conn.
schemaless_insert([sql2], 0
)
def
run
(
self
):
print
(
"running {}"
.
format
(
__file__
))
...
...
tests/script/api/openTSDBTest.c
浏览文件 @
0182f95c
...
...
@@ -26,7 +26,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb0_1 1626006833639000000ns 4i8 host=
\"
host0
\"
interface=
\"
eth0
\"
"
,
"stb0_2 1626006833639000000ns 4i8 host=
\"
host0
\"
interface=
\"
eth0
\"
"
,
};
code
=
taos_
insert_lines
(
taos
,
lines0
,
3
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines0
,
3
,
1
);
if
(
code
)
{
printf
(
"lines0 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -40,7 +40,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb1 1626006833651ms 5i8 host=
\"
host0
\"
"
,
"stb1 0 6i8 host=
\"
host0
\"
"
,
};
code
=
taos_
insert_lines
(
taos
,
lines1
,
6
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines1
,
6
,
1
);
if
(
code
)
{
printf
(
"lines1 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -51,7 +51,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb2_0 1626006833651ms -127i8 host=
\"
host0
\"
"
,
"stb2_0 1626006833652ms 127i8 host=
\"
host0
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines2_0
,
2
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines2_0
,
2
,
1
);
if
(
code
)
{
printf
(
"lines2_0 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -61,7 +61,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb2_1 1626006833651ms -32767i16 host=
\"
host0
\"
"
,
"stb2_1 1626006833652ms 32767i16 host=
\"
host0
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines2_1
,
2
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines2_1
,
2
,
1
);
if
(
code
)
{
printf
(
"lines2_1 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -71,7 +71,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb2_2 1626006833651ms -2147483647i32 host=
\"
host0
\"
"
,
"stb2_2 1626006833652ms 2147483647i32 host=
\"
host0
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines2_2
,
2
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines2_2
,
2
,
1
);
if
(
code
)
{
printf
(
"lines2_2 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -82,7 +82,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb2_3 1626006833652ms 9223372036854775807i64 host=
\"
host0
\"
"
,
"stb2_3 1626006833662ms 9223372036854775807 host=
\"
host0
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines2_3
,
3
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines2_3
,
3
,
1
);
if
(
code
)
{
printf
(
"lines2_3 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -100,7 +100,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb2_4 1626006833700ms 3.4E38f32 host=
\"
host0
\"
"
,
"stb2_4 1626006833710ms -3.4E38f32 host=
\"
host0
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines2_4
,
10
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines2_4
,
10
,
1
);
if
(
code
)
{
printf
(
"lines2_4 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -119,7 +119,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb2_5 1626006833700ms -1.7E308f64 host=
\"
host0
\"
"
,
"stb2_5 1626006833710ms 3.15 host=
\"
host0
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines2_5
,
11
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines2_5
,
11
,
1
);
if
(
code
)
{
printf
(
"lines2_5 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -137,7 +137,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb2_6 1626006833690ms False host=
\"
host0
\"
"
,
"stb2_6 1626006833700ms FALSE host=
\"
host0
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines2_6
,
10
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines2_6
,
10
,
1
);
if
(
code
)
{
printf
(
"lines2_6 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -148,7 +148,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb2_7 1626006833620ms
\"
binary_val.:;,./?|+-=
\"
host=
\"
host0
\"
"
,
"stb2_7 1626006833630ms
\"
binary_val.()[]{}<>
\"
host=
\"
host0
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines2_7
,
3
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines2_7
,
3
,
1
);
if
(
code
)
{
printf
(
"lines2_7 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -158,7 +158,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb2_8 1626006833610ms L
\"
nchar_val数值一
\"
host=
\"
host0
\"
"
,
"stb2_8 1626006833620ms L
\"
nchar_val数值二
\"
host=
\"
host0
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines2_8
,
2
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines2_8
,
2
,
1
);
if
(
code
)
{
printf
(
"lines2_8 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -169,7 +169,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb3_0 1626006833610ms 1 t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=3.4E38f32 t6=1.7E308f64 t7=true t8=
\"
binary_val_1
\"
t9=L
\"
标签值1
\"
"
,
"stb3_0 1626006833610ms 2 t1=-127i8 t2=-32767i16 t3=-2147483647i32 t4=-9223372036854775807i64 t5=-3.4E38f32 t6=-1.7E308f64 t7=false t8=
\"
binary_val_2
\"
t9=L
\"
标签值2
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines3_0
,
2
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines3_0
,
2
,
1
);
if
(
code
)
{
printf
(
"lines3_0 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -180,7 +180,7 @@ void verify_telnet_insert(TAOS* taos) {
"stb3_1 1626006833610ms 2 host=
\"
host2
\"
iD=
\"
child_table2
\"
"
,
"stb3_1 1626006833610ms 3 ID=
\"
child_table3
\"
host=
\"
host3
\"
"
};
code
=
taos_
insert_lines
(
taos
,
lines3_1
,
3
,
1
);
code
=
taos_
schemaless_insert
(
taos
,
lines3_1
,
3
,
1
);
if
(
code
)
{
printf
(
"lines3_1 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -214,7 +214,7 @@ void verify_json_insert(TAOS* taos) {
} \
}"
};
code
=
taos_
insert_lines
(
taos
,
message
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
message
,
0
,
2
);
if
(
code
)
{
printf
(
"payload_0 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -245,7 +245,7 @@ void verify_json_insert(TAOS* taos) {
} \
]"
};
code
=
taos_
insert_lines
(
taos
,
message1
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
message1
,
0
,
2
);
if
(
code
)
{
printf
(
"payload_1 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -296,7 +296,7 @@ void verify_json_insert(TAOS* taos) {
} \
} \
]"
};
code
=
taos_
insert_lines
(
taos
,
message2
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
message2
,
0
,
2
);
if
(
code
)
{
printf
(
"payload_2 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -320,7 +320,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload0_0 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -341,7 +341,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload0_1 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -362,7 +362,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload0_2 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -383,7 +383,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload0_3 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -404,7 +404,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload0_4 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -433,7 +433,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload1_0 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -459,7 +459,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload1_1 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -485,39 +485,13 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload1_2 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
free
(
*
payload_str
);
cJSON_Delete
(
payload
);
//nanoseconds
payload
=
cJSON_CreateObject
();
cJSON_AddStringToObject
(
payload
,
"metric"
,
"stb1_3"
);
timestamp
=
cJSON_CreateObject
();
cJSON_AddNumberToObject
(
timestamp
,
"value"
,
(
double
)
1626006833610123321
);
cJSON_AddStringToObject
(
timestamp
,
"type"
,
"ns"
);
cJSON_AddItemToObject
(
payload
,
"timestamp"
,
timestamp
);
cJSON_AddNumberToObject
(
payload
,
"value"
,
10
);
tags
=
cJSON_CreateObject
();
cJSON_AddTrueToObject
(
tags
,
"t1"
);
cJSON_AddFalseToObject
(
tags
,
"t2"
);
cJSON_AddNumberToObject
(
tags
,
"t3"
,
10
);
cJSON_AddStringToObject
(
tags
,
"t4"
,
"123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"
);
cJSON_AddItemToObject
(
payload
,
"tags"
,
tags
);
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_insert_lines
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload1_3 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
free
(
*
payload_str
);
cJSON_Delete
(
payload
);
//now
payload
=
cJSON_CreateObject
();
cJSON_AddStringToObject
(
payload
,
"metric"
,
"stb1_4"
);
...
...
@@ -537,7 +511,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload1_4 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -569,7 +543,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload2_0 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -599,7 +573,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload2_1 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -629,7 +603,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload2_2 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -659,7 +633,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload2_3 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -689,7 +663,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload2_4 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -719,7 +693,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload2_5 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -749,7 +723,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload2_6 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -779,7 +753,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload2_7 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -809,7 +783,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload2_8 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
@@ -889,7 +863,7 @@ void verify_json_insert(TAOS* taos) {
*
payload_str
=
cJSON_Print
(
payload
);
//printf("%s\n", payload_str);
code
=
taos_
insert_lines
(
taos
,
payload_str
,
0
,
2
);
code
=
taos_
schemaless_insert
(
taos
,
payload_str
,
0
,
2
);
if
(
code
)
{
printf
(
"payload3_0 code: %d, %s.
\n
"
,
code
,
tstrerror
(
code
));
}
...
...
tests/tsim/src/simExe.c
浏览文件 @
0182f95c
...
...
@@ -1084,7 +1084,7 @@ bool simExecuteLineInsertCmd(SScript *script, char *rest) {
simInfo
(
"script:%s, %s"
,
script
->
fileName
,
rest
);
simLogSql
(
buf
,
true
);
char
*
lines
[]
=
{
rest
};
int32_t
ret
=
taos_
insert_lines
(
script
->
taos
,
lines
,
1
,
0
);
int32_t
ret
=
taos_
schemaless_insert
(
script
->
taos
,
lines
,
1
,
0
);
if
(
ret
==
TSDB_CODE_SUCCESS
)
{
simDebug
(
"script:%s, taos:%p, %s executed. success."
,
script
->
fileName
,
script
->
taos
,
rest
);
script
->
linePos
++
;
...
...
@@ -1107,7 +1107,7 @@ bool simExecuteLineInsertErrorCmd(SScript *script, char *rest) {
simInfo
(
"script:%s, %s"
,
script
->
fileName
,
rest
);
simLogSql
(
buf
,
true
);
char
*
lines
[]
=
{
rest
};
int32_t
ret
=
taos_
insert_lines
(
script
->
taos
,
lines
,
1
,
0
);
int32_t
ret
=
taos_
schemaless_insert
(
script
->
taos
,
lines
,
1
,
0
);
if
(
ret
==
TSDB_CODE_SUCCESS
)
{
sprintf
(
script
->
error
,
"script:%s, taos:%p, %s executed. expect failed, but success."
,
script
->
fileName
,
script
->
taos
,
rest
);
script
->
linePos
++
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录