Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
9196e32a
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1181
Star
22014
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9196e32a
编写于
2月 25, 2021
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[td-3017] <fix>: fix bug in top/bottom query on unsigned data type.
上级
ba49778a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
44 addition
and
19 deletion
+44
-19
src/query/src/qAggMain.c
src/query/src/qAggMain.c
+44
-19
未找到文件。
src/query/src/qAggMain.c
浏览文件 @
9196e32a
...
...
@@ -2172,19 +2172,22 @@ static void do_top_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pData,
if
(
pInfo
->
num
<
maxLen
)
{
if
(
pInfo
->
num
==
0
||
((
type
>=
TSDB_DATA_TYPE_TINYINT
&&
type
<=
TSDB_DATA_TYPE_BIGINT
)
&&
val
.
i64
>=
pList
[
pInfo
->
num
-
1
]
->
v
.
i64
)
||
((
type
>=
TSDB_DATA_TYPE_FLOAT
&&
type
<=
TSDB_DATA_TYPE_DOUBLE
)
&&
val
.
dKey
>=
pList
[
pInfo
->
num
-
1
]
->
v
.
dKey
))
{
(
IS_SIGNED_NUMERIC_TYPE
(
type
)
&&
val
.
i64
>=
pList
[
pInfo
->
num
-
1
]
->
v
.
i64
)
||
(
IS_UNSIGNED_NUMERIC_TYPE
(
type
)
&&
val
.
u64
>=
pList
[
pInfo
->
num
-
1
]
->
v
.
u64
)
||
(
IS_FLOAT_TYPE
(
type
)
&&
val
.
dKey
>=
pList
[
pInfo
->
num
-
1
]
->
v
.
dKey
))
{
valuePairAssign
(
pList
[
pInfo
->
num
],
type
,
(
const
char
*
)
&
val
.
i64
,
ts
,
pTags
,
pTagInfo
,
stage
);
}
else
{
int32_t
i
=
pInfo
->
num
-
1
;
if
(
type
>=
TSDB_DATA_TYPE_TINYINT
&&
type
<=
TSDB_DATA_TYPE_BIGINT
)
{
if
(
IS_SIGNED_NUMERIC_TYPE
(
type
))
{
while
(
i
>=
0
&&
pList
[
i
]
->
v
.
i64
>
val
.
i64
)
{
VALUEPAIRASSIGN
(
pList
[
i
+
1
],
pList
[
i
],
pTagInfo
->
tagsLen
);
i
-=
1
;
}
}
else
if
(
IS_UNSIGNED_NUMERIC_TYPE
(
type
))
{
while
(
i
>=
0
&&
pList
[
i
]
->
v
.
u64
>
val
.
u64
)
{
VALUEPAIRASSIGN
(
pList
[
i
+
1
],
pList
[
i
],
pTagInfo
->
tagsLen
);
i
-=
1
;
}
}
else
{
while
(
i
>=
0
&&
pList
[
i
]
->
v
.
dKey
>
val
.
dKey
)
{
VALUEPAIRASSIGN
(
pList
[
i
+
1
],
pList
[
i
],
pTagInfo
->
tagsLen
);
...
...
@@ -2198,23 +2201,29 @@ static void do_top_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pData,
pInfo
->
num
++
;
}
else
{
int32_t
i
=
0
;
if
(((
type
>=
TSDB_DATA_TYPE_TINYINT
&&
type
<=
TSDB_DATA_TYPE_BIGINT
)
&&
val
.
i64
>
pList
[
0
]
->
v
.
i64
)
||
((
type
>=
TSDB_DATA_TYPE_FLOAT
&&
type
<=
TSDB_DATA_TYPE_DOUBLE
)
&&
val
.
dKey
>
pList
[
0
]
->
v
.
dKey
))
{
if
((
IS_SIGNED_NUMERIC_TYPE
(
type
)
&&
val
.
i64
>
pList
[
0
]
->
v
.
i64
)
||
(
IS_UNSIGNED_NUMERIC_TYPE
(
type
)
&&
val
.
u64
>
pList
[
0
]
->
v
.
u64
)
||
(
IS_FLOAT_TYPE
(
type
)
&&
val
.
dKey
>
pList
[
0
]
->
v
.
dKey
))
{
// find the appropriate the slot position
if
(
type
>=
TSDB_DATA_TYPE_TINYINT
&&
type
<=
TSDB_DATA_TYPE_BIGINT
)
{
if
(
IS_SIGNED_NUMERIC_TYPE
(
type
)
)
{
while
(
i
+
1
<
maxLen
&&
pList
[
i
+
1
]
->
v
.
i64
<
val
.
i64
)
{
VALUEPAIRASSIGN
(
pList
[
i
],
pList
[
i
+
1
],
pTagInfo
->
tagsLen
);
i
+=
1
;
}
}
if
(
IS_UNSIGNED_NUMERIC_TYPE
(
type
))
{
while
(
i
+
1
<
maxLen
&&
pList
[
i
+
1
]
->
v
.
u64
<
val
.
u64
)
{
VALUEPAIRASSIGN
(
pList
[
i
],
pList
[
i
+
1
],
pTagInfo
->
tagsLen
);
i
+=
1
;
}
}
else
{
while
(
i
+
1
<
maxLen
&&
pList
[
i
+
1
]
->
v
.
dKey
<
val
.
dKey
)
{
VALUEPAIRASSIGN
(
pList
[
i
],
pList
[
i
+
1
],
pTagInfo
->
tagsLen
);
i
+=
1
;
}
}
valuePairAssign
(
pList
[
i
],
type
,
(
const
char
*
)
&
val
.
i64
,
ts
,
pTags
,
pTagInfo
,
stage
);
valuePairAssign
(
pList
[
i
],
type
,
(
const
char
*
)
&
val
.
i64
,
ts
,
pTags
,
pTagInfo
,
stage
);
}
}
}
...
...
@@ -2233,11 +2242,16 @@ static void do_bottom_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pDa
}
else
{
int32_t
i
=
pInfo
->
num
-
1
;
if
(
type
>=
TSDB_DATA_TYPE_TINYINT
&&
type
<=
TSDB_DATA_TYPE_BIGINT
)
{
if
(
IS_SIGNED_NUMERIC_TYPE
(
type
)
)
{
while
(
i
>=
0
&&
pList
[
i
]
->
v
.
i64
<
val
.
i64
)
{
VALUEPAIRASSIGN
(
pList
[
i
+
1
],
pList
[
i
],
pTagInfo
->
tagsLen
);
i
-=
1
;
}
}
else
if
(
IS_UNSIGNED_NUMERIC_TYPE
(
type
))
{
while
(
i
>=
0
&&
pList
[
i
]
->
v
.
u64
<
val
.
u64
)
{
VALUEPAIRASSIGN
(
pList
[
i
+
1
],
pList
[
i
],
pTagInfo
->
tagsLen
);
i
-=
1
;
}
}
else
{
while
(
i
>=
0
&&
pList
[
i
]
->
v
.
dKey
<
val
.
dKey
)
{
VALUEPAIRASSIGN
(
pList
[
i
+
1
],
pList
[
i
],
pTagInfo
->
tagsLen
);
...
...
@@ -2252,14 +2266,20 @@ static void do_bottom_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pDa
}
else
{
int32_t
i
=
0
;
if
(((
type
>=
TSDB_DATA_TYPE_TINYINT
&&
type
<=
TSDB_DATA_TYPE_BIGINT
)
&&
val
.
i64
<
pList
[
0
]
->
v
.
i64
)
||
((
type
>=
TSDB_DATA_TYPE_FLOAT
&&
type
<=
TSDB_DATA_TYPE_DOUBLE
)
&&
val
.
dKey
<
pList
[
0
]
->
v
.
dKey
))
{
if
((
IS_SIGNED_NUMERIC_TYPE
(
type
)
&&
val
.
i64
<
pList
[
0
]
->
v
.
i64
)
||
(
IS_UNSIGNED_NUMERIC_TYPE
(
type
)
&&
val
.
u64
<
pList
[
0
]
->
v
.
u64
)
||
(
IS_FLOAT_TYPE
(
type
)
&&
val
.
dKey
<
pList
[
0
]
->
v
.
dKey
))
{
// find the appropriate the slot position
if
(
type
>=
TSDB_DATA_TYPE_TINYINT
&&
type
<=
TSDB_DATA_TYPE_BIGINT
)
{
if
(
IS_SIGNED_NUMERIC_TYPE
(
type
)
)
{
while
(
i
+
1
<
maxLen
&&
pList
[
i
+
1
]
->
v
.
i64
>
val
.
i64
)
{
VALUEPAIRASSIGN
(
pList
[
i
],
pList
[
i
+
1
],
pTagInfo
->
tagsLen
);
i
+=
1
;
}
}
if
(
IS_UNSIGNED_NUMERIC_TYPE
(
type
))
{
while
(
i
+
1
<
maxLen
&&
pList
[
i
+
1
]
->
v
.
u64
>
val
.
u64
)
{
VALUEPAIRASSIGN
(
pList
[
i
],
pList
[
i
+
1
],
pTagInfo
->
tagsLen
);
i
+=
1
;
}
}
else
{
while
(
i
+
1
<
maxLen
&&
pList
[
i
+
1
]
->
v
.
dKey
>
val
.
dKey
)
{
VALUEPAIRASSIGN
(
pList
[
i
],
pList
[
i
+
1
],
pTagInfo
->
tagsLen
);
...
...
@@ -2289,19 +2309,24 @@ static int32_t resDataAscComparFn(const void *pLeft, const void *pRight) {
tValuePair
*
pLeftElem
=
*
(
tValuePair
**
)
pLeft
;
tValuePair
*
pRightElem
=
*
(
tValuePair
**
)
pRight
;
int32_t
type
=
pLeftElem
->
v
.
nType
;
if
(
type
==
TSDB_DATA_TYPE_FLOAT
||
type
==
TSDB_DATA_TYPE_DOUBLE
)
{
if
(
IS_FLOAT_TYPE
(
pLeftElem
->
v
.
nType
))
{
if
(
pLeftElem
->
v
.
dKey
==
pRightElem
->
v
.
dKey
)
{
return
0
;
}
else
{
return
pLeftElem
->
v
.
dKey
>
pRightElem
->
v
.
dKey
?
1
:
-
1
;
}
}
else
{
}
else
if
(
IS_SIGNED_NUMERIC_TYPE
(
pLeftElem
->
v
.
nType
))
{
if
(
pLeftElem
->
v
.
i64
==
pRightElem
->
v
.
i64
)
{
return
0
;
}
else
{
return
pLeftElem
->
v
.
i64
>
pRightElem
->
v
.
i64
?
1
:
-
1
;
}
}
else
{
if
(
pLeftElem
->
v
.
u64
==
pRightElem
->
v
.
u64
)
{
return
0
;
}
else
{
return
pLeftElem
->
v
.
u64
>
pRightElem
->
v
.
u64
?
1
:
-
1
;
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录