Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
abc8c0fd
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
abc8c0fd
编写于
1月 16, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: do some internal refactor.
上级
138d1d26
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
20 addition
and
35 deletion
+20
-35
source/libs/executor/src/tsimplehash.c
source/libs/executor/src/tsimplehash.c
+20
-35
未找到文件。
source/libs/executor/src/tsimplehash.c
浏览文件 @
abc8c0fd
...
@@ -88,22 +88,22 @@ int32_t tSimpleHashGetSize(const SSHashObj *pHashObj) {
...
@@ -88,22 +88,22 @@ int32_t tSimpleHashGetSize(const SSHashObj *pHashObj) {
if
(
!
pHashObj
)
{
if
(
!
pHashObj
)
{
return
0
;
return
0
;
}
}
return
(
int32_t
)
atomic_load_64
((
int64_t
*
)
&
pHashObj
->
size
)
;
return
(
int32_t
)
pHashObj
->
size
;
}
}
static
void
*
doInternalAlloc
(
SSHashObj
*
pHashObj
,
int32_t
size
)
{
static
void
*
doInternalAlloc
(
SSHashObj
*
pHashObj
,
int32_t
size
)
{
void
**
p
=
taosArrayGetLast
(
pHashObj
->
pHashNodeBuf
);
void
**
p
=
taosArrayGetLast
(
pHashObj
->
pHashNodeBuf
);
if
(
p
==
NULL
||
(
pHashObj
->
offset
+
size
)
>
DEFAULT_BUF_PAGE_SIZE
)
{
if
(
p
==
NULL
||
(
pHashObj
->
offset
+
size
)
>
DEFAULT_BUF_PAGE_SIZE
)
{
// let's allocate one new page
// let's allocate one new page
if
(
size
>
DEFAULT_BUF_PAGE_SIZE
)
{
int32_t
allocSize
=
TMAX
(
size
,
DEFAULT_BUF_PAGE_SIZE
);
// TODO
void
*
pNewPage
=
taosMemoryMalloc
(
allocSize
);
}
void
*
pNewPage
=
taosMemoryMalloc
(
DEFAULT_BUF_PAGE_SIZE
);
if
(
pNewPage
==
NULL
)
{
if
(
pNewPage
==
NULL
)
{
return
NULL
;
return
NULL
;
}
}
// if the allocate the buffer page is greater than the DFFAULT_BUF_PAGE_SIZE,
// pHashObj->offset will always be greater than DEFAULT_BUF_PAGE_SIZE, which means that
// current buffer page is full. And a new buffer page needs to be allocated.
pHashObj
->
offset
=
size
;
pHashObj
->
offset
=
size
;
taosArrayPush
(
pHashObj
->
pHashNodeBuf
,
&
pNewPage
);
taosArrayPush
(
pHashObj
->
pHashNodeBuf
,
&
pNewPage
);
return
pNewPage
;
return
pNewPage
;
...
@@ -144,7 +144,7 @@ static void tSimpleHashTableResize(SSHashObj *pHashObj) {
...
@@ -144,7 +144,7 @@ static void tSimpleHashTableResize(SSHashObj *pHashObj) {
return
;
return
;
}
}
int64_t
st
=
taosGetTimestampUs
();
//
int64_t st = taosGetTimestampUs();
void
*
pNewEntryList
=
taosMemoryRealloc
(
pHashObj
->
hashList
,
POINTER_BYTES
*
newCapacity
);
void
*
pNewEntryList
=
taosMemoryRealloc
(
pHashObj
->
hashList
,
POINTER_BYTES
*
newCapacity
);
if
(
!
pNewEntryList
)
{
if
(
!
pNewEntryList
)
{
uWarn
(
"hash resize failed due to out of memory, capacity remain:%zu"
,
pHashObj
->
capacity
);
uWarn
(
"hash resize failed due to out of memory, capacity remain:%zu"
,
pHashObj
->
capacity
);
...
@@ -189,8 +189,7 @@ static void tSimpleHashTableResize(SSHashObj *pHashObj) {
...
@@ -189,8 +189,7 @@ static void tSimpleHashTableResize(SSHashObj *pHashObj) {
}
}
}
}
int64_t
et
=
taosGetTimestampUs
();
// int64_t et = taosGetTimestampUs();
// uDebug("hash table resize completed, new capacity:%d, load factor:%f, elapsed time:%fms",
// uDebug("hash table resize completed, new capacity:%d, load factor:%f, elapsed time:%fms",
// (int32_t)pHashObj->capacity,
// (int32_t)pHashObj->capacity,
// ((double)pHashObj->size) / pHashObj->capacity, (et - st) / 1000.0);
// ((double)pHashObj->size) / pHashObj->capacity, (et - st) / 1000.0);
...
@@ -218,7 +217,7 @@ int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, size_t keyLen, cons
...
@@ -218,7 +217,7 @@ int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, size_t keyLen, cons
}
}
pHashObj
->
hashList
[
slot
]
=
pNewNode
;
pHashObj
->
hashList
[
slot
]
=
pNewNode
;
atomic_add_fetch_64
(
&
pHashObj
->
size
,
1
)
;
pHashObj
->
size
+=
1
;
return
0
;
return
0
;
}
}
...
@@ -236,7 +235,7 @@ int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, size_t keyLen, cons
...
@@ -236,7 +235,7 @@ int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, size_t keyLen, cons
}
}
pNewNode
->
next
=
pHashObj
->
hashList
[
slot
];
pNewNode
->
next
=
pHashObj
->
hashList
[
slot
];
pHashObj
->
hashList
[
slot
]
=
pNewNode
;
pHashObj
->
hashList
[
slot
]
=
pNewNode
;
atomic_add_fetch_64
(
&
pHashObj
->
size
,
1
)
;
pHashObj
->
size
+=
1
;
}
else
if
(
data
)
{
// update data
}
else
if
(
data
)
{
// update data
memcpy
(
GET_SHASH_NODE_DATA
(
pNode
),
data
,
dataLen
);
memcpy
(
GET_SHASH_NODE_DATA
(
pNode
),
data
,
dataLen
);
}
}
...
@@ -303,7 +302,7 @@ int32_t tSimpleHashRemove(SSHashObj *pHashObj, const void *key, size_t keyLen) {
...
@@ -303,7 +302,7 @@ int32_t tSimpleHashRemove(SSHashObj *pHashObj, const void *key, size_t keyLen) {
pPrev
->
next
=
pNode
->
next
;
pPrev
->
next
=
pNode
->
next
;
}
}
FREE_HASH_NODE
(
pNode
);
FREE_HASH_NODE
(
pNode
);
atomic_sub_fetch_64
(
&
pHashObj
->
size
,
1
)
;
pHashObj
->
size
-=
1
;
code
=
TSDB_CODE_SUCCESS
;
code
=
TSDB_CODE_SUCCESS
;
break
;
break
;
}
}
...
@@ -338,7 +337,7 @@ int32_t tSimpleHashIterateRemove(SSHashObj *pHashObj, const void *key, size_t ke
...
@@ -338,7 +337,7 @@ int32_t tSimpleHashIterateRemove(SSHashObj *pHashObj, const void *key, size_t ke
}
}
FREE_HASH_NODE
(
pNode
);
FREE_HASH_NODE
(
pNode
);
atomic_sub_fetch_64
(
&
pHashObj
->
size
,
1
)
;
pHashObj
->
size
-=
1
;
break
;
break
;
}
}
pPrev
=
pNode
;
pPrev
=
pNode
;
...
@@ -348,31 +347,19 @@ int32_t tSimpleHashIterateRemove(SSHashObj *pHashObj, const void *key, size_t ke
...
@@ -348,31 +347,19 @@ int32_t tSimpleHashIterateRemove(SSHashObj *pHashObj, const void *key, size_t ke
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
static
void
destroyItems
(
void
*
pItem
)
{
taosMemoryFree
(
*
(
void
**
)
pItem
);
}
void
tSimpleHashClear
(
SSHashObj
*
pHashObj
)
{
void
tSimpleHashClear
(
SSHashObj
*
pHashObj
)
{
if
(
!
pHashObj
||
taosHashTableEmpty
(
pHashObj
))
{
if
(
!
pHashObj
||
taosHashTableEmpty
(
pHashObj
))
{
return
;
return
;
}
}
// TODO recycle the allocated buffer.
memset
(
pHashObj
->
hashList
,
0
,
pHashObj
->
capacity
*
sizeof
(
void
*
));
SHNode
*
pNode
=
NULL
,
*
pNext
=
NULL
;
taosArrayClearEx
(
pHashObj
->
pHashNodeBuf
,
destroyItems
);
for
(
int32_t
i
=
0
;
i
<
pHashObj
->
capacity
;
++
i
)
{
pHashObj
->
offset
=
0
;
pNode
=
pHashObj
->
hashList
[
i
];
pHashObj
->
size
=
0
;
if
(
!
pNode
)
{
continue
;
}
while
(
pNode
)
{
pNext
=
pNode
->
next
;
// FREE_HASH_NODE(pNode);
pNode
=
pNext
;
}
pHashObj
->
hashList
[
i
]
=
NULL
;
}
atomic_store_64
(
&
pHashObj
->
size
,
0
);
}
static
void
destroyItems
(
void
*
pItem
)
{
taosMemoryFree
(
*
(
void
**
)
pItem
);
}
}
void
tSimpleHashCleanup
(
SSHashObj
*
pHashObj
)
{
void
tSimpleHashCleanup
(
SSHashObj
*
pHashObj
)
{
...
@@ -382,8 +369,6 @@ void tSimpleHashCleanup(SSHashObj *pHashObj) {
...
@@ -382,8 +369,6 @@ void tSimpleHashCleanup(SSHashObj *pHashObj) {
tSimpleHashClear
(
pHashObj
);
tSimpleHashClear
(
pHashObj
);
taosMemoryFreeClear
(
pHashObj
->
hashList
);
taosMemoryFreeClear
(
pHashObj
->
hashList
);
taosArrayDestroyEx
(
pHashObj
->
pHashNodeBuf
,
destroyItems
);
taosMemoryFree
(
pHashObj
);
taosMemoryFree
(
pHashObj
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录