Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
53885b7d
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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,发现更多精彩内容 >>
未验证
提交
53885b7d
编写于
6月 17, 2020
作者:
S
Shengliang Guan
提交者:
GitHub
6月 17, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2328 from taosdata/hotfix/fixbug-query
Hotfix/fixbug query
上级
d0c9c6c3
2c170d65
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
11 deletion
+10
-11
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+7
-7
src/query/src/qast.c
src/query/src/qast.c
+1
-2
src/query/src/qpercentile.c
src/query/src/qpercentile.c
+1
-1
src/query/src/qtokenizer.c
src/query/src/qtokenizer.c
+1
-1
未找到文件。
src/query/src/qExecutor.c
浏览文件 @
53885b7d
...
...
@@ -4229,7 +4229,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
while
(
pQInfo
->
groupIndex
<
numOfGroups
)
{
SArray
*
group
=
taosArrayGetP
(
pQInfo
->
groupInfo
.
pGroupList
,
pQInfo
->
groupIndex
);
qTrace
(
"QInfo:%p last_row query on group:%d, total group:%
d, current group:%d
"
,
pQInfo
,
pQInfo
->
groupIndex
,
qTrace
(
"QInfo:%p last_row query on group:%d, total group:%
u, current group:%p
"
,
pQInfo
,
pQInfo
->
groupIndex
,
numOfGroups
,
group
);
STsdbQueryCond
cond
=
{
...
...
@@ -4476,7 +4476,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
}
qTrace
(
"QInfo %p numOfTables:%
d, index:%d, numOfGroups:%d, %d
points returned, total:%"
PRId64
", offset:%"
PRId64
,
"QInfo %p numOfTables:%
"
PRIu64
", index:%d, numOfGroups:%d, %"
PRId64
"
points returned, total:%"
PRId64
", offset:%"
PRId64
,
pQInfo
,
pQInfo
->
groupInfo
.
numOfTables
,
pQInfo
->
tableIndex
,
numOfGroups
,
pQuery
->
rec
.
rows
,
pQuery
->
rec
.
total
,
pQuery
->
limit
.
offset
);
}
...
...
@@ -4563,7 +4563,7 @@ static void multiTableQueryProcess(SQInfo *pQInfo) {
copyFromWindowResToSData
(
pQInfo
,
pRuntimeEnv
->
windowResInfo
.
pResult
);
}
qTrace
(
"QInfo:%p current:%
lld, total:%lld
"
,
pQInfo
,
pQuery
->
rec
.
rows
,
pQuery
->
rec
.
total
);
qTrace
(
"QInfo:%p current:%
"
PRId64
", total:%"
PRId64
"
"
,
pQInfo
,
pQuery
->
rec
.
rows
,
pQuery
->
rec
.
total
);
return
;
}
...
...
@@ -4835,13 +4835,13 @@ static void tableQueryImpl(SQInfo *pQInfo) {
clearFirstNTimeWindow
(
pRuntimeEnv
,
pQInfo
->
groupIndex
);
if
(
pQuery
->
rec
.
rows
>
0
)
{
qTrace
(
"QInfo:%p %
d rows returned from group results, total:%d
"
,
pQInfo
,
pQuery
->
rec
.
rows
,
pQuery
->
rec
.
total
);
qTrace
(
"QInfo:%p %
"
PRId64
" rows returned from group results, total:%"
PRId64
"
"
,
pQInfo
,
pQuery
->
rec
.
rows
,
pQuery
->
rec
.
total
);
return
;
}
}
}
qTrace
(
"QInfo:%p query over, %
d
rows are returned"
,
pQInfo
,
pQuery
->
rec
.
total
);
qTrace
(
"QInfo:%p query over, %
"
PRId64
"
rows are returned"
,
pQInfo
,
pQuery
->
rec
.
total
);
return
;
}
...
...
@@ -4897,7 +4897,7 @@ static void stableQueryImpl(SQInfo *pQInfo) {
pQInfo
->
runtimeEnv
.
summary
.
elapsedTime
+=
(
taosGetTimestampUs
()
-
st
);
if
(
pQuery
->
rec
.
rows
==
0
)
{
qTrace
(
"QInfo:%p over, %d tables queried, %
d
rows are returned"
,
pQInfo
,
pQInfo
->
groupInfo
.
numOfTables
,
pQuery
->
rec
.
total
);
qTrace
(
"QInfo:%p over, %d tables queried, %
"
PRId64
"
rows are returned"
,
pQInfo
,
pQInfo
->
groupInfo
.
numOfTables
,
pQuery
->
rec
.
total
);
}
}
...
...
@@ -6009,7 +6009,7 @@ int32_t qRetrieveQueryResultInfo(qinfo_t qinfo) {
}
sem_wait
(
&
pQInfo
->
dataReady
);
qTrace
(
"QInfo:%p retrieve result info, rowsize:%d, rows:%
d
, code:%d"
,
pQInfo
,
pQuery
->
rowSize
,
pQuery
->
rec
.
rows
,
qTrace
(
"QInfo:%p retrieve result info, rowsize:%d, rows:%
"
PRId64
"
, code:%d"
,
pQInfo
,
pQuery
->
rowSize
,
pQuery
->
rec
.
rows
,
pQInfo
->
code
);
return
pQInfo
->
code
;
...
...
src/query/src/qast.c
浏览文件 @
53885b7d
...
...
@@ -577,8 +577,7 @@ static void tQueryIndexColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, SArr
assert
(
0
);
}
}
else
{
int32_t
optr
=
cond
.
end
->
optr
;
int32_t
optr
=
cond
.
end
?
cond
.
end
->
optr
:
TSDB_RELATION_INVALID
;
if
(
optr
==
TSDB_RELATION_LESS
||
optr
==
TSDB_RELATION_LESS_EQUAL
)
{
bool
comp
=
true
;
int32_t
ret
=
0
;
...
...
src/query/src/qpercentile.c
浏览文件 @
53885b7d
...
...
@@ -283,7 +283,7 @@ tMemBucket *tMemBucketCreate(int32_t totalSlots, int32_t nBufferSize, int16_t nE
break
;
};
default:
{
uError
(
"MemBucket:%p,not support data type %d,failed"
,
*
pBucket
,
pBucket
->
dataType
);
uError
(
"MemBucket:%p,not support data type %d,failed"
,
pBucket
,
pBucket
->
dataType
);
tfree
(
pBucket
);
return
NULL
;
}
...
...
src/query/src/qtokenizer.c
浏览文件 @
53885b7d
...
...
@@ -655,4 +655,4 @@ SSQLToken tStrGetToken(char* str, int32_t* i, bool isPrevOptr, uint32_t numOfIgn
return
t0
;
}
bool
isKeyWord
(
const
char
*
z
,
int32_t
len
)
{
return
(
tSQLKeywordCode
((
char
*
)
z
,
len
)
!=
TK_ID
);
}
\ No newline at end of file
bool
isKeyWord
(
const
char
*
z
,
int32_t
len
)
{
return
(
tSQLKeywordCode
((
char
*
)
z
,
len
)
!=
TK_ID
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录