Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
19ceadd6
T
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1181
Star
22014
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
19ceadd6
编写于
11月 28, 2019
作者:
H
hjxilinx
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[jira none]
上级
4466964a
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
103 addition
and
54 deletion
+103
-54
src/client/src/tscFunctionImpl.c
src/client/src/tscFunctionImpl.c
+1
-1
src/inc/tutil.h
src/inc/tutil.h
+5
-3
src/os/darwin/inc/os.h
src/os/darwin/inc/os.h
+1
-1
src/os/linux/inc/os.h
src/os/linux/inc/os.h
+2
-1
src/system/detail/inc/vnodeQueryImpl.h
src/system/detail/inc/vnodeQueryImpl.h
+2
-2
src/system/detail/inc/vnodeRead.h
src/system/detail/inc/vnodeRead.h
+3
-3
src/system/detail/src/vnodeCommit.c
src/system/detail/src/vnodeCommit.c
+2
-2
src/system/detail/src/vnodeQueryImpl.c
src/system/detail/src/vnodeQueryImpl.c
+85
-40
src/system/detail/src/vnodeQueryProcess.c
src/system/detail/src/vnodeQueryProcess.c
+2
-1
未找到文件。
src/client/src/tscFunctionImpl.c
浏览文件 @
19ceadd6
...
...
@@ -3191,7 +3191,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
} else { \
*(type *)(ctx)->aOutputBuf = *(type *)(d) - (*(type *)(&(ctx)->param[1].i64Key)); \
*(type *)(&(ctx)->param[1].i64Key) = *(type *)(d); \
*(int64_t *)(ctx)->ptsOutputBuf = *(int64_t *)((ctx)->ptsList
+ (TSDB_KEYSIZE)*index
); \
*(int64_t *)(ctx)->ptsOutputBuf = *(int64_t *)((ctx)->ptsList
[index]
); \
} \
} while (0);
...
...
src/inc/tutil.h
浏览文件 @
19ceadd6
...
...
@@ -26,12 +26,14 @@ extern "C" {
#include "tsdb.h"
#ifndef STDERR_FILENO
#define VALIDFD(x) ((x) > 2)
#else
#define VALIDFD(x) ((x) > STDERR_FILENO)
#define STDERR_FILENO (2)
#endif
#define FD_VALID(x) ((x) > STDERR_FILENO)
#define FD_INITIALIZER ((int32_t)-1)
#define WCHAR wchar_t
#define tfree(x) \
{ \
if (x) { \
...
...
src/os/darwin/inc/os.h
浏览文件 @
19ceadd6
...
...
@@ -47,7 +47,7 @@
#define taosCloseSocket(x) \
{ \
if (
VALIDF
D(x)) { \
if (
FD_VALI
D(x)) { \
close(x); \
x = -1; \
} \
...
...
src/os/linux/inc/os.h
浏览文件 @
19ceadd6
...
...
@@ -75,11 +75,12 @@ extern "C" {
#define taosCloseSocket(x) \
{ \
if (
VALIDFD(x)) {
\
if (
FD_VALID(x)) {
\
close(x); \
x = -1; \
} \
}
#define taosWriteSocket(fd, buf, len) write(fd, buf, len)
#define taosReadSocket(fd, buf, len) read(fd, buf, len)
...
...
src/system/detail/inc/vnodeQueryImpl.h
浏览文件 @
19ceadd6
...
...
@@ -192,9 +192,9 @@ int64_t getNextAccessedKeyInData(SQuery* pQuery, int64_t* pPrimaryCol, SBlockInf
uint32_t
getDataBlocksForMeters
(
SMeterQuerySupportObj
*
pSupporter
,
SQuery
*
pQuery
,
char
*
pHeaderData
,
int32_t
numOfMeters
,
SQueryFileInfo
*
pQueryFileInfo
,
SMeterDataInfo
**
pMeterDataInfo
);
int32_t
LoadDatablockOnDemand
(
SCompBlock
*
pBlock
,
SField
**
pFields
,
int8_t
*
blkStatus
,
SQueryRuntimeEnv
*
pRuntimeEnv
,
int32_t
LoadDatablockOnDemand
(
SCompBlock
*
pBlock
,
SField
**
pFields
,
u
int8_t
*
blkStatus
,
SQueryRuntimeEnv
*
pRuntimeEnv
,
int32_t
fileIdx
,
int32_t
slotIdx
,
__block_search_fn_t
searchFn
,
bool
onDemand
);
char
*
vnodeGetHeaderFileData
(
SQueryRuntimeEnv
*
pRuntimeEnv
,
int32_t
fileIndex
);
char
*
vnodeGetHeaderFileData
(
SQueryRuntimeEnv
*
pRuntimeEnv
,
int32_t
vnodeId
,
int32_t
fileIndex
);
/**
* Create SMeterQueryInfo.
...
...
src/system/detail/inc/vnodeRead.h
浏览文件 @
19ceadd6
...
...
@@ -52,9 +52,9 @@ typedef struct SQueryLoadCompBlockInfo {
*/
typedef
struct
SQueryFileInfo
{
int32_t
fileID
;
/* file id */
char
headerFilePath
[
256
];
/* full file name */
char
dataFilePath
[
256
];
char
lastFilePath
[
256
];
char
headerFilePath
[
PATH_MAX
];
/* full file name */
char
dataFilePath
[
PATH_MAX
];
char
lastFilePath
[
PATH_MAX
];
int32_t
defaultMappingSize
;
/* default mapping size */
int32_t
headerFd
;
/* file handler */
...
...
src/system/detail/src/vnodeCommit.c
浏览文件 @
19ceadd6
...
...
@@ -81,7 +81,7 @@ int vnodeRenewCommitLog(int vnode) {
pthread_mutex_lock
(
&
(
pVnode
->
logMutex
));
if
(
VALIDF
D
(
pVnode
->
logFd
))
{
if
(
FD_VALI
D
(
pVnode
->
logFd
))
{
munmap
(
pVnode
->
pMem
,
pVnode
->
mappingSize
);
close
(
pVnode
->
logFd
);
rename
(
fileName
,
oldName
);
...
...
@@ -243,7 +243,7 @@ int vnodeInitCommit(int vnode) {
void
vnodeCleanUpCommit
(
int
vnode
)
{
SVnodeObj
*
pVnode
=
vnodeList
+
vnode
;
if
(
VALIDF
D
(
pVnode
->
logFd
))
close
(
pVnode
->
logFd
);
if
(
FD_VALI
D
(
pVnode
->
logFd
))
close
(
pVnode
->
logFd
);
if
(
pVnode
->
cfg
.
commitLog
&&
(
pVnode
->
logFd
>
0
&&
remove
(
pVnode
->
logFn
)
<
0
))
{
dError
(
"vid:%d, failed to remove:%s"
,
vnode
,
pVnode
->
logFn
);
...
...
src/system/detail/src/vnodeQueryImpl.c
浏览文件 @
19ceadd6
...
...
@@ -247,6 +247,47 @@ static void vnodeInitDataBlockInfo(SQueryLoadBlockInfo *pBlockLoadInfo) {
pBlockLoadInfo
->
fileListIndex
=
-
1
;
}
/**
* if the header is smaller than a threshold value(header size + initial offset value)
*
* @param vnodeId
* @param headerFileSize
* @return
*/
static
bool
isHeaderFileEmpty
(
int32_t
vnodeId
,
size_t
headerFileSize
)
{
SVnodeCfg
*
pVnodeCfg
=
&
vnodeList
[
vnodeId
].
cfg
;
return
headerFileSize
<=
getCompHeaderStartPosition
(
pVnodeCfg
);
}
static
void
doCloseQueryFileInfoFD
(
SQueryFileInfo
*
pVnodeFiles
)
{
tclose
(
pVnodeFiles
->
headerFd
);
tclose
(
pVnodeFiles
->
dataFd
);
tclose
(
pVnodeFiles
->
lastFd
);
}
static
int32_t
doOpenQueryFileInfoDF
(
SQInfo
*
pQInfo
,
SQueryFileInfo
*
pVnodeFiles
)
{
// if the header is smaller than a threshold value, this file is empty, no need to
pVnodeFiles
->
headerFd
=
open
(
pVnodeFiles
->
headerFilePath
,
O_RDONLY
);
if
(
!
FD_VALID
(
pVnodeFiles
->
headerFd
))
{
dError
(
"QInfo:%p failed open header file:%s reason:%s"
,
pQInfo
,
pVnodeFiles
->
headerFilePath
,
strerror
(
errno
));
return
-
1
;
}
pVnodeFiles
->
dataFd
=
open
(
pVnodeFiles
->
dataFilePath
,
O_RDONLY
);
if
(
!
FD_VALID
(
pVnodeFiles
->
headerFd
))
{
dError
(
"QInfo:%p failed open data file:%s reason:%s"
,
pQInfo
,
pVnodeFiles
->
dataFilePath
,
strerror
(
errno
));
return
-
1
;
}
pVnodeFiles
->
lastFd
=
open
(
pVnodeFiles
->
lastFilePath
,
O_RDONLY
);
if
(
!
FD_VALID
(
pVnodeFiles
->
headerFd
))
{
dError
(
"QInfo:%p failed open last file:%s reason:%s"
,
pQInfo
,
pVnodeFiles
->
lastFilePath
,
strerror
(
errno
));
return
-
1
;
}
return
TSDB_CODE_SUCCESS
;
}
static
void
doUnmapHeaderFileData
(
SQueryRuntimeEnv
*
pRuntimeEnv
)
{
if
(
pRuntimeEnv
->
mmapedHFileIndex
>=
0
)
{
assert
(
pRuntimeEnv
->
mmapedHFileIndex
<
pRuntimeEnv
->
numOfFiles
&&
pRuntimeEnv
->
mmapedHFileIndex
>=
0
);
...
...
@@ -255,6 +296,8 @@ static void doUnmapHeaderFileData(SQueryRuntimeEnv* pRuntimeEnv) {
munmap
(
otherVnodeFiles
->
pHeaderFileData
,
otherVnodeFiles
->
headFileSize
);
otherVnodeFiles
->
pHeaderFileData
=
NULL
;
doCloseQueryFileInfoFD
(
otherVnodeFiles
);
pRuntimeEnv
->
mmapedHFileIndex
=
-
1
;
}
...
...
@@ -263,34 +306,46 @@ static void doUnmapHeaderFileData(SQueryRuntimeEnv* pRuntimeEnv) {
/**
* mmap the data file into memory. For each query, only one header file is allowed to mmap into memory, in order to
* avoid too many mmapped files at the save time to cause OS return the message of "Cannot allocate memory",
* avoid too many m
emory
mapped files at the save time to cause OS return the message of "Cannot allocate memory",
* during query processing.
*
* @param pRuntimeEnv
* @param fileIndex
* @return the return value may be null, so any invoker needs to check the returned value
*/
char
*
vnodeGetHeaderFileData
(
SQueryRuntimeEnv
*
pRuntimeEnv
,
int32_t
fileIndex
)
{
char
*
vnodeGetHeaderFileData
(
SQueryRuntimeEnv
*
pRuntimeEnv
,
int32_t
vnodeId
,
int32_t
fileIndex
)
{
assert
(
fileIndex
>=
0
&&
fileIndex
<
pRuntimeEnv
->
numOfFiles
);
SQuery
*
pQuery
=
pRuntimeEnv
->
pQuery
;
SQInfo
*
pQInfo
=
(
SQInfo
*
)
GET_QINFO_ADDR
(
pQuery
);
// only for log output
SQueryFileInfo
*
pVnodeFiles
=
&
pRuntimeEnv
->
pVnodeFiles
[
fileIndex
];
size_t
size
=
pVnodeFiles
->
headFileSize
;
if
(
pVnodeFiles
->
pHeaderFileData
==
NULL
)
{
assert
(
pRuntimeEnv
->
mmapedHFileIndex
!=
fileIndex
);
doUnmapHeaderFileData
(
pRuntimeEnv
);
// do close the other m
ma
ped header file
doUnmapHeaderFileData
(
pRuntimeEnv
);
// do close the other m
emory map
ped header file
pVnodeFiles
->
pHeaderFileData
=
mmap
(
NULL
,
size
,
PROT_READ
,
MAP_SHARED
,
pVnodeFiles
->
headerFd
,
0
);
assert
(
pVnodeFiles
->
pHeaderFileData
==
NULL
);
// current header file is empty or broken, return directly
if
(
isHeaderFileEmpty
(
vnodeId
,
pVnodeFiles
->
headFileSize
))
{
return
pVnodeFiles
->
pHeaderFileData
;
}
if
(
doOpenQueryFileInfoDF
(
pQInfo
,
pVnodeFiles
)
!=
TSDB_CODE_SUCCESS
)
{
return
pVnodeFiles
->
pHeaderFileData
;
}
pVnodeFiles
->
pHeaderFileData
=
mmap
(
NULL
,
pVnodeFiles
->
headFileSize
,
PROT_READ
,
MAP_SHARED
,
pVnodeFiles
->
headerFd
,
0
);
if
(
pVnodeFiles
->
pHeaderFileData
==
MAP_FAILED
)
{
pVnodeFiles
->
pHeaderFileData
=
NULL
;
dError
(
"QInfo:%p failed to mmap header file:%s, size:%lld, %s"
,
pQInfo
,
pVnodeFiles
->
headerFilePath
,
size
,
strerror
(
errno
));
doCloseQueryFileInfoFD
(
pVnodeFiles
);
dError
(
"QInfo:%p failed to mmap header file:%s, size:%lld, %s"
,
pQInfo
,
pVnodeFiles
->
headerFilePath
,
pVnodeFiles
->
headFileSize
,
strerror
(
errno
));
}
else
{
pRuntimeEnv
->
mmapedHFileIndex
=
fileIndex
;
// set the value in case of success mmap file
if
(
madvise
(
pVnodeFiles
->
pHeaderFileData
,
s
ize
,
MADV_SEQUENTIAL
)
==
-
1
)
{
if
(
madvise
(
pVnodeFiles
->
pHeaderFileData
,
pVnodeFiles
->
headFileS
ize
,
MADV_SEQUENTIAL
)
==
-
1
)
{
dError
(
"QInfo:%p failed to advise kernel the usage of header file, reason:%s"
,
pQInfo
,
strerror
(
errno
));
}
}
...
...
@@ -326,7 +381,7 @@ static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntim
pSummary
->
numOfSeek
++
;
#if 1
char
*
data
=
vnodeGetHeaderFileData
(
pRuntimeEnv
,
fileIndex
);
char
*
data
=
vnodeGetHeaderFileData
(
pRuntimeEnv
,
pMeterObj
->
vnode
,
fileIndex
);
if
(
data
==
NULL
)
{
return
-
1
;
// failed to load the header file data into memory
}
...
...
@@ -2928,34 +2983,24 @@ static int file_order_comparator(const void *p1, const void *p2) {
* @param prefix
* @return
*/
static
int32_t
vnodeOpenVnodeDBFiles
(
SQInfo
*
pQInfo
,
SQueryFileInfo
*
pVnodeFiles
,
int32_t
fid
,
int32_t
vnodeId
,
char
*
fileName
,
char
*
prefix
)
{
static
int32_t
vnodeOpenVnodeDBFiles
(
SQueryFileInfo
*
pVnodeFiles
,
int32_t
fid
,
int32_t
vnodeId
,
char
*
fileName
,
char
*
prefix
)
{
pVnodeFiles
->
fileID
=
fid
;
pVnodeFiles
->
defaultMappingSize
=
DEFAULT_DATA_FILE_MMAP_WINDOW_SIZE
;
snprintf
(
pVnodeFiles
->
headerFilePath
,
256
,
"%s%s"
,
prefix
,
fileName
);
pVnodeFiles
->
headerFd
=
open
(
pVnodeFiles
->
headerFilePath
,
O_RDONLY
);
if
(
!
VALIDFD
(
pVnodeFiles
->
headerFd
))
{
dError
(
"QInfo:%p failed open header file:%s reason:%s"
,
pQInfo
,
pVnodeFiles
->
headerFilePath
,
strerror
(
errno
));
goto
_clean
;
}
snprintf
(
pVnodeFiles
->
headerFilePath
,
PATH_MAX
,
"%s%s"
,
prefix
,
fileName
);
struct
stat
fstat
=
{
0
};
if
(
stat
(
pVnodeFiles
->
headerFilePath
,
&
fstat
)
<
0
)
return
-
1
;
pVnodeFiles
->
headFileSize
=
fstat
.
st_size
;
snprintf
(
pVnodeFiles
->
dataFilePath
,
256
,
"%sv%df%d.data"
,
prefix
,
vnodeId
,
fid
);
snprintf
(
pVnodeFiles
->
lastFilePath
,
256
,
"%sv%df%d.last"
,
prefix
,
vnodeId
,
fid
);
pVnodeFiles
->
dataFd
=
open
(
pVnodeFiles
->
dataFilePath
,
O_RDONLY
);
pVnodeFiles
->
lastFd
=
open
(
pVnodeFiles
->
lastFilePath
,
O_RDONLY
);
// if (stat(pVnodeFiles->dataFilePath, &fstat) < 0) return -1;
// pVnodeFiles->dataFileSize = fstat.st_size;
//
// if (stat(pVnodeFiles->lastFilePath, &fstat) < 0) return -1;
// pVnodeFiles->lastFileSize = fstat.st_size;
snprintf
(
pVnodeFiles
->
dataFilePath
,
PATH_MAX
,
"%sv%df%d.data"
,
prefix
,
vnodeId
,
fid
);
snprintf
(
pVnodeFiles
->
lastFilePath
,
PATH_MAX
,
"%sv%df%d.last"
,
prefix
,
vnodeId
,
fid
);
pVnodeFiles
->
headerFd
=
FD_INITIALIZER
;
pVnodeFiles
->
dataFd
=
FD_INITIALIZER
;
pVnodeFiles
->
lastFd
=
FD_INITIALIZER
;
#if DEFAULT_IO_ENGINE == IO_ENGINE_MMAP
/* enforce kernel to preload data when the file is mapping */
...
...
@@ -2975,19 +3020,19 @@ static int32_t vnodeOpenVnodeDBFiles(SQInfo *pQInfo, SQueryFileInfo *pVnodeFiles
return
TSDB_CODE_SUCCESS
;
_clean:
#if DEFAULT_IO_ENGINE == IO_ENGINE_MMAP
_clean:
if
(
pVnodeFiles
->
pDataFileData
!=
MAP_FAILED
&&
pVnodeFiles
->
pDataFileData
!=
NULL
)
{
munmap
(
pVnodeFiles
->
pDataFileData
,
pVnodeFiles
->
defaultMappingSize
);
pVnodeFiles
->
pDataFileData
=
NULL
;
}
#endif
tclose
(
pVnodeFiles
->
headerFd
);
tclose
(
pVnodeFiles
->
dataFd
);
tclose
(
pVnodeFiles
->
lastFd
);
return
-
1
;
#endif
}
static
void
vnodeOpenAllFiles
(
SQInfo
*
pQInfo
,
int32_t
vnodeId
)
{
...
...
@@ -3047,7 +3092,7 @@ static void vnodeOpenAllFiles(SQInfo *pQInfo, int32_t vnodeId) {
}
SQueryFileInfo
*
pVnodeFiles
=
&
pRuntimeEnv
->
pVnodeFiles
[
pRuntimeEnv
->
numOfFiles
-
1
];
int32_t
ret
=
vnodeOpenVnodeDBFiles
(
p
QInfo
,
p
VnodeFiles
,
fid
,
vnodeId
,
pEntry
->
d_name
,
dbFilePathPrefix
);
int32_t
ret
=
vnodeOpenVnodeDBFiles
(
pVnodeFiles
,
fid
,
vnodeId
,
pEntry
->
d_name
,
dbFilePathPrefix
);
if
(
ret
<
0
)
{
memset
(
pVnodeFiles
,
0
,
sizeof
(
SQueryFileInfo
));
// reset information
pRuntimeEnv
->
numOfFiles
-=
1
;
...
...
@@ -3767,7 +3812,7 @@ void vnodeQueryFreeQInfoEx(SQInfo *pQInfo) {
}
}
if
(
VALIDF
D
(
pSupporter
->
meterOutputFd
))
{
if
(
FD_VALI
D
(
pSupporter
->
meterOutputFd
))
{
assert
(
pSupporter
->
meterOutputMMapBuf
!=
NULL
);
dTrace
(
"QInfo:%p disk-based output buffer during query:%lld bytes"
,
pQInfo
,
pSupporter
->
bufSize
);
munmap
(
pSupporter
->
meterOutputMMapBuf
,
pSupporter
->
bufSize
);
...
...
@@ -3868,7 +3913,7 @@ int32_t vnodeMultiMeterQueryPrepare(SQInfo *pQInfo, SQuery *pQuery, void *param)
getTmpfilePath
(
"tb_metric_mmap"
,
pSupporter
->
extBufFile
);
pSupporter
->
meterOutputFd
=
open
(
pSupporter
->
extBufFile
,
O_CREAT
|
O_RDWR
,
0666
);
if
(
!
VALIDF
D
(
pSupporter
->
meterOutputFd
))
{
if
(
!
FD_VALI
D
(
pSupporter
->
meterOutputFd
))
{
dError
(
"QInfo:%p failed to create file: %s on disk. %s"
,
pQInfo
,
pSupporter
->
extBufFile
,
strerror
(
errno
));
return
TSDB_CODE_SERV_OUT_OF_MEMORY
;
}
...
...
@@ -5492,7 +5537,7 @@ SMeterDataInfo **vnodeFilterQualifiedMeters(SQInfo *pQInfo, int32_t vid, int32_t
SVnodeObj
*
pVnode
=
&
vnodeList
[
vid
];
char
*
pHeaderFileData
=
vnodeGetHeaderFileData
(
pRuntimeEnv
,
fileIndex
);
char
*
pHeaderFileData
=
vnodeGetHeaderFileData
(
pRuntimeEnv
,
vid
,
fileIndex
);
if
(
pHeaderFileData
==
NULL
)
{
// failed to load header file into buffer
return
0
;
}
...
...
@@ -6491,7 +6536,7 @@ bool needPrimaryTimestampCol(SQuery *pQuery, SBlockInfo *pBlockInfo) {
return
loadPrimaryTS
;
}
int32_t
LoadDatablockOnDemand
(
SCompBlock
*
pBlock
,
SField
**
pFields
,
int8_t
*
blkStatus
,
SQueryRuntimeEnv
*
pRuntimeEnv
,
int32_t
LoadDatablockOnDemand
(
SCompBlock
*
pBlock
,
SField
**
pFields
,
u
int8_t
*
blkStatus
,
SQueryRuntimeEnv
*
pRuntimeEnv
,
int32_t
fileIdx
,
int32_t
slotIdx
,
__block_search_fn_t
searchFn
,
bool
onDemand
)
{
SQuery
*
pQuery
=
pRuntimeEnv
->
pQuery
;
SMeterObj
*
pMeterObj
=
pRuntimeEnv
->
pMeterObj
;
...
...
@@ -6979,7 +7024,7 @@ int32_t vnodeCopyQueryResultToMsg(void *handle, char *data, int32_t numOfRows) {
int32_t
fd
=
open
(
pQuery
->
sdata
[
0
]
->
data
,
O_RDONLY
,
0666
);
// make sure file exist
if
(
VALIDF
D
(
fd
))
{
if
(
FD_VALI
D
(
fd
))
{
size_t
s
=
lseek
(
fd
,
0
,
SEEK_END
);
dTrace
(
"QInfo:%p ts comp data return, file:%s, size:%lld"
,
pQInfo
,
pQuery
->
sdata
[
0
]
->
data
,
s
);
...
...
src/system/detail/src/vnodeQueryProcess.c
浏览文件 @
19ceadd6
...
...
@@ -290,8 +290,9 @@ static SMeterDataInfo *queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMe
pSummary
->
numOfFiles
++
;
SQueryFileInfo
*
pQueryFileInfo
=
&
pRuntimeEnv
->
pVnodeFiles
[
fileIdx
];
char
*
pHeaderData
=
vnodeGetHeaderFileData
(
pRuntimeEnv
,
fileIdx
);
char
*
pHeaderData
=
vnodeGetHeaderFileData
(
pRuntimeEnv
,
vnodeId
,
fileIdx
);
if
(
pHeaderData
==
NULL
)
{
// failed to mmap header file into buffer, ignore current file, try next
fid
+=
step
;
continue
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录