Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
faf5fc1f
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
faf5fc1f
编写于
1月 16, 2020
作者:
S
slguan
提交者:
GitHub
1月 16, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1140 from taosdata/beta/v1.6.5.3
Beta/v1.6.5.3
上级
e3129e4e
eb2def1e
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
22 addition
and
10 deletion
+22
-10
src/client/src/tscSecondaryMerge.c
src/client/src/tscSecondaryMerge.c
+1
-2
src/inc/tinterpolation.h
src/inc/tinterpolation.h
+4
-4
src/system/detail/src/vnodeQueryImpl.c
src/system/detail/src/vnodeQueryImpl.c
+3
-2
src/util/src/tinterpolation.c
src/util/src/tinterpolation.c
+14
-2
未找到文件。
src/client/src/tscSecondaryMerge.c
浏览文件 @
faf5fc1f
...
...
@@ -440,8 +440,7 @@ void tscDestroyLocalReducer(SSqlObj *pSql) {
tscTrace
(
"%p waiting for delete procedure, status: %d"
,
pSql
,
status
);
}
tfree
(
pLocalReducer
->
interpolationInfo
.
prevValues
);
tfree
(
pLocalReducer
->
interpolationInfo
.
pTags
);
taosDestoryInterpoInfo
(
&
pLocalReducer
->
interpolationInfo
);
if
(
pLocalReducer
->
pCtx
!=
NULL
)
{
for
(
int32_t
i
=
0
;
i
<
pCmd
->
fieldsInfo
.
numOfOutputCols
;
++
i
)
{
...
...
src/inc/tinterpolation.h
浏览文件 @
faf5fc1f
...
...
@@ -38,13 +38,13 @@ typedef struct SPoint {
void
*
val
;
}
SPoint
;
typedef
void
(
*
__interpo_callback_fn_t
)(
void
*
param
);
int64_t
taosGetIntervalStartTimestamp
(
int64_t
startTime
,
int64_t
timeRange
,
char
intervalTimeUnit
,
int16_t
precision
);
void
taosInitInterpoInfo
(
SInterpolationInfo
*
pInterpoInfo
,
int32_t
order
,
int64_t
startTimeStamp
,
int32_t
numOfTags
,
int32_t
rowSize
);
void
taosDestoryInterpoInfo
(
SInterpolationInfo
*
pInterpoInfo
);
void
taosInterpoSetStartInfo
(
SInterpolationInfo
*
pInterpoInfo
,
int32_t
numOfRawDataInRows
,
int32_t
type
);
TSKEY
taosGetRevisedEndKey
(
TSKEY
ekey
,
int32_t
order
,
int32_t
timeInterval
,
int8_t
intervalTimeUnit
,
int8_t
precision
);
...
...
@@ -78,8 +78,8 @@ int32_t taosNumOfRemainPoints(SInterpolationInfo *pInterpoInfo);
*/
int32_t
taosDoInterpoResult
(
SInterpolationInfo
*
pInterpoInfo
,
int16_t
interpoType
,
tFilePage
**
data
,
int32_t
numOfRawDataInRows
,
int32_t
outputRows
,
int64_t
nInterval
,
int64_t
*
pPrimaryKeyArray
,
tColModel
*
pModel
,
char
**
srcData
,
int64_t
*
defaultVal
,
int32_t
*
functionIDs
,
int32_t
bufSize
);
const
int64_t
*
pPrimaryKeyArray
,
tColModel
*
pModel
,
char
**
srcData
,
int64_t
*
defaultVal
,
const
int32_t
*
functionIDs
,
int32_t
bufSize
);
int
taosDoLinearInterpolation
(
int32_t
type
,
SPoint
*
point1
,
SPoint
*
point2
,
SPoint
*
point
);
...
...
src/system/detail/src/vnodeQueryImpl.c
浏览文件 @
faf5fc1f
...
...
@@ -2261,6 +2261,8 @@ static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
free
(
pRuntimeEnv
->
vnodeFileInfo
.
pFileInfo
);
}
taosDestoryInterpoInfo
(
&
pRuntimeEnv
->
interpoInfo
);
if
(
pRuntimeEnv
->
pInterpoBuf
!=
NULL
)
{
for
(
int32_t
i
=
0
;
i
<
pRuntimeEnv
->
pQuery
->
numOfOutputCols
;
++
i
)
{
tfree
(
pRuntimeEnv
->
pInterpoBuf
[
i
]);
...
...
@@ -7085,7 +7087,6 @@ bool vnodeHasRemainResults(void *handle) {
SQuery
*
pQuery
=
pRuntimeEnv
->
pQuery
;
SInterpolationInfo
*
pInterpoInfo
=
&
pRuntimeEnv
->
interpoInfo
;
if
(
pQuery
->
limit
.
limit
>
0
&&
pQInfo
->
pointsRead
>=
pQuery
->
limit
.
limit
)
{
return
false
;
}
...
...
src/util/src/tinterpolation.c
浏览文件 @
faf5fc1f
...
...
@@ -77,6 +77,18 @@ void taosInitInterpoInfo(SInterpolationInfo* pInterpoInfo, int32_t order, int64_
tfree
(
pInterpoInfo
->
prevValues
);
}
// the SInterpolationInfo itself will not be released
void
taosDestoryInterpoInfo
(
SInterpolationInfo
*
pInterpoInfo
)
{
if
(
pInterpoInfo
==
NULL
)
{
return
;
}
tfree
(
pInterpoInfo
->
prevValues
);
tfree
(
pInterpoInfo
->
nextValues
);
tfree
(
pInterpoInfo
->
pTags
);
}
void
taosInterpoSetStartInfo
(
SInterpolationInfo
*
pInterpoInfo
,
int32_t
numOfRawDataInRows
,
int32_t
type
)
{
if
(
type
==
TSDB_INTERPO_NONE
)
{
return
;
...
...
@@ -283,8 +295,8 @@ static void doInterpoResultImpl(SInterpolationInfo* pInterpoInfo, int16_t interp
int32_t
taosDoInterpoResult
(
SInterpolationInfo
*
pInterpoInfo
,
int16_t
interpoType
,
tFilePage
**
data
,
int32_t
numOfRawDataInRows
,
int32_t
outputRows
,
int64_t
nInterval
,
int64_t
*
pPrimaryKeyArray
,
tColModel
*
pModel
,
char
**
srcData
,
int64_t
*
defaultVal
,
int32_t
*
functionIDs
,
int32_t
bufSize
)
{
const
int64_t
*
pPrimaryKeyArray
,
tColModel
*
pModel
,
char
**
srcData
,
int64_t
*
defaultVal
,
const
int32_t
*
functionIDs
,
int32_t
bufSize
)
{
int32_t
num
=
0
;
pInterpoInfo
->
numOfCurrentInterpo
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录