Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_44632607
TDengine
提交
f8ff7091
T
TDengine
项目概览
weixin_44632607
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
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,发现更多精彩内容 >>
未验证
提交
f8ff7091
编写于
2月 03, 2020
作者:
S
slguan
提交者:
GitHub
2月 03, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1175 from taosdata/beta/v1.6.5.3
Beta/v1.6.5.3
上级
8828c914
5031ac21
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
17 deletion
+23
-17
src/client/src/tscFunctionImpl.c
src/client/src/tscFunctionImpl.c
+10
-10
src/system/detail/src/vnodeQueryImpl.c
src/system/detail/src/vnodeQueryImpl.c
+7
-3
src/system/detail/src/vnodeQueryProcess.c
src/system/detail/src/vnodeQueryProcess.c
+6
-4
未找到文件。
src/client/src/tscFunctionImpl.c
浏览文件 @
f8ff7091
...
...
@@ -3024,14 +3024,14 @@ static void diff_function(SQLFunctionCtx *pCtx) {
if
(
pCtx
->
param
[
1
].
nType
==
INITIAL_VALUE_NOT_ASSIGNED
)
{
// initial value is not set yet
pCtx
->
param
[
1
].
i64Key
=
pData
[
i
];
pCtx
->
param
[
1
].
nType
=
pCtx
->
inputType
;
}
else
if
(
i
==
0
)
{
}
else
if
(
(
i
==
0
&&
pCtx
->
order
==
TSQL_SO_ASC
)
||
(
i
==
pCtx
->
size
-
1
&&
pCtx
->
order
==
TSQL_SO_DESC
)
)
{
*
pOutput
=
pData
[
i
]
-
pCtx
->
param
[
1
].
i64Key
;
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
pTimestamp
+=
step
;
}
else
{
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
1
];
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
step
];
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
...
...
@@ -3056,13 +3056,13 @@ static void diff_function(SQLFunctionCtx *pCtx) {
if
(
pCtx
->
param
[
1
].
nType
==
INITIAL_VALUE_NOT_ASSIGNED
)
{
// initial value is not set yet
pCtx
->
param
[
1
].
dKey
=
pData
[
i
];
pCtx
->
param
[
1
].
nType
=
pCtx
->
inputType
;
}
else
if
(
i
==
0
)
{
}
else
if
(
(
i
==
0
&&
pCtx
->
order
==
TSQL_SO_ASC
)
||
(
i
==
pCtx
->
size
-
1
&&
pCtx
->
order
==
TSQL_SO_DESC
)
)
{
*
pOutput
=
pData
[
i
]
-
pCtx
->
param
[
1
].
dKey
;
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
pTimestamp
+=
step
;
}
else
{
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
1
];
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
step
];
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
pTimestamp
+=
step
;
...
...
@@ -3086,13 +3086,13 @@ static void diff_function(SQLFunctionCtx *pCtx) {
if
(
pCtx
->
param
[
1
].
nType
==
INITIAL_VALUE_NOT_ASSIGNED
)
{
// initial value is not set yet
pCtx
->
param
[
1
].
dKey
=
pData
[
i
];
pCtx
->
param
[
1
].
nType
=
pCtx
->
inputType
;
}
else
if
(
i
==
0
)
{
}
else
if
(
(
i
==
0
&&
pCtx
->
order
==
TSQL_SO_ASC
)
||
(
i
==
pCtx
->
size
-
1
&&
pCtx
->
order
==
TSQL_SO_DESC
)
)
{
*
pOutput
=
pData
[
i
]
-
pCtx
->
param
[
1
].
dKey
;
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
pTimestamp
+=
step
;
}
else
{
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
1
];
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
step
];
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
pTimestamp
+=
step
;
...
...
@@ -3117,13 +3117,13 @@ static void diff_function(SQLFunctionCtx *pCtx) {
if
(
pCtx
->
param
[
1
].
nType
==
INITIAL_VALUE_NOT_ASSIGNED
)
{
// initial value is not set yet
pCtx
->
param
[
1
].
i64Key
=
pData
[
i
];
pCtx
->
param
[
1
].
nType
=
pCtx
->
inputType
;
}
else
if
(
i
==
0
)
{
}
else
if
(
(
i
==
0
&&
pCtx
->
order
==
TSQL_SO_ASC
)
||
(
i
==
pCtx
->
size
-
1
&&
pCtx
->
order
==
TSQL_SO_DESC
)
)
{
*
pOutput
=
pData
[
i
]
-
pCtx
->
param
[
1
].
i64Key
;
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
pTimestamp
+=
step
;
}
else
{
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
1
];
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
step
];
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
pTimestamp
+=
step
;
...
...
@@ -3147,13 +3147,13 @@ static void diff_function(SQLFunctionCtx *pCtx) {
if
(
pCtx
->
param
[
1
].
nType
==
INITIAL_VALUE_NOT_ASSIGNED
)
{
// initial value is not set yet
pCtx
->
param
[
1
].
i64Key
=
pData
[
i
];
pCtx
->
param
[
1
].
nType
=
pCtx
->
inputType
;
}
else
if
(
i
==
0
)
{
}
else
if
(
(
i
==
0
&&
pCtx
->
order
==
TSQL_SO_ASC
)
||
(
i
==
pCtx
->
size
-
1
&&
pCtx
->
order
==
TSQL_SO_DESC
)
)
{
*
pOutput
=
pData
[
i
]
-
pCtx
->
param
[
1
].
i64Key
;
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
pTimestamp
+=
step
;
}
else
{
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
1
];
*
pOutput
=
pData
[
i
]
-
pData
[
i
-
step
];
*
pTimestamp
=
pCtx
->
ptsList
[
i
];
pOutput
+=
step
;
pTimestamp
+=
step
;
...
...
src/system/detail/src/vnodeQueryImpl.c
浏览文件 @
f8ff7091
...
...
@@ -4525,10 +4525,11 @@ static void doSetTagValueInParam(tTagSchema *pTagSchema, int32_t tagColIdx, SMet
SSchema
*
pCol
=
&
pTagSchema
->
pSchema
[
tagColIdx
];
tVariantDestroy
(
param
);
tVariantCreateFromBinary
(
param
,
pStr
,
pCol
->
bytes
,
pCol
->
type
);
if
(
isNull
(
pStr
,
pCol
->
type
))
{
param
->
nType
=
TSDB_DATA_TYPE_NULL
;
}
else
{
tVariantCreateFromBinary
(
param
,
pStr
,
pCol
->
bytes
,
pCol
->
type
);
}
}
...
...
@@ -5993,10 +5994,13 @@ int32_t getDataBlocksForMeters(SMeterQuerySupportObj *pSupporter, SQuery *pQuery
size_t
bufferSize
=
size
+
sizeof
(
TSCKSUM
);
pMeterDataInfo
[
j
]
->
numOfBlocks
=
compInfo
.
numOfBlocks
;
pMeterDataInfo
[
j
]
->
pBlock
=
calloc
(
1
,
bufferSize
);
if
(
p
MeterDataInfo
[
j
]
->
pBlock
==
NULL
)
{
char
*
p
=
realloc
(
pMeterDataInfo
[
j
]
->
pBlock
,
bufferSize
);
if
(
p
==
NULL
)
{
clearAllMeterDataBlockInfo
(
pMeterDataInfo
,
0
,
numOfMeters
);
return
TSDB_CODE_SERV_OUT_OF_MEMORY
;
}
else
{
memset
(
p
,
0
,
bufferSize
);
pMeterDataInfo
[
j
]
->
pBlock
=
(
SCompBlock
*
)
p
;
}
read
(
pVnodeFileInfo
->
headerFd
,
pMeterDataInfo
[
j
]
->
pBlock
,
bufferSize
);
...
...
src/system/detail/src/vnodeQueryProcess.c
浏览文件 @
f8ff7091
...
...
@@ -573,10 +573,10 @@ static void vnodeMultiMeterMultiOutputProcessor(SQInfo *pQInfo) {
tSidSet
*
pSids
=
pSupporter
->
pSidSet
;
SMeterObj
*
pOneMeter
=
getMeterObj
(
pSupporter
->
pMeterObj
,
pMeterSidExtInfo
[
0
]
->
sid
);
resetCtxOutputBuf
(
pRuntimeEnv
);
if
(
isPointInterpoQuery
(
pQuery
))
{
resetCtxOutputBuf
(
pRuntimeEnv
);
assert
(
pQuery
->
limit
.
offset
==
0
&&
pQuery
->
limit
.
limit
!=
0
);
while
(
pSupporter
->
subgroupIdx
<
pSids
->
numOfSubSet
)
{
...
...
@@ -663,7 +663,9 @@ static void vnodeMultiMeterMultiOutputProcessor(SQInfo *pQInfo) {
if
(
pSupporter
->
meterIdx
>=
pSids
->
numOfSids
)
{
return
;
}
resetCtxOutputBuf
(
pRuntimeEnv
);
for
(
int32_t
i
=
0
;
i
<
pRuntimeEnv
->
usedIndex
;
++
i
)
{
SOutputRes
*
pOneRes
=
&
pRuntimeEnv
->
pResult
[
i
];
clearGroupResultBuf
(
pOneRes
,
pQuery
->
numOfOutputCols
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录