Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mr、小李
TDengine
提交
4bd41a0f
T
TDengine
项目概览
Mr、小李
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4bd41a0f
编写于
8月 10, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
TD-1057
上级
41d97eee
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
122 addition
and
27 deletion
+122
-27
src/client/src/tscSub.c
src/client/src/tscSub.c
+1
-1
src/client/src/tscSubquery.c
src/client/src/tscSubquery.c
+6
-6
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+1
-1
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/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/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/test.bat
tests/script/test.bat
+60
-0
未找到文件。
src/client/src/tscSub.c
浏览文件 @
4bd41a0f
...
...
@@ -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
;
}
...
...
src/client/src/tscSubquery.c
浏览文件 @
4bd41a0f
...
...
@@ -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
);
...
...
@@ -1225,7 +1225,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
{
...
...
@@ -1260,7 +1260,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
);
}
...
...
@@ -1915,7 +1915,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
;
...
...
@@ -1949,7 +1949,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
;
}
...
...
src/client/src/tscUtil.c
浏览文件 @
4bd41a0f
...
...
@@ -1864,7 +1864,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/os/inc/os.h
浏览文件 @
4bd41a0f
...
...
@@ -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
浏览文件 @
4bd41a0f
/*
* 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
浏览文件 @
4bd41a0f
...
...
@@ -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
浏览文件 @
4bd41a0f
...
...
@@ -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/plugins/http/src/httpContext.c
浏览文件 @
4bd41a0f
...
...
@@ -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
浏览文件 @
4bd41a0f
...
...
@@ -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
浏览文件 @
4bd41a0f
...
...
@@ -4478,7 +4478,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
=
{
...
...
@@ -4552,7 +4552,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
,
...
...
@@ -4743,7 +4743,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
);
}
...
...
@@ -6241,11 +6241,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
);
}
...
...
@@ -6356,7 +6356,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/tsdb/src/tsdbRWHelper.c
浏览文件 @
4bd41a0f
...
...
@@ -608,14 +608,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
浏览文件 @
4bd41a0f
...
...
@@ -250,7 +250,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
);
...
...
@@ -2190,7 +2190,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
;
...
...
@@ -2309,7 +2309,7 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, const char* pT
pGroupInfo
->
numOfTables
=
taosArrayGetSize
(
res
);
pGroupInfo
->
pGroupList
=
createTableGroup
(
res
,
pTagSchema
,
pColIndex
,
numOfCols
);
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
;
...
...
@@ -2352,7 +2352,7 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, const char* pT
pGroupInfo
->
numOfTables
=
taosArrayGetSize
(
res
);
pGroupInfo
->
pGroupList
=
createTableGroup
(
res
,
pTagSchema
,
pColIndex
,
numOfCols
);
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
浏览文件 @
4bd41a0f
...
...
@@ -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/test.bat
0 → 100644
浏览文件 @
4bd41a0f
@echo
off
echo
TDengine
in
windows
echo
Start
TDengine
Testing
Case
...
set
"SCRIPT_DIR=
%~dp0
"
echo
SCRIPT_DIR
:
%SCRIPT_DIR%
set
"BUILD_DIR=
%~dp0
..\..\debug\build\bin"
set
"TSIM=
%~dp0
..\..\debug\build\bin\tsim"
echo
BUILD_DIR
:
%BUILD_DIR%
set
"SIM_DIR=
%~dp0
..\..\sim"
echo
SIM_DIR
:
%SIM_DIR%
set
"TSIM_DIR=
%~dp0
..\..\sim\tsim"
echo
TSIM_DIR
:
%TSIM_DIR%
set
"CFG_DIR=
%~dp0
..\..\sim\tsim\cfg"
echo
CFG_DIR
:
%CFG_DIR%
set
"LOG_DIR=
%~dp0
..\..\sim\tsim\log"
echo
LOG_DIR
:
%LOG_DIR%
set
"TAOS_CFG=
%~dp0
..\..\sim\tsim\cfg\taos.cfg"
echo
TAOS_CFG
:
%TAOS_CFG%
if
not
exist
%SIM_DIR%
mkdir
%SIM_DIR%
if
not
exist
%TSIM_DIR%
mkdir
%TSIM_DIR%
if
exist
%CFG_DIR%
rmdir
/s/q
%CFG_DIR%
if
exist
%LOG_DIR%
rmdir
/s/q
%LOG_DIR%
if
not
exist
%CFG_DIR%
mkdir
%CFG_DIR%
if
not
exist
%LOG_DIR%
mkdir
%LOG_DIR%
echo
firstEp
%FIRSTEP%
>
%TAOS_CFG%
echo
serverPort
6030
>>
%TAOS_CFG%
echo
wal
2
>>
%TAOS_CFG%
echo
asyncLog
0
>>
%TAOS_CFG%
echo
locale
en_US
.UTF
-
8
>>
%TAOS_CFG%
echo
logDir
%LOG_DIR%
>>
%TAOS_CFG%
echo
scriptDir
%SCRIPT_DIR%
>>
%TAOS_CFG%
echo
numOfLogLines
100000000
>>
%TAOS_CFG%
echo
tmrDebugFlag
131
>>
%TAOS_CFG%
echo
rpcDebugFlag
143
>>
%TAOS_CFG%
echo
cDebugFlag
143
>>
%TAOS_CFG%
echo
qdebugFlag
143
>>
%TAOS_CFG%
echo
udebugFlag
143
>>
%TAOS_CFG%
set
"FILE_NAME=windows\testSuite.sim"
set
"FIRSTEP=localhost"
if
"
%
1"
==
"-f"
set
"FILE_NAME=
%
2"
if
"
%
1"
==
"-h"
set
"FIRSTEP=
%
2"
if
"
%
3"
==
"-f"
set
"FILE_NAME=
%
4"
if
"
%
3"
==
"-h"
set
"FIRSTEP=
%
4"
echo
FILE_NAME
:
%FILE_NAME%
echo
FIRSTEP
:
%FIRSTEP%
echo
ExcuteCmd
:
%tsim%
-c
%CFG_DIR%
-f
%FILE_NAME%
%tsim%
-c
%CFG_DIR%
-f
%FILE_NAME%
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录