Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_46246346
TDengine
提交
6608e13c
TDengine
项目概览
weixin_46246346
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
3
Star
1
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,发现更多精彩内容 >>
未验证
提交
6608e13c
编写于
8月 10, 2020
作者:
S
Shengliang Guan
提交者:
GitHub
8月 10, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3003 from taosdata/feature/os
Feature/os
上级
5da10761
d79cad4b
变更
108
展开全部
隐藏空白更改
内联
并排
Showing
108 changed file
with
778 addition
and
83 deletion
+778
-83
src/client/src/tscSql.c
src/client/src/tscSql.c
+8
-7
src/client/src/tscSub.c
src/client/src/tscSub.c
+5
-5
src/client/src/tscSubquery.c
src/client/src/tscSubquery.c
+8
-8
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+2
-2
src/dnode/src/dnodeSystem.c
src/dnode/src/dnodeSystem.c
+4
-4
src/dnode/src/dnodeTelemetry.c
src/dnode/src/dnodeTelemetry.c
+4
-4
src/kit/taosdemo/taosdemo.c
src/kit/taosdemo/taosdemo.c
+15
-15
src/os/inc/os.h
src/os/inc/os.h
+1
-0
src/os/inc/osCommon.h
src/os/inc/osCommon.h
+31
-0
src/os/inc/osWindows.h
src/os/inc/osWindows.h
+3
-0
src/os/src/detail/osMemory.c
src/os/src/detail/osMemory.c
+4
-4
src/os/src/windows/w64Env.c
src/os/src/windows/w64Env.c
+1
-1
src/plugins/http/src/httpContext.c
src/plugins/http/src/httpContext.c
+1
-1
src/plugins/http/src/httpSession.c
src/plugins/http/src/httpSession.c
+1
-1
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+6
-6
src/rpc/test/rclient.c
src/rpc/test/rclient.c
+5
-5
src/rpc/test/rsclient.c
src/rpc/test/rsclient.c
+3
-3
src/sync/src/tarbitrator.c
src/sync/src/tarbitrator.c
+4
-4
src/sync/test/syncClient.c
src/sync/test/syncClient.c
+5
-5
src/tsdb/src/tsdbRWHelper.c
src/tsdb/src/tsdbRWHelper.c
+2
-2
src/tsdb/src/tsdbRead.c
src/tsdb/src/tsdbRead.c
+4
-4
src/util/src/tkvstore.c
src/util/src/tkvstore.c
+1
-1
tests/script/windows/alter/metrics.sim
tests/script/windows/alter/metrics.sim
+7
-0
tests/script/windows/alter/table.sim
tests/script/windows/alter/table.sim
+7
-0
tests/script/windows/compute/avg.sim
tests/script/windows/compute/avg.sim
+7
-0
tests/script/windows/compute/bottom.sim
tests/script/windows/compute/bottom.sim
+7
-0
tests/script/windows/compute/count.sim
tests/script/windows/compute/count.sim
+7
-0
tests/script/windows/compute/diff.sim
tests/script/windows/compute/diff.sim
+7
-0
tests/script/windows/compute/first.sim
tests/script/windows/compute/first.sim
+7
-0
tests/script/windows/compute/interval.sim
tests/script/windows/compute/interval.sim
+7
-0
tests/script/windows/compute/last.sim
tests/script/windows/compute/last.sim
+7
-0
tests/script/windows/compute/leastsquare.sim
tests/script/windows/compute/leastsquare.sim
+7
-0
tests/script/windows/compute/max.sim
tests/script/windows/compute/max.sim
+7
-0
tests/script/windows/compute/min.sim
tests/script/windows/compute/min.sim
+7
-0
tests/script/windows/compute/percentile.sim
tests/script/windows/compute/percentile.sim
+7
-0
tests/script/windows/compute/stddev.sim
tests/script/windows/compute/stddev.sim
+7
-0
tests/script/windows/compute/sum.sim
tests/script/windows/compute/sum.sim
+7
-0
tests/script/windows/compute/top.sim
tests/script/windows/compute/top.sim
+7
-0
tests/script/windows/db/basic.sim
tests/script/windows/db/basic.sim
+7
-0
tests/script/windows/db/len.sim
tests/script/windows/db/len.sim
+7
-0
tests/script/windows/field/2.sim
tests/script/windows/field/2.sim
+7
-0
tests/script/windows/field/3.sim
tests/script/windows/field/3.sim
+7
-0
tests/script/windows/field/4.sim
tests/script/windows/field/4.sim
+7
-0
tests/script/windows/field/5.sim
tests/script/windows/field/5.sim
+7
-0
tests/script/windows/field/6.sim
tests/script/windows/field/6.sim
+7
-0
tests/script/windows/field/bigint.sim
tests/script/windows/field/bigint.sim
+7
-0
tests/script/windows/field/binary.sim
tests/script/windows/field/binary.sim
+7
-0
tests/script/windows/field/bool.sim
tests/script/windows/field/bool.sim
+7
-0
tests/script/windows/field/double.sim
tests/script/windows/field/double.sim
+7
-0
tests/script/windows/field/float.sim
tests/script/windows/field/float.sim
+7
-0
tests/script/windows/field/int.sim
tests/script/windows/field/int.sim
+7
-0
tests/script/windows/field/single.sim
tests/script/windows/field/single.sim
+7
-0
tests/script/windows/field/smallint.sim
tests/script/windows/field/smallint.sim
+7
-0
tests/script/windows/field/tinyint.sim
tests/script/windows/field/tinyint.sim
+7
-0
tests/script/windows/import/basic.sim
tests/script/windows/import/basic.sim
+7
-0
tests/script/windows/insert/basic.sim
tests/script/windows/insert/basic.sim
+7
-0
tests/script/windows/insert/query_block1_file.sim
tests/script/windows/insert/query_block1_file.sim
+8
-1
tests/script/windows/insert/query_block1_memory.sim
tests/script/windows/insert/query_block1_memory.sim
+7
-0
tests/script/windows/insert/query_block2_file.sim
tests/script/windows/insert/query_block2_file.sim
+7
-0
tests/script/windows/insert/query_block2_memory.sim
tests/script/windows/insert/query_block2_memory.sim
+7
-0
tests/script/windows/insert/query_file_memory.sim
tests/script/windows/insert/query_file_memory.sim
+7
-0
tests/script/windows/insert/query_multi_file.sim
tests/script/windows/insert/query_multi_file.sim
+7
-0
tests/script/windows/table/binary.sim
tests/script/windows/table/binary.sim
+7
-0
tests/script/windows/table/bool.sim
tests/script/windows/table/bool.sim
+7
-0
tests/script/windows/table/column_name.sim
tests/script/windows/table/column_name.sim
+8
-0
tests/script/windows/table/column_num.sim
tests/script/windows/table/column_num.sim
+8
-0
tests/script/windows/table/column_value.sim
tests/script/windows/table/column_value.sim
+8
-0
tests/script/windows/table/db.table.sim
tests/script/windows/table/db.table.sim
+8
-0
tests/script/windows/table/double.sim
tests/script/windows/table/double.sim
+7
-0
tests/script/windows/table/float.sim
tests/script/windows/table/float.sim
+7
-0
tests/script/windows/table/table.sim
tests/script/windows/table/table.sim
+7
-0
tests/script/windows/table/table_len.sim
tests/script/windows/table/table_len.sim
+7
-0
tests/script/windows/tag/3.sim
tests/script/windows/tag/3.sim
+7
-0
tests/script/windows/tag/4.sim
tests/script/windows/tag/4.sim
+7
-0
tests/script/windows/tag/5.sim
tests/script/windows/tag/5.sim
+7
-0
tests/script/windows/tag/6.sim
tests/script/windows/tag/6.sim
+7
-0
tests/script/windows/tag/add.sim
tests/script/windows/tag/add.sim
+7
-0
tests/script/windows/tag/bigint.sim
tests/script/windows/tag/bigint.sim
+7
-0
tests/script/windows/tag/binary.sim
tests/script/windows/tag/binary.sim
+7
-0
tests/script/windows/tag/binary_binary.sim
tests/script/windows/tag/binary_binary.sim
+7
-0
tests/script/windows/tag/bool.sim
tests/script/windows/tag/bool.sim
+7
-0
tests/script/windows/tag/bool_binary.sim
tests/script/windows/tag/bool_binary.sim
+7
-0
tests/script/windows/tag/bool_int.sim
tests/script/windows/tag/bool_int.sim
+7
-0
tests/script/windows/tag/change.sim
tests/script/windows/tag/change.sim
+7
-0
tests/script/windows/tag/column.sim
tests/script/windows/tag/column.sim
+7
-0
tests/script/windows/tag/create.sim
tests/script/windows/tag/create.sim
+7
-0
tests/script/windows/tag/delete.sim
tests/script/windows/tag/delete.sim
+7
-0
tests/script/windows/tag/double.sim
tests/script/windows/tag/double.sim
+7
-0
tests/script/windows/tag/filter.sim
tests/script/windows/tag/filter.sim
+7
-0
tests/script/windows/tag/float.sim
tests/script/windows/tag/float.sim
+7
-0
tests/script/windows/tag/int.sim
tests/script/windows/tag/int.sim
+7
-0
tests/script/windows/tag/int_binary.sim
tests/script/windows/tag/int_binary.sim
+7
-0
tests/script/windows/tag/int_float.sim
tests/script/windows/tag/int_float.sim
+7
-0
tests/script/windows/tag/set.sim
tests/script/windows/tag/set.sim
+7
-0
tests/script/windows/tag/smallint.sim
tests/script/windows/tag/smallint.sim
+7
-0
tests/script/windows/tag/tinyint.sim
tests/script/windows/tag/tinyint.sim
+7
-0
tests/script/windows/vector/metrics_field.sim
tests/script/windows/vector/metrics_field.sim
+7
-0
tests/script/windows/vector/metrics_mix.sim
tests/script/windows/vector/metrics_mix.sim
+7
-0
tests/script/windows/vector/metrics_query.sim
tests/script/windows/vector/metrics_query.sim
+7
-0
tests/script/windows/vector/metrics_tag.sim
tests/script/windows/vector/metrics_tag.sim
+7
-0
tests/script/windows/vector/metrics_time.sim
tests/script/windows/vector/metrics_time.sim
+7
-0
tests/script/windows/vector/multi.sim
tests/script/windows/vector/multi.sim
+7
-0
tests/script/windows/vector/single.sim
tests/script/windows/vector/single.sim
+7
-0
tests/script/windows/vector/table_field.sim
tests/script/windows/vector/table_field.sim
+7
-0
tests/script/windows/vector/table_mix.sim
tests/script/windows/vector/table_mix.sim
+7
-0
tests/script/windows/vector/table_query.sim
tests/script/windows/vector/table_query.sim
+7
-0
tests/script/windows/vector/table_time.sim
tests/script/windows/vector/table_time.sim
+7
-0
tests/script/wtest.bat
tests/script/wtest.bat
+60
-0
未找到文件。
src/client/src/tscSql.c
浏览文件 @
6608e13c
...
...
@@ -141,7 +141,7 @@ static void syncConnCallback(void *param, TAOS_RES *tres, int code) {
SSqlObj
*
pSql
=
(
SSqlObj
*
)
tres
;
assert
(
pSql
!=
NULL
);
sem_post
(
&
pSql
->
rspSem
);
t
sem_post
(
&
pSql
->
rspSem
);
}
TAOS
*
taos_connect
(
const
char
*
ip
,
const
char
*
user
,
const
char
*
pass
,
const
char
*
db
,
uint16_t
port
)
{
...
...
@@ -156,7 +156,7 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
pSql
->
param
=
pSql
;
tscProcessSql
(
pSql
);
sem_wait
(
&
pSql
->
rspSem
);
t
sem_wait
(
&
pSql
->
rspSem
);
if
(
pSql
->
res
.
code
!=
TSDB_CODE_SUCCESS
)
{
terrno
=
pSql
->
res
.
code
;
...
...
@@ -225,12 +225,12 @@ void waitForQueryRsp(void *param, TAOS_RES *tres, int code) {
assert
(
tres
!=
NULL
);
SSqlObj
*
pSql
=
(
SSqlObj
*
)
tres
;
sem_post
(
&
pSql
->
rspSem
);
t
sem_post
(
&
pSql
->
rspSem
);
}
static
void
waitForRetrieveRsp
(
void
*
param
,
TAOS_RES
*
tres
,
int
numOfRows
)
{
SSqlObj
*
pSql
=
(
SSqlObj
*
)
tres
;
sem_post
(
&
pSql
->
rspSem
);
t
sem_post
(
&
pSql
->
rspSem
);
}
TAOS_RES
*
taos_query_c
(
TAOS
*
taos
,
const
char
*
sqlstr
,
uint32_t
sqlLen
)
{
...
...
@@ -255,6 +255,7 @@ TAOS_RES* taos_query_c(TAOS *taos, const char *sqlstr, uint32_t sqlLen) {
return
NULL
;
}
tsem_init
(
&
pSql
->
rspSem
,
0
,
0
);
doAsyncQuery
(
pObj
,
pSql
,
waitForQueryRsp
,
taos
,
sqlstr
,
sqlLen
);
tsem_wait
(
&
pSql
->
rspSem
);
...
...
@@ -419,7 +420,7 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) {
pCmd
->
command
==
TSDB_SQL_CLI_VERSION
||
pCmd
->
command
==
TSDB_SQL_CURRENT_USER
))
{
taos_fetch_rows_a
(
res
,
waitForRetrieveRsp
,
pSql
->
pTscObj
);
sem_wait
(
&
pSql
->
rspSem
);
t
sem_wait
(
&
pSql
->
rspSem
);
}
void
*
data
=
doSetResultRowData
(
pSql
,
true
);
...
...
@@ -710,7 +711,7 @@ static void asyncCallback(void *param, TAOS_RES *tres, int code) {
assert
(
param
!=
NULL
);
SSqlObj
*
pSql
=
((
SSqlObj
*
)
param
);
pSql
->
res
.
code
=
code
;
sem_post
(
&
pSql
->
rspSem
);
t
sem_post
(
&
pSql
->
rspSem
);
}
int
taos_validate_sql
(
TAOS
*
taos
,
const
char
*
sql
)
{
...
...
@@ -761,7 +762,7 @@ int taos_validate_sql(TAOS *taos, const char *sql) {
pSql
->
param
=
pSql
;
int
code
=
tsParseSql
(
pSql
,
true
);
if
(
code
==
TSDB_CODE_TSC_ACTION_IN_PROGRESS
)
{
sem_wait
(
&
pSql
->
rspSem
);
t
sem_wait
(
&
pSql
->
rspSem
);
code
=
pSql
->
res
.
code
;
}
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
...
...
src/client/src/tscSub.c
浏览文件 @
6608e13c
...
...
@@ -33,7 +33,7 @@ typedef struct SSubscriptionProgress {
typedef
struct
SSub
{
void
*
signature
;
char
topic
[
32
];
sem_t
sem
;
tsem_t
sem
;
int64_t
lastSyncTime
;
int64_t
lastConsumeTime
;
TAOS
*
taos
;
...
...
@@ -85,7 +85,7 @@ static void asyncCallback(void *param, TAOS_RES *tres, int code) {
assert
(
param
!=
NULL
);
SSub
*
pSub
=
((
SSub
*
)
param
);
pSub
->
pSql
->
res
.
code
=
code
;
sem_post
(
&
pSub
->
sem
);
t
sem_post
(
&
pSub
->
sem
);
}
...
...
@@ -154,7 +154,7 @@ static SSub* tscCreateSubscription(STscObj* pObj, const char* topic, const char*
code
=
tsParseSql
(
pSql
,
false
);
if
(
code
==
TSDB_CODE_TSC_ACTION_IN_PROGRESS
)
{
sem_wait
(
&
pSub
->
sem
);
t
sem_wait
(
&
pSub
->
sem
);
code
=
pSql
->
res
.
code
;
}
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
...
...
@@ -339,7 +339,7 @@ static int tscLoadSubscriptionProgress(SSub* pSub) {
fclose
(
fp
);
taosArraySort
(
progress
,
tscCompareSubscriptionProgress
);
tscDebug
(
"subscription progress loaded, %
zu
tables: %s"
,
taosArrayGetSize
(
progress
),
pSub
->
topic
);
tscDebug
(
"subscription progress loaded, %
"
PRIzu
"
tables: %s"
,
taosArrayGetSize
(
progress
),
pSub
->
topic
);
return
1
;
}
...
...
@@ -451,7 +451,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
pSql
->
fetchFp
=
asyncCallback
;
pSql
->
param
=
pSub
;
tscDoQuery
(
pSql
);
sem_wait
(
&
pSub
->
sem
);
t
sem_wait
(
&
pSub
->
sem
);
if
(
pRes
->
code
!=
TSDB_CODE_SUCCESS
)
{
continue
;
...
...
src/client/src/tscSubquery.c
浏览文件 @
6608e13c
...
...
@@ -362,7 +362,7 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
}
size_t
numOfCols
=
taosArrayGetSize
(
pNewQueryInfo
->
colList
);
tscDebug
(
"%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%
zu, colList:%zu
, fieldsInfo:%d, name:%s"
,
tscDebug
(
"%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%
"
PRIzu
", colList:%"
PRIzu
"
, fieldsInfo:%d, name:%s"
,
pSql
,
pNew
,
0
,
pTableMetaInfo
->
vgroupIndex
,
pNewQueryInfo
->
type
,
taosArrayGetSize
(
pNewQueryInfo
->
exprList
),
numOfCols
,
pNewQueryInfo
->
fieldsInfo
.
numOfOutput
,
pTableMetaInfo
->
name
);
}
...
...
@@ -522,7 +522,7 @@ static void issueTSCompQuery(SSqlObj* pSql, SJoinSupporter* pSupporter, SSqlObj*
tscDebug
(
"%p subquery:%p tableIndex:%d, vgroupIndex:%d, numOfVgroups:%d, type:%d, ts_comp query to retrieve timestamps, "
"numOfExpr:%
zu, colList:%zu
, numOfOutputFields:%d, name:%s"
,
"numOfExpr:%
"
PRIzu
", colList:%"
PRIzu
"
, numOfOutputFields:%d, name:%s"
,
pParent
,
pSql
,
0
,
pTableMetaInfo
->
vgroupIndex
,
pTableMetaInfo
->
vgroupList
->
numOfVgroups
,
pQueryInfo
->
type
,
tscSqlExprNumOfExprs
(
pQueryInfo
),
numOfCols
,
pQueryInfo
->
fieldsInfo
.
numOfOutput
,
pTableMetaInfo
->
name
);
...
...
@@ -1231,7 +1231,7 @@ int32_t tscLaunchJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter
tscDebug
(
"%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, transfer to tid_tag query to retrieve (tableId, tags), "
"exprInfo:%
zu, colList:%zu
, fieldsInfo:%d, tagIndex:%d, name:%s"
,
"exprInfo:%
"
PRIzu
", colList:%"
PRIzu
"
, fieldsInfo:%d, tagIndex:%d, name:%s"
,
pSql
,
pNew
,
tableIndex
,
pTableMetaInfo
->
vgroupIndex
,
pNewQueryInfo
->
type
,
tscSqlExprNumOfExprs
(
pNewQueryInfo
),
numOfCols
,
pNewQueryInfo
->
fieldsInfo
.
numOfOutput
,
index
.
columnIndex
,
pNewQueryInfo
->
pTableMetaInfo
[
0
]
->
name
);
}
else
{
...
...
@@ -1266,7 +1266,7 @@ int32_t tscLaunchJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter
tscDebug
(
"%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%u, transfer to ts_comp query to retrieve timestamps, "
"exprInfo:%
zu, colList:%zu
, fieldsInfo:%d, name:%s"
,
"exprInfo:%
"
PRIzu
", colList:%"
PRIzu
"
, fieldsInfo:%d, name:%s"
,
pSql
,
pNew
,
tableIndex
,
pTableMetaInfo
->
vgroupIndex
,
pNewQueryInfo
->
type
,
tscSqlExprNumOfExprs
(
pNewQueryInfo
),
numOfCols
,
pNewQueryInfo
->
fieldsInfo
.
numOfOutput
,
pNewQueryInfo
->
pTableMetaInfo
[
0
]
->
name
);
}
...
...
@@ -1921,7 +1921,7 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
pSql
->
pSubs
=
calloc
(
size
,
POINTER_BYTES
);
pSql
->
numOfSubs
=
(
uint16_t
)
size
;
tscDebug
(
"%p submit data to %
zu
vnode(s)"
,
pSql
,
size
);
tscDebug
(
"%p submit data to %
"
PRIzu
"
vnode(s)"
,
pSql
,
size
);
SSubqueryState
*
pState
=
calloc
(
1
,
sizeof
(
SSubqueryState
));
pState
->
numOfTotal
=
pSql
->
numOfSubs
;
...
...
@@ -1955,7 +1955,7 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
tscDebug
(
"%p sub:%p create subObj success. orderOfSub:%d"
,
pSql
,
pNew
,
numOfSub
);
numOfSub
++
;
}
else
{
tscDebug
(
"%p prepare submit data block failed in async insertion, vnodeIdx:%d, total:%
zu
, code:%s"
,
pSql
,
numOfSub
,
tscDebug
(
"%p prepare submit data block failed in async insertion, vnodeIdx:%d, total:%
"
PRIzu
"
, code:%s"
,
pSql
,
numOfSub
,
size
,
tstrerror
(
pRes
->
code
));
goto
_error
;
}
...
...
@@ -2061,7 +2061,7 @@ void tscBuildResFromSubqueries(SSqlObj *pSql) {
assert
(
pRes
->
row
>=
pRes
->
numOfRows
);
doBuildResFromSubqueries
(
pSql
);
sem_post
(
&
pSql
->
rspSem
);
t
sem_post
(
&
pSql
->
rspSem
);
return
;
...
...
@@ -2087,7 +2087,7 @@ void tscBuildResFromSubqueries(SSqlObj *pSql) {
// free(pState);
//
// pRes->completed = true; // set query completed
// sem_post(&pSql->rspSem);
//
t
sem_post(&pSql->rspSem);
// return;
// }
...
...
src/client/src/tscUtil.c
浏览文件 @
6608e13c
...
...
@@ -387,7 +387,7 @@ void tscFreeSqlObj(SSqlObj* pSql) {
pCmd
->
allocSize
=
0
;
taosTFree
(
pSql
->
sqlstr
);
sem_destroy
(
&
pSql
->
rspSem
);
t
sem_destroy
(
&
pSql
->
rspSem
);
free
(
pSql
);
}
...
...
@@ -1894,7 +1894,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void
size_t
size
=
taosArrayGetSize
(
pNewQueryInfo
->
colList
);
tscDebug
(
"%p new subquery:%p, tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%
zu, colList:%zu
,"
"%p new subquery:%p, tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%
"
PRIzu
", colList:%"
PRIzu
"
,"
"fieldInfo:%d, name:%s, qrang:%"
PRId64
" - %"
PRId64
" order:%d, limit:%"
PRId64
,
pSql
,
pNew
,
tableIndex
,
pTableMetaInfo
->
vgroupIndex
,
pNewQueryInfo
->
type
,
tscSqlExprNumOfExprs
(
pNewQueryInfo
),
size
,
pNewQueryInfo
->
fieldsInfo
.
numOfOutput
,
pFinalInfo
->
name
,
pNewQueryInfo
->
window
.
skey
,
...
...
src/dnode/src/dnodeSystem.c
浏览文件 @
6608e13c
...
...
@@ -22,7 +22,7 @@
#include "dnodeMain.h"
static
void
signal_handler
(
int32_t
signum
,
siginfo_t
*
sigInfo
,
void
*
context
);
static
sem_t
exitSem
;
static
t
sem_t
exitSem
;
int32_t
main
(
int32_t
argc
,
char
*
argv
[])
{
// Set global configuration file
...
...
@@ -88,7 +88,7 @@ int32_t main(int32_t argc, char *argv[]) {
#endif
}
if
(
sem_init
(
&
exitSem
,
0
,
0
)
!=
0
)
{
if
(
t
sem_init
(
&
exitSem
,
0
,
0
)
!=
0
)
{
printf
(
"failed to create exit semphore
\n
"
);
exit
(
EXIT_FAILURE
);
}
...
...
@@ -117,7 +117,7 @@ int32_t main(int32_t argc, char *argv[]) {
syslog
(
LOG_INFO
,
"Started TDengine service successfully."
);
for
(
int
res
=
sem_wait
(
&
exitSem
);
res
!=
0
;
res
=
sem_wait
(
&
exitSem
))
{
for
(
int
res
=
tsem_wait
(
&
exitSem
);
res
!=
0
;
res
=
t
sem_wait
(
&
exitSem
))
{
if
(
res
!=
EINTR
)
{
syslog
(
LOG_ERR
,
"failed to wait exit semphore: %d"
,
res
);
break
;
...
...
@@ -157,5 +157,5 @@ static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context) {
sigaction
(
SIGUSR2
,
&
act
,
NULL
);
// inform main thread to exit
sem_post
(
&
exitSem
);
t
sem_post
(
&
exitSem
);
}
src/dnode/src/dnodeTelemetry.c
浏览文件 @
6608e13c
...
...
@@ -36,7 +36,7 @@
#include "dnodeInt.h"
#include "dnodeTelemetry.h"
static
sem_t
tsExitSem
;
static
t
sem_t
tsExitSem
;
static
pthread_t
tsTelemetryThread
;
#define TELEMETRY_SERVER "telemetry.taosdata.com"
...
...
@@ -266,7 +266,7 @@ int32_t dnodeInitTelemetry() {
return
0
;
}
if
(
sem_init
(
&
tsExitSem
,
0
,
0
)
==
-
1
)
{
if
(
t
sem_init
(
&
tsExitSem
,
0
,
0
)
==
-
1
)
{
// just log the error, it is ok for telemetry to fail
dTrace
(
"failed to create semaphore for telemetry, reason:%s"
,
strerror
(
errno
));
return
0
;
...
...
@@ -291,8 +291,8 @@ void dnodeCleanupTelemetry() {
}
if
(
tsTelemetryThread
)
{
sem_post
(
&
tsExitSem
);
t
sem_post
(
&
tsExitSem
);
pthread_join
(
tsTelemetryThread
,
NULL
);
sem_destroy
(
&
tsExitSem
);
t
sem_destroy
(
&
tsExitSem
);
}
}
src/kit/taosdemo/taosdemo.c
浏览文件 @
6608e13c
...
...
@@ -440,9 +440,9 @@ typedef struct {
char
*
cols
;
bool
use_metric
;
sem_t
mutex_sem
;
t
sem_t
mutex_sem
;
int
notFinished
;
sem_t
lock_sem
;
t
sem_t
lock_sem
;
}
info
;
typedef
struct
{
...
...
@@ -459,9 +459,9 @@ typedef struct {
int
data_of_order
;
int
data_of_rate
;
sem_t
*
mutex_sem
;
int
*
notFinished
;
sem_t
*
lock_sem
;
t
sem_t
*
mutex_sem
;
int
*
notFinished
;
t
sem_t
*
lock_sem
;
}
sTable
;
/* ******************************* Global
...
...
@@ -729,9 +729,9 @@ int main(int argc, char *argv[]) {
t_info
->
end_table_id
=
i
<
b
?
last
+
a
:
last
+
a
-
1
;
last
=
t_info
->
end_table_id
+
1
;
sem_init
(
&
(
t_info
->
mutex_sem
),
0
,
1
);
t
sem_init
(
&
(
t_info
->
mutex_sem
),
0
,
1
);
t_info
->
notFinished
=
t_info
->
end_table_id
-
t_info
->
start_table_id
+
1
;
sem_init
(
&
(
t_info
->
lock_sem
),
0
,
0
);
t
sem_init
(
&
(
t_info
->
lock_sem
),
0
,
0
);
if
(
query_mode
==
SYNC
)
{
pthread_create
(
pids
+
i
,
NULL
,
syncWrite
,
t_info
);
...
...
@@ -762,8 +762,8 @@ int main(int argc, char *argv[]) {
for
(
int
i
=
0
;
i
<
threads
;
i
++
)
{
info
*
t_info
=
infos
+
i
;
taos_close
(
t_info
->
taos
);
sem_destroy
(
&
(
t_info
->
mutex_sem
));
sem_destroy
(
&
(
t_info
->
lock_sem
));
t
sem_destroy
(
&
(
t_info
->
mutex_sem
));
t
sem_destroy
(
&
(
t_info
->
lock_sem
));
}
free
(
pids
);
...
...
@@ -1021,8 +1021,8 @@ void multiThreadCreateTable(char* cols, bool use_metric, int threads, int ntable
for
(
int
i
=
0
;
i
<
threads
;
i
++
)
{
info
*
t_info
=
infos
+
i
;
sem_destroy
(
&
(
t_info
->
mutex_sem
));
sem_destroy
(
&
(
t_info
->
lock_sem
));
t
sem_destroy
(
&
(
t_info
->
mutex_sem
));
t
sem_destroy
(
&
(
t_info
->
lock_sem
));
}
free
(
pids
);
...
...
@@ -1272,7 +1272,7 @@ void *asyncWrite(void *sarg) {
taos_query_a
(
winfo
->
taos
,
"show databases"
,
callBack
,
tb_info
);
}
sem_wait
(
&
(
winfo
->
lock_sem
));
t
sem_wait
(
&
(
winfo
->
lock_sem
));
free
(
tb_infos
);
return
NULL
;
...
...
@@ -1292,10 +1292,10 @@ void callBack(void *param, TAOS_RES *res, int code) {
// If finished;
if
(
tb_info
->
counter
>=
tb_info
->
target
)
{
sem_wait
(
tb_info
->
mutex_sem
);
t
sem_wait
(
tb_info
->
mutex_sem
);
(
*
(
tb_info
->
notFinished
))
--
;
if
(
*
(
tb_info
->
notFinished
)
==
0
)
sem_post
(
tb_info
->
lock_sem
);
sem_post
(
tb_info
->
mutex_sem
);
if
(
*
(
tb_info
->
notFinished
)
==
0
)
t
sem_post
(
tb_info
->
lock_sem
);
t
sem_post
(
tb_info
->
mutex_sem
);
return
;
}
...
...
src/os/inc/os.h
浏览文件 @
6608e13c
...
...
@@ -41,6 +41,7 @@ extern "C" {
#endif
#include "osAtomic.h"
#include "osCommon.h"
#include "osDef.h"
#include "osDir.h"
#include "osFile.h"
...
...
src/os/inc/osCommon.h
0 → 100644
浏览文件 @
6608e13c
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TDENGINE_OS_COMMON_H
#define TDENGINE_OS_COMMON_H
#ifdef __cplusplus
extern
"C"
{
#endif
#ifndef TAOS_OS_DEF_ZU
#define PRIzu "zu"
#endif
#ifdef __cplusplus
}
#endif
#endif
src/os/inc/osWindows.h
浏览文件 @
6608e13c
...
...
@@ -97,6 +97,9 @@ typedef SOCKET eventfd_t;
#define TAOS_OS_DEF_EPOLL
#define TAOS_EPOLL_WAIT_TIME 100
#define TAOS_OS_DEF_ZU
#define PRIzu "ld"
#define TAOS_OS_FUNC_STRING_WCHAR
int
twcslen
(
const
wchar_t
*
wcs
);
#define TAOS_OS_FUNC_STRING_GETLINE
...
...
src/os/src/detail/osMemory.c
浏览文件 @
6608e13c
...
...
@@ -42,7 +42,7 @@ static bool random_alloc_fail(size_t size, const char* file, uint32_t line) {
}
if
(
fpAllocLog
!=
NULL
)
{
fprintf
(
fpAllocLog
,
"%s:%d: memory allocation of %
zu
bytes will fail.
\n
"
,
file
,
line
,
size
);
fprintf
(
fpAllocLog
,
"%s:%d: memory allocation of %
"
PRIzu
"
bytes will fail.
\n
"
,
file
,
line
,
size
);
}
return
true
;
...
...
@@ -159,7 +159,7 @@ static void* malloc_detect_leak(size_t size, const char* file, uint32_t line) {
}
if
(
size
>
UINT32_MAX
&&
fpAllocLog
!=
NULL
)
{
fprintf
(
fpAllocLog
,
"%s:%d: size too large: %
zu
.
\n
"
,
file
,
line
,
size
);
fprintf
(
fpAllocLog
,
"%s:%d: size too large: %
"
PRIzu
"
.
\n
"
,
file
,
line
,
size
);
}
blk
->
file
=
file
;
...
...
@@ -207,7 +207,7 @@ static void* realloc_detect_leak(void* ptr, size_t size, const char* file, uint3
}
if
(
size
>
UINT32_MAX
&&
fpAllocLog
!=
NULL
)
{
fprintf
(
fpAllocLog
,
"%s:%d: size too large: %
zu
.
\n
"
,
file
,
line
,
size
);
fprintf
(
fpAllocLog
,
"%s:%d: size too large: %
"
PRIzu
"
.
\n
"
,
file
,
line
,
size
);
}
blk
=
(
SMemBlock
*
)
p
;
...
...
@@ -295,7 +295,7 @@ static void dump_memory_leak() {
atomic_store_ptr
(
&
lock
,
0
);
fprintf
(
fpAllocLog
,
"
\n
number of blocks: %
zu, total bytes: %zu
\n
"
,
numOfBlk
,
totalSize
);
fprintf
(
fpAllocLog
,
"
\n
number of blocks: %
"
PRIzu
", total bytes: %"
PRIzu
"
\n
"
,
numOfBlk
,
totalSize
);
fflush
(
fpAllocLog
);
}
...
...
src/os/src/windows/w64Env.c
浏览文件 @
6608e13c
...
...
@@ -22,7 +22,7 @@ extern void taosWinSocketInit();
void
osInit
()
{
if
(
configDir
[
0
]
==
0
)
{
strcpy
(
configDir
,
"
~
/TDengine/cfg"
);
strcpy
(
configDir
,
"
C:
/TDengine/cfg"
);
}
strcpy
(
tsVnodeDir
,
"C:/TDengine/data"
);
...
...
src/plugins/http/src/httpContext.c
浏览文件 @
6608e13c
...
...
@@ -70,7 +70,7 @@ bool httpInitContexts() {
void
httpCleanupContexts
()
{
if
(
tsHttpServer
.
contextCache
!=
NULL
)
{
SCacheObj
*
cache
=
tsHttpServer
.
contextCache
;
httpInfo
(
"context cache is cleanuping, size:%
zu
"
,
taosHashGetSize
(
cache
->
pHashTable
));
httpInfo
(
"context cache is cleanuping, size:%
"
PRIzu
"
"
,
taosHashGetSize
(
cache
->
pHashTable
));
taosCacheCleanup
(
tsHttpServer
.
contextCache
);
tsHttpServer
.
contextCache
=
NULL
;
}
...
...
src/plugins/http/src/httpSession.c
浏览文件 @
6608e13c
...
...
@@ -107,7 +107,7 @@ static void httpDestroySession(void *data) {
void
httpCleanUpSessions
()
{
if
(
tsHttpServer
.
sessionCache
!=
NULL
)
{
SCacheObj
*
cache
=
tsHttpServer
.
sessionCache
;
httpInfo
(
"session cache is cleanuping, size:%
zu
"
,
taosHashGetSize
(
cache
->
pHashTable
));
httpInfo
(
"session cache is cleanuping, size:%
"
PRIzu
"
"
,
taosHashGetSize
(
cache
->
pHashTable
));
taosCacheCleanup
(
tsHttpServer
.
sessionCache
);
tsHttpServer
.
sessionCache
=
NULL
;
}
...
...
src/query/src/qExecutor.c
浏览文件 @
6608e13c
...
...
@@ -4543,7 +4543,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
while
(
pQInfo
->
groupIndex
<
numOfGroups
)
{
SArray
*
group
=
taosArrayGetP
(
pQInfo
->
tableGroupInfo
.
pGroupList
,
pQInfo
->
groupIndex
);
qDebug
(
"QInfo:%p last_row query on group:%d, total group:%
zu
, current group:%p"
,
pQInfo
,
pQInfo
->
groupIndex
,
qDebug
(
"QInfo:%p last_row query on group:%d, total group:%
"
PRIzu
"
, current group:%p"
,
pQInfo
,
pQInfo
->
groupIndex
,
numOfGroups
,
group
);
STsdbQueryCond
cond
=
{
...
...
@@ -4617,7 +4617,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
while
(
pQInfo
->
groupIndex
<
numOfGroups
)
{
SArray
*
group
=
taosArrayGetP
(
pQInfo
->
tableGroupInfo
.
pGroupList
,
pQInfo
->
groupIndex
);
qDebug
(
"QInfo:%p group by normal columns group:%d, total group:%
zu
"
,
pQInfo
,
pQInfo
->
groupIndex
,
numOfGroups
);
qDebug
(
"QInfo:%p group by normal columns group:%d, total group:%
"
PRIzu
"
"
,
pQInfo
,
pQInfo
->
groupIndex
,
numOfGroups
);
STsdbQueryCond
cond
=
{
.
colList
=
pQuery
->
colList
,
...
...
@@ -4809,7 +4809,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
}
qDebug
(
"QInfo %p numOfTables:%"
PRIu64
", index:%d, numOfGroups:%
zu
, %"
PRId64
" points returned, total:%"
PRId64
", offset:%"
PRId64
,
"QInfo %p numOfTables:%"
PRIu64
", index:%d, numOfGroups:%
"
PRIzu
"
, %"
PRId64
" points returned, total:%"
PRId64
", offset:%"
PRId64
,
pQInfo
,
pQInfo
->
tableqinfoGroupInfo
.
numOfTables
,
pQInfo
->
tableIndex
,
numOfGroups
,
pQuery
->
rec
.
rows
,
pQuery
->
rec
.
total
,
pQuery
->
limit
.
offset
);
}
...
...
@@ -6308,11 +6308,11 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qi
goto
_over
;
}
qDebug
(
"qmsg:%p query on %
zu
tables in one group from client"
,
pQueryMsg
,
tableGroupInfo
.
numOfTables
);
qDebug
(
"qmsg:%p query on %
"
PRIzu
"
tables in one group from client"
,
pQueryMsg
,
tableGroupInfo
.
numOfTables
);
}
int64_t
el
=
taosGetTimestampUs
()
-
st
;
qDebug
(
"qmsg:%p tag filter completed, numOfTables:%
zu
, elapsed time:%"
PRId64
"us"
,
pQueryMsg
,
tableGroupInfo
.
numOfTables
,
el
);
qDebug
(
"qmsg:%p tag filter completed, numOfTables:%
"
PRIzu
"
, elapsed time:%"
PRId64
"us"
,
pQueryMsg
,
tableGroupInfo
.
numOfTables
,
el
);
}
else
{
assert
(
0
);
}
...
...
@@ -6431,7 +6431,7 @@ bool qTableQuery(qinfo_t qinfo) {
if
(
IS_QUERY_KILLED
(
pQInfo
))
{
qDebug
(
"QInfo:%p query is killed"
,
pQInfo
);
}
else
if
(
pQuery
->
rec
.
rows
==
0
)
{
qDebug
(
"QInfo:%p over, %
zu
tables queried, %"
PRId64
" rows are returned"
,
pQInfo
,
pQInfo
->
tableqinfoGroupInfo
.
numOfTables
,
pQuery
->
rec
.
total
);
qDebug
(
"QInfo:%p over, %
"
PRIzu
"
tables queried, %"
PRId64
" rows are returned"
,
pQInfo
,
pQInfo
->
tableqinfoGroupInfo
.
numOfTables
,
pQuery
->
rec
.
total
);
}
else
{
qDebug
(
"QInfo:%p query paused, %"
PRId64
" rows returned, numOfTotal:%"
PRId64
" rows"
,
pQInfo
,
pQuery
->
rec
.
rows
,
pQuery
->
rec
.
total
+
pQuery
->
rec
.
rows
);
...
...
src/rpc/test/rclient.c
浏览文件 @
6608e13c
...
...
@@ -26,8 +26,8 @@ typedef struct {
int
num
;
int
numOfReqs
;
int
msgSize
;
sem_t
rspSem
;
sem_t
*
pOverSem
;
tsem_t
rspSem
;
tsem_t
*
pOverSem
;
pthread_t
thread
;
void
*
pRpc
;
}
SInfo
;
...
...
@@ -39,7 +39,7 @@ static void processResponse(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
if
(
pEpSet
)
pInfo
->
epSet
=
*
pEpSet
;
rpcFreeCont
(
pMsg
->
pCont
);
sem_post
(
&
pInfo
->
rspSem
);
t
sem_post
(
&
pInfo
->
rspSem
);
}
static
int
tcount
=
0
;
...
...
@@ -60,7 +60,7 @@ static void *sendRequest(void *param) {
rpcSendRequest
(
pInfo
->
pRpc
,
&
pInfo
->
epSet
,
&
rpcMsg
);
if
(
pInfo
->
num
%
20000
==
0
)
tInfo
(
"thread:%d, %d requests have been sent"
,
pInfo
->
index
,
pInfo
->
num
);
sem_wait
(
&
pInfo
->
rspSem
);
t
sem_wait
(
&
pInfo
->
rspSem
);
}
tDebug
(
"thread:%d, it is over"
,
pInfo
->
index
);
...
...
@@ -171,7 +171,7 @@ int main(int argc, char *argv[]) {
pInfo
->
epSet
=
epSet
;
pInfo
->
numOfReqs
=
numOfReqs
;
pInfo
->
msgSize
=
msgSize
;
sem_init
(
&
pInfo
->
rspSem
,
0
,
0
);
t
sem_init
(
&
pInfo
->
rspSem
,
0
,
0
);
pInfo
->
pRpc
=
pRpc
;
pthread_create
(
&
pInfo
->
thread
,
&
thattr
,
sendRequest
,
pInfo
);
pInfo
++
;
...
...
src/rpc/test/rsclient.c
浏览文件 @
6608e13c
...
...
@@ -27,8 +27,8 @@ typedef struct {
int
num
;
int
numOfReqs
;
int
msgSize
;
sem_t
rspSem
;
sem_t
*
pOverSem
;
tsem_t
rspSem
;
tsem_t
*
pOverSem
;
pthread_t
thread
;
void
*
pRpc
;
}
SInfo
;
...
...
@@ -171,7 +171,7 @@ int main(int argc, char *argv[]) {
pInfo
->
epSet
=
epSet
;
pInfo
->
numOfReqs
=
numOfReqs
;
pInfo
->
msgSize
=
msgSize
;
sem_init
(
&
pInfo
->
rspSem
,
0
,
0
);
t
sem_init
(
&
pInfo
->
rspSem
,
0
,
0
);
pInfo
->
pRpc
=
pRpc
;
pthread_create
(
&
pInfo
->
thread
,
&
thattr
,
sendRequest
,
pInfo
);
pInfo
++
;
...
...
src/sync/src/tarbitrator.c
浏览文件 @
6608e13c
...
...
@@ -31,7 +31,7 @@ static void arbSignalHandler(int32_t signum, siginfo_t *sigInfo, void *context);
static
void
arbProcessIncommingConnection
(
int
connFd
,
uint32_t
sourceIp
);
static
void
arbProcessBrokenLink
(
void
*
param
);
static
int
arbProcessPeerMsg
(
void
*
param
,
void
*
buffer
);
static
sem_t
tsArbSem
;
static
tsem_t
tsArbSem
;
static
ttpool_h
tsArbTcpPool
;
typedef
struct
{
...
...
@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
}
}
if
(
sem_init
(
&
tsArbSem
,
0
,
0
)
!=
0
)
{
if
(
t
sem_init
(
&
tsArbSem
,
0
,
0
)
!=
0
)
{
printf
(
"failed to create exit semphore
\n
"
);
exit
(
EXIT_FAILURE
);
}
...
...
@@ -98,7 +98,7 @@ int main(int argc, char *argv[]) {
sInfo
(
"TAOS arbitrator: %s:%d is running"
,
tsNodeFqdn
,
tsServerPort
);
for
(
int
res
=
sem_wait
(
&
tsArbSem
);
res
!=
0
;
res
=
sem_wait
(
&
tsArbSem
))
{
for
(
int
res
=
tsem_wait
(
&
tsArbSem
);
res
!=
0
;
res
=
t
sem_wait
(
&
tsArbSem
))
{
if
(
res
!=
EINTR
)
break
;
}
...
...
@@ -185,6 +185,6 @@ static void arbSignalHandler(int32_t signum, siginfo_t *sigInfo, void *context)
sInfo
(
"shut down signal is %d, sender PID:%d"
,
signum
,
sigInfo
->
si_pid
);
// inform main thread to exit
sem_post
(
&
tsArbSem
);
t
sem_post
(
&
tsArbSem
);
}
src/sync/test/syncClient.c
浏览文件 @
6608e13c
...
...
@@ -25,8 +25,8 @@ typedef struct {
int
num
;
int
numOfReqs
;
int
msgSize
;
sem_t
rspSem
;
sem_t
*
pOverSem
;
tsem_t
rspSem
;
tsem_t
*
pOverSem
;
pthread_t
thread
;
void
*
pRpc
;
}
SInfo
;
...
...
@@ -38,7 +38,7 @@ void processResponse(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
if
(
pEpSet
)
pInfo
->
epSet
=
*
pEpSet
;
rpcFreeCont
(
pMsg
->
pCont
);
sem_post
(
&
pInfo
->
rspSem
);
t
sem_post
(
&
pInfo
->
rspSem
);
}
int
tcount
=
0
;
...
...
@@ -59,7 +59,7 @@ void *sendRequest(void *param) {
rpcSendRequest
(
pInfo
->
pRpc
,
&
pInfo
->
epSet
,
&
rpcMsg
);
if
(
pInfo
->
num
%
20000
==
0
)
uInfo
(
"thread:%d, %d requests have been sent"
,
pInfo
->
index
,
pInfo
->
num
);
sem_wait
(
&
pInfo
->
rspSem
);
t
sem_wait
(
&
pInfo
->
rspSem
);
}
uDebug
(
"thread:%d, it is over"
,
pInfo
->
index
);
...
...
@@ -169,7 +169,7 @@ int main(int argc, char *argv[]) {
pInfo
->
epSet
=
epSet
;
pInfo
->
numOfReqs
=
numOfReqs
;
pInfo
->
msgSize
=
msgSize
;
sem_init
(
&
pInfo
->
rspSem
,
0
,
0
);
t
sem_init
(
&
pInfo
->
rspSem
,
0
,
0
);
pInfo
->
pRpc
=
pRpc
;
pthread_create
(
&
pInfo
->
thread
,
&
thattr
,
sendRequest
,
pInfo
);
pInfo
++
;
...
...
src/tsdb/src/tsdbRWHelper.c
浏览文件 @
6608e13c
...
...
@@ -573,14 +573,14 @@ int tsdbLoadCompData(SRWHelper *pHelper, SCompBlock *pCompBlock, void *target) {
}
if
(
taosTRead
(
pFile
->
fd
,
(
void
*
)
pHelper
->
pCompData
,
tsize
)
<
tsize
)
{
tsdbError
(
"vgId:%d failed to read %
zu
bytes from file %s since %s"
,
REPO_ID
(
pHelper
->
pRepo
),
tsize
,
pFile
->
fname
,
tsdbError
(
"vgId:%d failed to read %
"
PRIzu
"
bytes from file %s since %s"
,
REPO_ID
(
pHelper
->
pRepo
),
tsize
,
pFile
->
fname
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
}
if
(
!
taosCheckChecksumWhole
((
uint8_t
*
)
pHelper
->
pCompData
,
(
uint32_t
)
tsize
))
{
tsdbError
(
"vgId:%d file %s is broken, offset %"
PRId64
" size %
zu
"
,
REPO_ID
(
pHelper
->
pRepo
),
pFile
->
fname
,
tsdbError
(
"vgId:%d file %s is broken, offset %"
PRId64
" size %
"
PRIzu
"
"
,
REPO_ID
(
pHelper
->
pRepo
),
pFile
->
fname
,
(
int64_t
)
pCompBlock
->
offset
,
tsize
);
terrno
=
TSDB_CODE_TDB_FILE_CORRUPTED
;
return
-
1
;
...
...
src/tsdb/src/tsdbRead.c
浏览文件 @
6608e13c
...
...
@@ -270,7 +270,7 @@ TsdbQueryHandleT* tsdbQueryTables(TSDB_REPO_T* tsdb, STsdbQueryCond* pCond, STab
taosArraySort
(
pQueryHandle
->
pTableCheckInfo
,
tsdbCheckInfoCompar
);
pQueryHandle
->
defaultLoadColumn
=
getDefaultLoadColumns
(
pQueryHandle
,
true
);
tsdbDebug
(
"%p total numOfTable:%
zu
in query, %p"
,
pQueryHandle
,
taosArrayGetSize
(
pQueryHandle
->
pTableCheckInfo
),
pQueryHandle
->
qinfo
);
tsdbDebug
(
"%p total numOfTable:%
"
PRIzu
"
in query, %p"
,
pQueryHandle
,
taosArrayGetSize
(
pQueryHandle
->
pTableCheckInfo
),
pQueryHandle
->
qinfo
);
tsdbInitDataBlockLoadInfo
(
&
pQueryHandle
->
dataBlockLoadInfo
);
tsdbInitCompBlockLoadInfo
(
&
pQueryHandle
->
compBlockLoadInfo
);
...
...
@@ -2252,7 +2252,7 @@ SArray* createTableGroup(SArray* pTableList, STSchema* pTagSchema, SColIndex* pC
}
taosArrayPush
(
pTableGroup
,
&
sa
);
tsdbDebug
(
"all %
zu
tables belong to one group"
,
size
);
tsdbDebug
(
"all %
"
PRIzu
"
tables belong to one group"
,
size
);
}
else
{
STableGroupSupporter
*
pSupp
=
(
STableGroupSupporter
*
)
calloc
(
1
,
sizeof
(
STableGroupSupporter
));
pSupp
->
numOfCols
=
numOfOrderCols
;
...
...
@@ -2371,7 +2371,7 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, TSKEY skey, co
pGroupInfo
->
numOfTables
=
taosArrayGetSize
(
res
);
pGroupInfo
->
pGroupList
=
createTableGroup
(
res
,
pTagSchema
,
pColIndex
,
numOfCols
,
skey
);
tsdbDebug
(
"%p no table name/tag condition, all tables belong to one group, numOfTables:%
zu
"
,
tsdb
,
pGroupInfo
->
numOfTables
);
tsdbDebug
(
"%p no table name/tag condition, all tables belong to one group, numOfTables:%
"
PRIzu
"
"
,
tsdb
,
pGroupInfo
->
numOfTables
);
taosArrayDestroy
(
res
);
if
(
tsdbUnlockRepoMeta
(
tsdb
)
<
0
)
goto
_error
;
...
...
@@ -2414,7 +2414,7 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, TSKEY skey, co
pGroupInfo
->
numOfTables
=
taosArrayGetSize
(
res
);
pGroupInfo
->
pGroupList
=
createTableGroup
(
res
,
pTagSchema
,
pColIndex
,
numOfCols
,
skey
);
tsdbDebug
(
"%p stable tid:%d, uid:%"
PRIu64
" query, numOfTables:%
zu, belong to %zu
groups"
,
tsdb
,
pTable
->
tableId
.
tid
,
tsdbDebug
(
"%p stable tid:%d, uid:%"
PRIu64
" query, numOfTables:%
"
PRIzu
", belong to %"
PRIzu
"
groups"
,
tsdb
,
pTable
->
tableId
.
tid
,
pTable
->
tableId
.
uid
,
pGroupInfo
->
numOfTables
,
taosArrayGetSize
(
pGroupInfo
->
pGroupList
));
taosArrayDestroy
(
res
);
...
...
src/util/src/tkvstore.c
浏览文件 @
6608e13c
...
...
@@ -509,7 +509,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
ssize_t
tsize
=
taosTRead
(
pStore
->
fd
,
tbuf
,
sizeof
(
SKVRecord
));
if
(
tsize
==
0
)
break
;
if
(
tsize
<
sizeof
(
SKVRecord
))
{
uError
(
"failed to read %
zu
bytes from file %s at offset %"
PRId64
"since %s"
,
sizeof
(
SKVRecord
),
pStore
->
fname
,
uError
(
"failed to read %
"
PRIzu
"
bytes from file %s at offset %"
PRId64
"since %s"
,
sizeof
(
SKVRecord
),
pStore
->
fname
,
pStore
->
info
.
size
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
goto
_err
;
...
...
tests/script/windows/alter/metrics.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
print ======== step1
sql create database d2
sql use d2
...
...
tests/script/windows/alter/table.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
print ======== step1
sql create database d1
sql use d1
...
...
tests/script/windows/compute/avg.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_av_db
$tbPrefix = m_av_tb
$mtPrefix = m_av_mt
...
...
tests/script/windows/compute/bottom.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_bo_db
$tbPrefix = m_bo_tb
$mtPrefix = m_bo_mt
...
...
tests/script/windows/compute/count.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_co_db
$tbPrefix = m_co_tb
$mtPrefix = m_co_mt
...
...
tests/script/windows/compute/diff.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_di_db
$tbPrefix = m_di_tb
$mtPrefix = m_di_mt
...
...
tests/script/windows/compute/first.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_fi_db
$tbPrefix = m_fi_tb
$mtPrefix = m_fi_mt
...
...
tests/script/windows/compute/interval.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_in_db
$tbPrefix = m_in_tb
$mtPrefix = m_in_mt
...
...
tests/script/windows/compute/last.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_la_db
$tbPrefix = m_la_tb
$mtPrefix = m_la_mt
...
...
tests/script/windows/compute/leastsquare.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_le_db
$tbPrefix = m_le_tb
$mtPrefix = m_le_mt
...
...
tests/script/windows/compute/max.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_ma_db
$tbPrefix = m_ma_tb
$mtPrefix = m_ma_mt
...
...
tests/script/windows/compute/min.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_mi_db
$tbPrefix = m_mi_tb
$mtPrefix = m_mi_mt
...
...
tests/script/windows/compute/percentile.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_pe_db
$tbPrefix = m_pe_tb
$mtPrefix = m_pe_mt
...
...
tests/script/windows/compute/stddev.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_st_db
$tbPrefix = m_st_tb
$mtPrefix = m_st_mt
...
...
tests/script/windows/compute/sum.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_su_db
$tbPrefix = m_su_tb
$mtPrefix = m_su_mt
...
...
tests/script/windows/compute/top.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_to_db
$tbPrefix = m_to_tb
$mtPrefix = m_to_mt
...
...
tests/script/windows/db/basic.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
print ============================ dnode1 start
$i = 0
...
...
tests/script/windows/db/len.sim
浏览文件 @
6608e13c
sleep 3000
sql connect
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
print =============== step1
sql_error drop database dd
...
...
tests/script/windows/field/2.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_bt_db
$tbPrefix = fi_bt_tb
$mtPrefix = fi_bt_mt
...
...
tests/script/windows/field/3.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_3_db
$tbPrefix = fi_3_tb
$mtPrefix = fi_3_mt
...
...
tests/script/windows/field/4.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_4_db
$tbPrefix = fi_4_tb
$mtPrefix = fi_4_mt
...
...
tests/script/windows/field/5.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_5_db
$tbPrefix = fi_5_tb
$mtPrefix = fi_5_mt
...
...
tests/script/windows/field/6.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_6_db
$tbPrefix = fi_6_tb
$mtPrefix = fi_6_mt
...
...
tests/script/windows/field/bigint.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_bi_db
$tbPrefix = fi_bi_tb
$mtPrefix = fi_bi_mt
...
...
tests/script/windows/field/binary.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_by_db
$tbPrefix = fi_by_tb
$mtPrefix = fi_by_mt
...
...
tests/script/windows/field/bool.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_bo_db
$tbPrefix = fi_bo_tb
$mtPrefix = fi_bo_mt
...
...
tests/script/windows/field/double.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_do_db
$tbPrefix = fi_do_tb
$mtPrefix = fi_do_mt
...
...
tests/script/windows/field/float.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_fl_db
$tbPrefix = fi_fl_tb
$mtPrefix = fi_fl_mt
...
...
tests/script/windows/field/int.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_in_db
$tbPrefix = fi_in_tb
$mtPrefix = fi_in_mt
...
...
tests/script/windows/field/single.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_si_db
$tbPrefix = fi_si_tb
$mtPrefix = fi_si_mt
...
...
tests/script/windows/field/smallint.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_sm_db
$tbPrefix = fi_sm_tb
$mtPrefix = fi_sm_mt
...
...
tests/script/windows/field/tinyint.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = fi_ti_db
$tbPrefix = fi_ti_tb
$mtPrefix = fi_ti_mt
...
...
tests/script/windows/import/basic.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
sql create database ibadb
sql use ibadb
sql create table tb(ts timestamp, i int)
...
...
tests/script/windows/insert/basic.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = tb_in_db
$tbPrefix = tb_in_tb
...
...
tests/script/windows/insert/query_block1_file.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = tb_1f_db
$tbPrefix = tb_1f_tb
...
...
@@ -24,7 +31,7 @@ $y = $N / 2
while $x > $y
$ms = $x . m
$xt = - . $x
sql insert into $tb values (now - $ms ,
-
$x )
sql insert into $tb values (now - $ms , $x )
$x = $x - 1
endw
...
...
tests/script/windows/insert/query_block1_memory.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = tb_1m_db
$tbPrefix = tb_1m_tb
...
...
tests/script/windows/insert/query_block2_file.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = tb_2f_db
$tbPrefix = tb_2f_tb
...
...
tests/script/windows/insert/query_block2_memory.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = tb_2m_db
$tbPrefix = tb_2m_tb
...
...
tests/script/windows/insert/query_file_memory.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = tb_fm_db
$tbPrefix = tb_fm_tb
...
...
tests/script/windows/insert/query_multi_file.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = tb_mf_db
$tbPrefix = tb_mf_tb
...
...
tests/script/windows/table/binary.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = lm_bn_db
$tbPrefix = lm_bn_tb
...
...
tests/script/windows/table/bool.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = lm_bo_db
$tbPrefix = lm_bo_tb
...
...
tests/script/windows/table/column_name.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = lm_cm_db
$tbPrefix = lm_cm_tb
...
...
tests/script/windows/table/column_num.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = lm_cn_db
$tbPrefix = lm_cn_tb
...
...
tests/script/windows/table/column_value.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = lm_cv_db
$tbPrefix = lm_cv_tb
...
...
tests/script/windows/table/db.table.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = lm_dt_db
$tbPrefix = lm_dt_tb
...
...
tests/script/windows/table/double.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = lm_do_db
$tbPrefix = lm_do_tb
...
...
tests/script/windows/table/float.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = lm_fl_db
$tbPrefix = lm_fl_tb
...
...
tests/script/windows/table/table.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ============================ dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = ob_tb_db
$tbPrefix = ob_tb_tb
...
...
tests/script/windows/table/table_len.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$i = 0
$dbPrefix = lm_tb_db
$tbPrefix = lm_tb_tb
...
...
tests/script/windows/tag/3.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_3_db
$tbPrefix = ta_3_tb
$mtPrefix = ta_3_mt
...
...
tests/script/windows/tag/4.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_4_db
$tbPrefix = ta_4_tb
$mtPrefix = ta_4_mt
...
...
tests/script/windows/tag/5.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_5_db
$tbPrefix = ta_5_tb
$mtPrefix = ta_5_mt
...
...
tests/script/windows/tag/6.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_6_db
$tbPrefix = ta_6_tb
$mtPrefix = ta_6_mt
...
...
tests/script/windows/tag/add.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_ad_db
$tbPrefix = ta_ad_tb
$mtPrefix = ta_ad_mt
...
...
tests/script/windows/tag/bigint.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_bi_db
$tbPrefix = ta_bi_tb
$mtPrefix = ta_bi_mt
...
...
tests/script/windows/tag/binary.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_by_db
$tbPrefix = ta_by_tb
$mtPrefix = ta_by_mt
...
...
tests/script/windows/tag/binary_binary.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_bib_db
$tbPrefix = ta_bib_tb
$mtPrefix = ta_bib_mt
...
...
tests/script/windows/tag/bool.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_bo_db
$tbPrefix = ta_bo_tb
$mtPrefix = ta_bo_mt
...
...
tests/script/windows/tag/bool_binary.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_bob_db
$tbPrefix = ta_bob_tb
$mtPrefix = ta_bob_mt
...
...
tests/script/windows/tag/bool_int.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_boi_db
$tbPrefix = ta_boi_tb
$mtPrefix = ta_boi_mt
...
...
tests/script/windows/tag/change.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_ch_db
$tbPrefix = ta_ch_tb
$mtPrefix = ta_ch_mt
...
...
tests/script/windows/tag/column.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_co_db
$tbPrefix = ta_co_tb
$mtPrefix = ta_co_mt
...
...
tests/script/windows/tag/create.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_cr_db
$tbPrefix = ta_cr_tb
$mtPrefix = ta_cr_mt
...
...
tests/script/windows/tag/delete.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_de_db
$tbPrefix = ta_de_tb
$mtPrefix = ta_de_mt
...
...
tests/script/windows/tag/double.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_do_db
$tbPrefix = ta_do_tb
$mtPrefix = ta_do_mt
...
...
tests/script/windows/tag/filter.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_fi_db
$tbPrefix = ta_fi_tb
$mtPrefix = ta_fi_mt
...
...
tests/script/windows/tag/float.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_fl_db
$tbPrefix = ta_fl_tb
$mtPrefix = ta_fl_mt
...
...
tests/script/windows/tag/int.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_in_db
$tbPrefix = ta_in_tb
$mtPrefix = ta_in_mt
...
...
tests/script/windows/tag/int_binary.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_inb_db
$tbPrefix = ta_inb_tb
$mtPrefix = ta_inb_mt
...
...
tests/script/windows/tag/int_float.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_inf_db
$tbPrefix = ta_inf_tb
$mtPrefix = ta_inf_mt
...
...
tests/script/windows/tag/set.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_se_db
$tbPrefix = ta_se_tb
$mtPrefix = ta_se_mt
...
...
tests/script/windows/tag/smallint.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_sm_db
$tbPrefix = ta_sm_tb
$mtPrefix = ta_sm_mt
...
...
tests/script/windows/tag/tinyint.sim
浏览文件 @
6608e13c
...
...
@@ -2,6 +2,13 @@ sql connect
sleep 3000
print ======================== dnode1 start
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = ta_ti_db
$tbPrefix = ta_ti_tb
$mtPrefix = ta_ti_mt
...
...
tests/script/windows/vector/metrics_field.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_mf_db
$tbPrefix = m_mf_tb
$mtPrefix = m_mf_mt
...
...
tests/script/windows/vector/metrics_mix.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_mx_db
$tbPrefix = m_mx_tb
$mtPrefix = m_mx_mt
...
...
tests/script/windows/vector/metrics_query.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_mq_db
$tbPrefix = m_mq_tb
$mtPrefix = m_mq_mt
...
...
tests/script/windows/vector/metrics_tag.sim
浏览文件 @
6608e13c
sql connect
sleep 3000
sql show databases
sql drop database $data00 -x e1
e1:
sql show databases
sql drop database $data00 -x e2
e2:
$dbPrefix = m_mtg_db
$tbPrefix = m_mtg_tb
$mtPrefix = m_mtg_mt
...
...
tests/script/windows/vector/metrics_time.sim
浏览文件 @
6608e13c
此差异已折叠。
点击以展开。
tests/script/windows/vector/multi.sim
浏览文件 @
6608e13c
此差异已折叠。
点击以展开。
tests/script/windows/vector/single.sim
浏览文件 @
6608e13c
此差异已折叠。
点击以展开。
tests/script/windows/vector/table_field.sim
浏览文件 @
6608e13c
此差异已折叠。
点击以展开。
tests/script/windows/vector/table_mix.sim
浏览文件 @
6608e13c
此差异已折叠。
点击以展开。
tests/script/windows/vector/table_query.sim
浏览文件 @
6608e13c
此差异已折叠。
点击以展开。
tests/script/windows/vector/table_time.sim
浏览文件 @
6608e13c
此差异已折叠。
点击以展开。
tests/script/wtest.bat
0 → 100644
浏览文件 @
6608e13c
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录