Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
865a13c1
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
865a13c1
编写于
4月 06, 2022
作者:
wmmhello
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix error in sort logic
上级
78acaed8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
5 deletion
+9
-5
source/common/src/tdatablock.c
source/common/src/tdatablock.c
+1
-1
source/libs/executor/src/tsort.c
source/libs/executor/src/tsort.c
+3
-3
source/libs/executor/test/sortTests.cpp
source/libs/executor/test/sortTests.cpp
+5
-1
未找到文件。
source/common/src/tdatablock.c
浏览文件 @
865a13c1
...
@@ -411,7 +411,7 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
...
@@ -411,7 +411,7 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd
if
(
size
>
pageSize
)
{
if
(
size
>
pageSize
)
{
*
stopIndex
=
j
-
1
;
*
stopIndex
=
j
-
1
;
ASSERT
(
*
stopIndex
>
startIndex
);
ASSERT
(
*
stopIndex
>
=
startIndex
);
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
...
...
source/libs/executor/src/tsort.c
浏览文件 @
865a13c1
...
@@ -132,9 +132,9 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
...
@@ -132,9 +132,9 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
taosMemoryFreeClear
(
pSortHandle
->
idStr
);
taosMemoryFreeClear
(
pSortHandle
->
idStr
);
blockDataDestroy
(
pSortHandle
->
pDataBlock
);
blockDataDestroy
(
pSortHandle
->
pDataBlock
);
for
(
size_t
i
=
0
;
i
<
taosArrayGetSize
(
pSortHandle
->
pOrderedSource
);
i
++
){
for
(
size_t
i
=
0
;
i
<
taosArrayGetSize
(
pSortHandle
->
pOrderedSource
);
i
++
){
SExternalMemSource
*
pSource
=
taosArrayGet
(
pSortHandle
->
pOrderedSource
,
i
);
SExternalMemSource
*
*
pSource
=
taosArrayGet
(
pSortHandle
->
pOrderedSource
,
i
);
blockDataDestroy
(
pSource
->
src
.
pBlock
);
blockDataDestroy
(
(
*
pSource
)
->
src
.
pBlock
);
taosMemoryFreeClear
(
pSource
);
taosMemoryFreeClear
(
*
pSource
);
}
}
taosArrayDestroy
(
pSortHandle
->
pOrderedSource
);
taosArrayDestroy
(
pSortHandle
->
pOrderedSource
);
taosMemoryFreeClear
(
pSortHandle
);
taosMemoryFreeClear
(
pSortHandle
);
...
...
source/libs/executor/test/sortTests.cpp
浏览文件 @
865a13c1
...
@@ -91,7 +91,7 @@ SSDataBlock* getSingleColDummyBlock(void* param) {
...
@@ -91,7 +91,7 @@ SSDataBlock* getSingleColDummyBlock(void* param) {
char
strOri
[
128
]
=
{
0
};
char
strOri
[
128
]
=
{
0
};
taosRandStr
(
strOri
,
size
);
taosRandStr
(
strOri
,
size
);
int32_t
len
=
0
;
int32_t
len
=
0
;
bool
ret
=
taosMbsToUcs4
(
strOri
,
size
,
(
TdUcs4
*
)
varDataVal
(
str
),
128
,
&
len
);
bool
ret
=
taosMbsToUcs4
(
strOri
,
size
,
(
TdUcs4
*
)
varDataVal
(
str
),
size
*
TSDB_NCHAR_SIZE
,
&
len
);
if
(
!
ret
){
if
(
!
ret
){
printf
(
"error
\n
"
);
printf
(
"error
\n
"
);
return
NULL
;
return
NULL
;
...
@@ -321,6 +321,10 @@ TEST(testCase, external_mem_sort_Test) {
...
@@ -321,6 +321,10 @@ TEST(testCase, external_mem_sort_Test) {
char
buf
[
128
]
=
{
0
};
char
buf
[
128
]
=
{
0
};
memcpy
(
buf
,
varDataVal
(
v
),
varDataLen
(
v
));
memcpy
(
buf
,
varDataVal
(
v
),
varDataLen
(
v
));
printf
(
"%d: %s
\n
"
,
row
++
,
buf
);
printf
(
"%d: %s
\n
"
,
row
++
,
buf
);
}
else
if
(
pInfo
[
i
].
type
==
TSDB_DATA_TYPE_DOUBLE
)
{
printf
(
"double: %lf
\n
"
,
*
(
double
*
)
v
);
}
else
if
(
pInfo
[
i
].
type
==
TSDB_DATA_TYPE_FLOAT
)
{
printf
(
"float: %f
\n
"
,
*
(
float
*
)
v
);
}
else
{
}
else
{
int64_t
result
=
0
;
int64_t
result
=
0
;
if
(
!
bigendian
()){
if
(
!
bigendian
()){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录