Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yiicenne
TDengine
提交
d1f5edb6
TDengine
项目概览
yiicenne
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
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,发现更多精彩内容 >>
提交
d1f5edb6
编写于
2月 09, 2020
作者:
H
hjxilinx
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor codes
上级
2129bc1e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
17 deletion
+12
-17
src/client/src/tscFunctionImpl.c
src/client/src/tscFunctionImpl.c
+1
-2
src/system/detail/inc/vnodeRead.h
src/system/detail/inc/vnodeRead.h
+10
-14
src/system/detail/src/vnodeQueryProcess.c
src/system/detail/src/vnodeQueryProcess.c
+1
-1
未找到文件。
src/client/src/tscFunctionImpl.c
浏览文件 @
d1f5edb6
...
...
@@ -221,7 +221,7 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
}
else
if
(
functionId
==
TSDB_FUNC_TWA
)
{
*
type
=
TSDB_DATA_TYPE_DOUBLE
;
*
bytes
=
sizeof
(
STwaInfo
);
*
intermediateResBytes
=
sizeof
(
STwaInfo
)
;
*
intermediateResBytes
=
*
bytes
;
return
TSDB_CODE_SUCCESS
;
}
}
...
...
@@ -272,7 +272,6 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
}
else
if
(
functionId
==
TSDB_FUNC_PERCT
)
{
*
type
=
(
int16_t
)
TSDB_DATA_TYPE_DOUBLE
;
*
bytes
=
(
int16_t
)
sizeof
(
double
);
//*intermediateResBytes = POINTER_BYTES;
*
intermediateResBytes
=
(
int16_t
)
sizeof
(
double
);
}
else
if
(
functionId
==
TSDB_FUNC_LEASTSQR
)
{
*
type
=
TSDB_DATA_TYPE_BINARY
;
...
...
src/system/detail/inc/vnodeRead.h
浏览文件 @
d1f5edb6
...
...
@@ -85,10 +85,15 @@ typedef struct SQueryCostSummary {
int64_t
tmpBufferInDisk
;
// size of buffer for intermediate result
}
SQueryCostSummary
;
typedef
struct
SPosInfo
{
int64_t
pageId
;
int32_t
rowId
;
}
SPosInfo
;
typedef
struct
SOutputRes
{
uint16_t
numOfRows
;
int32_t
nAlloc
;
tFilePage
**
result
;
SPosInfo
pos
;
SResultInfo
*
resultInfo
;
}
SOutputRes
;
...
...
@@ -175,16 +180,17 @@ typedef struct SQueryRuntimeEnv {
* So we keep a copy of the support structure as well as the cache block data itself.
*/
SCacheBlock
cacheBlock
;
SQueryResultBuf
*
pResultBuf
;
bool
stableQuery
;
// is super table query or not
}
SQueryRuntimeEnv
;
/* intermediate
result
during multimeter query involves interval */
/* intermediate
pos
during multimeter query involves interval */
typedef
struct
SMeterQueryInfo
{
int64_t
lastKey
;
int64_t
skey
;
int64_t
ekey
;
int32_t
numOfRes
;
// uint32_t numOfPages;
// uint32_t numOfAlloc;
int32_t
reverseIndex
;
// reversed output indicator, start from (numOfRes-1)
int16_t
reverseFillRes
;
// denote if reverse fill the results in supplementary scan required or not
int16_t
queryRangeSet
;
// denote if the query range is set, only available for interval query
...
...
@@ -192,8 +198,6 @@ typedef struct SMeterQueryInfo {
int64_t
tag
;
STSCursor
cur
;
SResultInfo
*
resultInfo
;
// uint32_t* pageList;
// SIDList pageIdList;
int32_t
sid
;
// for retrieve the page id list
}
SMeterQueryInfo
;
...
...
@@ -238,16 +242,8 @@ typedef struct SMeterQuerySupportObj {
*/
int32_t
meterIdx
;
// int32_t meterOutputFd;
// int32_t lastPageId;
// int32_t numOfPages;
int32_t
numOfGroupResultPages
;
int32_t
groupResultSize
;
SQueryResultBuf
*
pResultBuf
;
// char* meterOutputMMapBuf;
// int64_t bufSize;
// char extBufFile[256]; // external file name
SMeterDataInfo
*
pMeterDataInfo
;
TSKEY
*
tsList
;
...
...
src/system/detail/src/vnodeQueryProcess.c
浏览文件 @
d1f5edb6
...
...
@@ -858,7 +858,7 @@ static void doOrderedScan(SQInfo *pQInfo) {
static
void
setupMeterQueryInfoForSupplementQuery
(
SMeterQuerySupportObj
*
pSupporter
)
{
for
(
int32_t
i
=
0
;
i
<
pSupporter
->
numOfMeters
;
++
i
)
{
SMeterQueryInfo
*
pMeterQueryInfo
=
pSupporter
->
pMeterDataInfo
[
i
].
pMeterQInfo
;
SQueryResultBuf
*
pResultBuf
=
pSupporter
->
pResultBuf
;
SQueryResultBuf
*
pResultBuf
=
pSupporter
->
runtimeEnv
.
pResultBuf
;
changeMeterQueryInfoForSuppleQuery
(
pResultBuf
,
pMeterQueryInfo
,
pSupporter
->
rawSKey
,
pSupporter
->
rawEKey
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录