Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dgr6878
TDengine
提交
f192397c
T
TDengine
项目概览
dgr6878
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
8
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,发现更多精彩内容 >>
提交
f192397c
编写于
8月 29, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix some possible query errors
上级
335d42cf
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
90 addition
and
26 deletion
+90
-26
src/system/inc/vnode.h
src/system/inc/vnode.h
+3
-3
src/system/src/mgmtDb.c
src/system/src/mgmtDb.c
+2
-0
src/system/src/mgmtMeter.c
src/system/src/mgmtMeter.c
+2
-1
src/system/src/vnodeQueryImpl.c
src/system/src/vnodeQueryImpl.c
+80
-20
src/system/src/vnodeQueryProcess.c
src/system/src/vnodeQueryProcess.c
+3
-2
未找到文件。
src/system/inc/vnode.h
浏览文件 @
f192397c
...
@@ -382,9 +382,9 @@ int vnodeCreateMeterObj(SMeterObj *pNew, SConnSec *pSec);
...
@@ -382,9 +382,9 @@ int vnodeCreateMeterObj(SMeterObj *pNew, SConnSec *pSec);
int
vnodeRemoveMeterObj
(
int
vnode
,
int
sid
);
int
vnodeRemoveMeterObj
(
int
vnode
,
int
sid
);
int
vnodeInsertPoints
(
SMeterObj
*
pObj
,
char
*
cont
,
int
contLen
,
char
source
,
void
*
,
int
sversion
,
int
*
numOfPoints
);
int
vnodeInsertPoints
(
SMeterObj
*
pObj
,
char
*
cont
,
int
contLen
,
char
source
,
void
*
,
int
sversion
,
int
*
numOfPoints
,
TSKEY
now
);
int
vnodeImportPoints
(
SMeterObj
*
pObj
,
char
*
cont
,
int
contLen
,
char
source
,
void
*
,
int
sversion
,
int
*
numOfPoints
);
int
vnodeImportPoints
(
SMeterObj
*
pObj
,
char
*
cont
,
int
contLen
,
char
source
,
void
*
,
int
sversion
,
int
*
numOfPoints
,
TSKEY
now
);
int
vnodeInsertBufferedPoints
(
int
vnode
);
int
vnodeInsertBufferedPoints
(
int
vnode
);
...
@@ -537,7 +537,7 @@ void vnodeRemoveCommitLog(int vnode);
...
@@ -537,7 +537,7 @@ void vnodeRemoveCommitLog(int vnode);
int
vnodeWriteToCommitLog
(
SMeterObj
*
pObj
,
char
action
,
char
*
cont
,
int
contLen
,
int
sversion
);
int
vnodeWriteToCommitLog
(
SMeterObj
*
pObj
,
char
action
,
char
*
cont
,
int
contLen
,
int
sversion
);
extern
int
(
*
vnodeProcessAction
[])(
SMeterObj
*
,
char
*
,
int
,
char
,
void
*
,
int
,
int
*
);
extern
int
(
*
vnodeProcessAction
[])(
SMeterObj
*
,
char
*
,
int
,
char
,
void
*
,
int
,
int
*
,
TSKEY
);
extern
int
(
*
pCompFunc
[])(
const
char
*
const
input
,
int
inputSize
,
const
int
elements
,
char
*
const
output
,
extern
int
(
*
pCompFunc
[])(
const
char
*
const
input
,
int
inputSize
,
const
int
elements
,
char
*
const
output
,
int
outputSize
,
char
algorithm
,
char
*
const
buffer
,
int
bufferSize
);
int
outputSize
,
char
algorithm
,
char
*
const
buffer
,
int
bufferSize
);
...
...
src/system/src/mgmtDb.c
浏览文件 @
f192397c
...
@@ -366,6 +366,8 @@ int mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter) {
...
@@ -366,6 +366,8 @@ int mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter) {
if
(
pAlter
->
daysToKeep
>
0
)
{
if
(
pAlter
->
daysToKeep
>
0
)
{
mTrace
(
"db:%s daysToKeep:%d change to %d"
,
pDb
->
name
,
pDb
->
cfg
.
daysToKeep
,
pAlter
->
daysToKeep
);
mTrace
(
"db:%s daysToKeep:%d change to %d"
,
pDb
->
name
,
pDb
->
cfg
.
daysToKeep
,
pAlter
->
daysToKeep
);
pDb
->
cfg
.
daysToKeep
=
pAlter
->
daysToKeep
;
pDb
->
cfg
.
daysToKeep
=
pAlter
->
daysToKeep
;
}
else
{
return
TSDB_CODE_INVALID_OPTION
;
}
}
if
(
sdbUpdateRow
(
dbSdb
,
pDb
,
tsDbUpdateSize
,
1
)
<
0
)
{
if
(
sdbUpdateRow
(
dbSdb
,
pDb
,
tsDbUpdateSize
,
1
)
<
0
)
{
...
...
src/system/src/mgmtMeter.c
浏览文件 @
f192397c
...
@@ -1052,7 +1052,8 @@ static void mgmtRetrieveMetersFromIDs(tQueryResultset *pRes, char *queryStr, cha
...
@@ -1052,7 +1052,8 @@ static void mgmtRetrieveMetersFromIDs(tQueryResultset *pRes, char *queryStr, cha
}
}
/* queried meter not belongs to this metric, ignore */
/* queried meter not belongs to this metric, ignore */
if
(
mgmtGetMeter
(
pMeterObj
->
pTagData
)
->
uid
!=
pMetric
->
uid
)
{
if
(
mgmtGetMeter
(
pMeterObj
->
pTagData
)
->
uid
!=
pMetric
->
uid
||
strncmp
(
pMetric
->
meterId
,
pMeterObj
->
pTagData
,
TSDB_METER_ID_LEN
)
!=
0
)
{
continue
;
continue
;
}
}
...
...
src/system/src/vnodeQueryImpl.c
浏览文件 @
f192397c
...
@@ -642,14 +642,19 @@ static int32_t loadDataBlockIntoMem(SCompBlock *pBlock, SField **pField, SQueryR
...
@@ -642,14 +642,19 @@ static int32_t loadDataBlockIntoMem(SCompBlock *pBlock, SField **pField, SQueryR
int32_t
ret
=
0
;
int32_t
ret
=
0
;
/* the first round always be 1, the secondary round is determined by queried
// the first round always be 1, the secondary round is determined by queried function
* function */
int32_t
round
=
pRuntimeEnv
->
scanFlag
;
int32_t
round
=
pRuntimeEnv
->
scanFlag
;
while
(
j
<
pBlock
->
numOfCols
&&
i
<
pQuery
->
numOfCols
)
{
while
(
j
<
pBlock
->
numOfCols
&&
i
<
pQuery
->
numOfCols
)
{
if
((
*
pField
)[
j
].
colId
<
pQuery
->
colList
[
i
].
data
.
colId
)
{
if
((
*
pField
)[
j
].
colId
<
pQuery
->
colList
[
i
].
data
.
colId
)
{
++
j
;
++
j
;
}
else
if
((
*
pField
)[
j
].
colId
==
pQuery
->
colList
[
i
].
data
.
colId
)
{
}
else
if
((
*
pField
)[
j
].
colId
==
pQuery
->
colList
[
i
].
data
.
colId
)
{
// add additional check for data type
if
((
*
pField
)[
j
].
type
!=
pQuery
->
colList
[
i
].
data
.
type
)
{
ret
=
TSDB_CODE_INVALID_QUERY_MSG
;
break
;
}
/*
/*
* during supplementary scan:
* during supplementary scan:
* 1. primary ts column (always loaded)
* 1. primary ts column (always loaded)
...
@@ -1919,13 +1924,12 @@ static bool cacheBoundaryCheck(SQuery *pQuery, SMeterObj *pMeterObj) {
...
@@ -1919,13 +1924,12 @@ static bool cacheBoundaryCheck(SQuery *pQuery, SMeterObj *pMeterObj) {
TSKEY
min
,
max
;
TSKEY
min
,
max
;
getQueryRange
(
pQuery
,
&
min
,
&
max
);
getQueryRange
(
pQuery
,
&
min
,
&
max
);
// the query time range is earlier than the first element in cache. abort
/*
if
(
max
<
keyFirst
)
{
* The query time range is earlier than the first element or later than the last elements in cache.
setQueryStatus
(
pQuery
,
QUERY_COMPLETED
);
* If the query window happens to overlap with the time range of disk files but not data in cache,
return
false
;
* the flag needs to be cleared. Otherwise, this flag will cause error in following processing.
}
*/
if
(
max
<
keyFirst
||
min
>
keyLast
)
{
if
(
min
>
keyLast
)
{
setQueryStatus
(
pQuery
,
QUERY_NO_DATA_TO_CHECK
);
setQueryStatus
(
pQuery
,
QUERY_NO_DATA_TO_CHECK
);
return
false
;
return
false
;
}
}
...
@@ -2072,6 +2076,8 @@ void vnodeCheckIfDataExists(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj,
...
@@ -2072,6 +2076,8 @@ void vnodeCheckIfDataExists(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj,
*
dataInCache
=
hasDataInCache
(
pRuntimeEnv
,
pMeterObj
);
*
dataInCache
=
hasDataInCache
(
pRuntimeEnv
,
pMeterObj
);
*
dataInDisk
=
hasDataInDisk
(
pQuery
,
pMeterObj
);
*
dataInDisk
=
hasDataInDisk
(
pQuery
,
pMeterObj
);
setQueryStatus
(
pQuery
,
QUERY_NOT_COMPLETED
);
}
}
static
void
doGetAlignedIntervalQueryRangeImpl
(
SQuery
*
pQuery
,
int64_t
qualifiedKey
,
int64_t
keyFirst
,
int64_t
keyLast
,
static
void
doGetAlignedIntervalQueryRangeImpl
(
SQuery
*
pQuery
,
int64_t
qualifiedKey
,
int64_t
keyFirst
,
int64_t
keyLast
,
...
@@ -2685,23 +2691,75 @@ static void vnodeOpenAllFiles(SQInfo *pQInfo, int32_t vnodeId) {
...
@@ -2685,23 +2691,75 @@ static void vnodeOpenAllFiles(SQInfo *pQInfo, int32_t vnodeId) {
qsort
(
pRuntimeEnv
->
pHeaderFiles
,
(
size_t
)
pRuntimeEnv
->
numOfFiles
,
sizeof
(
SQueryFileInfo
),
file_order_comparator
);
qsort
(
pRuntimeEnv
->
pHeaderFiles
,
(
size_t
)
pRuntimeEnv
->
numOfFiles
,
sizeof
(
SQueryFileInfo
),
file_order_comparator
);
}
}
static
void
updateOffsetVal
(
SQueryRuntimeEnv
*
pRuntimeEnv
,
void
*
pBlock
)
{
static
void
updateOffsetVal
(
SQueryRuntimeEnv
*
pRuntimeEnv
,
SBlockInfo
*
pBlockInfo
,
void
*
pBlock
)
{
SQuery
*
pQuery
=
pRuntimeEnv
->
pQuery
;
SQuery
*
pQuery
=
pRuntimeEnv
->
pQuery
;
int32_t
newPos
=
pQuery
->
pos
;
if
(
QUERY_IS_ASC_QUERY
(
pQuery
))
{
if
(
QUERY_IS_ASC_QUERY
(
pQuery
))
{
pQuery
->
pos
+=
pQuery
->
limit
.
offset
;
if
(
newPos
+
pQuery
->
limit
.
offset
>
pBlockInfo
->
size
)
{
newPos
=
pBlockInfo
->
size
-
1
;
}
else
{
newPos
+=
pQuery
->
limit
.
offset
;
}
}
else
{
}
else
{
pQuery
->
pos
-=
pQuery
->
limit
.
offset
;
if
(
newPos
<
pQuery
->
limit
.
offset
)
{
newPos
=
0
;
}
else
{
newPos
-=
pQuery
->
limit
.
offset
;
}
}
}
TSKEY
newKey
=
0
;
if
(
IS_DISK_DATA_BLOCK
(
pQuery
))
{
if
(
IS_DISK_DATA_BLOCK
(
pQuery
))
{
pQuery
->
skey
=
getTimestampInDiskBlock
(
pRuntimeEnv
,
pQuery
->
p
os
);
newKey
=
getTimestampInDiskBlock
(
pRuntimeEnv
,
newP
os
);
}
else
{
}
else
{
pQuery
->
skey
=
getTimestampInCacheBlock
(
pBlock
,
pQuery
->
p
os
);
newKey
=
getTimestampInCacheBlock
(
pBlock
,
newP
os
);
}
}
pQuery
->
lastKey
=
pQuery
->
skey
;
/*
pQuery
->
limit
.
offset
=
0
;
* The actually qualified points that can be skipped needs to be calculated if query is
* done in current data block
*/
if
((
newKey
>
pQuery
->
ekey
&&
QUERY_IS_ASC_QUERY
(
pQuery
))
||
(
newKey
<
pQuery
->
ekey
&&
!
QUERY_IS_ASC_QUERY
(
pQuery
)))
{
setQueryStatus
(
pQuery
,
QUERY_COMPLETED
);
// update the pQuery->limit.offset value, and pQuery->pos value
TSKEY
*
keys
=
NULL
;
if
(
IS_DISK_DATA_BLOCK
(
pQuery
))
{
keys
=
(
TSKEY
*
)
pRuntimeEnv
->
primaryColBuffer
->
data
;
}
else
{
keys
=
(
TSKEY
*
)
(((
SCacheBlock
*
)
pBlock
)
->
offset
[
0
]);
}
int32_t
i
=
0
;
if
(
QUERY_IS_ASC_QUERY
(
pQuery
))
{
for
(
i
=
pQuery
->
pos
;
i
<
pBlockInfo
->
size
&&
pQuery
->
limit
.
offset
>
0
;
++
i
)
{
if
(
keys
[
i
]
<=
pQuery
->
ekey
)
{
pQuery
->
limit
.
offset
-=
1
;
}
else
{
break
;
}
}
}
else
{
for
(
i
=
pQuery
->
pos
;
i
>=
0
&&
pQuery
->
limit
.
offset
>
0
;
--
i
)
{
if
(
keys
[
i
]
>=
pQuery
->
ekey
)
{
pQuery
->
limit
.
offset
-=
1
;
}
else
{
break
;
}
}
}
pQuery
->
pos
=
i
;
}
else
{
pQuery
->
skey
=
newKey
;
pQuery
->
lastKey
=
pQuery
->
skey
;
// update the offset value
pQuery
->
limit
.
offset
-=
abs
(
newPos
-
pQuery
->
pos
);
pQuery
->
pos
=
newPos
;
}
}
}
// todo ignore the avg/sum/min/max/count/stddev/top/bottom functions, of which
// todo ignore the avg/sum/min/max/count/stddev/top/bottom functions, of which
...
@@ -2816,8 +2874,9 @@ static int32_t doSkipDataBlock(SQueryRuntimeEnv *pRuntimeEnv) {
...
@@ -2816,8 +2874,9 @@ static int32_t doSkipDataBlock(SQueryRuntimeEnv *pRuntimeEnv) {
int32_t
maxReads
=
(
QUERY_IS_ASC_QUERY
(
pQuery
))
?
blockInfo
.
size
-
pQuery
->
pos
:
pQuery
->
pos
+
1
;
int32_t
maxReads
=
(
QUERY_IS_ASC_QUERY
(
pQuery
))
?
blockInfo
.
size
-
pQuery
->
pos
:
pQuery
->
pos
+
1
;
if
(
pQuery
->
limit
.
offset
<
maxReads
)
{
// start position in current block
if
(
pQuery
->
limit
.
offset
<
maxReads
||
(
pQuery
->
ekey
<=
blockInfo
.
keyLast
&&
QUERY_IS_ASC_QUERY
(
pQuery
))
||
updateOffsetVal
(
pRuntimeEnv
,
pBlock
);
(
pQuery
->
ekey
>=
blockInfo
.
keyFirst
&&
!
QUERY_IS_ASC_QUERY
(
pQuery
)))
{
// start position in current block
updateOffsetVal
(
pRuntimeEnv
,
&
blockInfo
,
pBlock
);
break
;
break
;
}
else
{
}
else
{
pQuery
->
limit
.
offset
-=
maxReads
;
pQuery
->
limit
.
offset
-=
maxReads
;
...
@@ -2843,8 +2902,9 @@ void forwardQueryStartPosition(SQueryRuntimeEnv *pRuntimeEnv) {
...
@@ -2843,8 +2902,9 @@ void forwardQueryStartPosition(SQueryRuntimeEnv *pRuntimeEnv) {
SBlockInfo
blockInfo
=
getBlockBasicInfo
(
pBlock
,
blockType
);
SBlockInfo
blockInfo
=
getBlockBasicInfo
(
pBlock
,
blockType
);
int32_t
maxReads
=
(
QUERY_IS_ASC_QUERY
(
pQuery
))
?
blockInfo
.
size
-
pQuery
->
pos
:
pQuery
->
pos
+
1
;
int32_t
maxReads
=
(
QUERY_IS_ASC_QUERY
(
pQuery
))
?
blockInfo
.
size
-
pQuery
->
pos
:
pQuery
->
pos
+
1
;
if
(
pQuery
->
limit
.
offset
<
maxReads
)
{
// start position in current block
if
(
pQuery
->
limit
.
offset
<
maxReads
||
(
pQuery
->
ekey
<=
blockInfo
.
keyLast
&&
QUERY_IS_ASC_QUERY
(
pQuery
))
||
updateOffsetVal
(
pRuntimeEnv
,
pBlock
);
(
pQuery
->
ekey
>=
blockInfo
.
keyFirst
&&
!
QUERY_IS_ASC_QUERY
(
pQuery
)))
{
// start position in current block
updateOffsetVal
(
pRuntimeEnv
,
&
blockInfo
,
pBlock
);
}
else
{
}
else
{
pQuery
->
limit
.
offset
-=
maxReads
;
pQuery
->
limit
.
offset
-=
maxReads
;
doSkipDataBlock
(
pRuntimeEnv
);
doSkipDataBlock
(
pRuntimeEnv
);
...
...
src/system/src/vnodeQueryProcess.c
浏览文件 @
f192397c
...
@@ -404,7 +404,8 @@ static bool multimeterMultioutputHelper(SQInfo *pQInfo, bool *dataInDisk, bool *
...
@@ -404,7 +404,8 @@ static bool multimeterMultioutputHelper(SQInfo *pQInfo, bool *dataInDisk, bool *
vnodeCheckIfDataExists
(
pRuntimeEnv
,
pMeterObj
,
dataInDisk
,
dataInCache
);
vnodeCheckIfDataExists
(
pRuntimeEnv
,
pMeterObj
,
dataInDisk
,
dataInCache
);
if
(
pQuery
->
lastKey
>
pMeterObj
->
lastKey
&&
QUERY_IS_ASC_QUERY
(
pQuery
))
{
// data in file or cache is not qualified for the query. abort
if
(
!
(
dataInCache
||
dataInDisk
))
{
dTrace
(
"QInfo:%p vid:%d sid:%d meterId:%s, qrange:%lld-%lld, nores, %p"
,
pQInfo
,
pMeterObj
->
vnode
,
pMeterObj
->
sid
,
dTrace
(
"QInfo:%p vid:%d sid:%d meterId:%s, qrange:%lld-%lld, nores, %p"
,
pQInfo
,
pMeterObj
->
vnode
,
pMeterObj
->
sid
,
pMeterObj
->
meterId
,
pQuery
->
skey
,
pQuery
->
ekey
,
pQuery
);
pMeterObj
->
meterId
,
pQuery
->
skey
,
pQuery
->
ekey
,
pQuery
);
return
false
;
return
false
;
...
@@ -578,7 +579,7 @@ static void vnodeMultiMeterMultiOutputProcessor(SQInfo *pQInfo) {
...
@@ -578,7 +579,7 @@ static void vnodeMultiMeterMultiOutputProcessor(SQInfo *pQInfo) {
if
(
pQuery
->
numOfFilterCols
==
0
&&
pQuery
->
limit
.
offset
>
0
)
{
if
(
pQuery
->
numOfFilterCols
==
0
&&
pQuery
->
limit
.
offset
>
0
)
{
forwardQueryStartPosition
(
pRuntimeEnv
);
forwardQueryStartPosition
(
pRuntimeEnv
);
if
(
Q_STATUS_EQUAL
(
pQuery
->
over
,
QUERY_NO_DATA_TO_CHECK
))
{
if
(
Q_STATUS_EQUAL
(
pQuery
->
over
,
QUERY_NO_DATA_TO_CHECK
|
QUERY_COMPLETED
))
{
pQuery
->
skey
=
pSupporter
->
rawSKey
;
pQuery
->
skey
=
pSupporter
->
rawSKey
;
pQuery
->
ekey
=
pSupporter
->
rawEKey
;
pQuery
->
ekey
=
pSupporter
->
rawEKey
;
continue
;
continue
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录