Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
f523a96c
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,发现更多精彩内容 >>
提交
f523a96c
编写于
2月 10, 2023
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix compact problem
上级
ea5d925c
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
10 addition
and
88 deletion
+10
-88
include/libs/cache/cache.h
include/libs/cache/cache.h
+0
-27
source/dnode/vnode/src/tsdb/tsdbCompact.c
source/dnode/vnode/src/tsdb/tsdbCompact.c
+1
-1
source/dnode/vnode/src/tsdb/tsdbUtil.c
source/dnode/vnode/src/tsdb/tsdbUtil.c
+9
-11
source/libs/CMakeLists.txt
source/libs/CMakeLists.txt
+0
-1
source/libs/cache/CMakeLists.txt
source/libs/cache/CMakeLists.txt
+0
-7
source/libs/cache/inc/cacheDef.h
source/libs/cache/inc/cacheDef.h
+0
-27
source/libs/cache/src/cache.c
source/libs/cache/src/cache.c
+0
-14
source/libs/cache/test/cacheTests.cpp
source/libs/cache/test/cacheTests.cpp
+0
-0
未找到文件。
include/libs/cache/cache.h
已删除
100644 → 0
浏览文件 @
ea5d925c
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _TD_CACHE_H_
#define _TD_CACHE_H_
#ifdef __cplusplus
extern
"C"
{
#endif
#ifdef __cplusplus
}
#endif
#endif
/*_TD_CACHE_H_*/
\ No newline at end of file
source/dnode/vnode/src/tsdb/tsdbCompact.c
浏览文件 @
f523a96c
...
...
@@ -314,7 +314,7 @@ static bool tsdbCompactTableIsDropped(STsdbCompactor *pCompactor) {
SMetaInfo
info
;
if
(
pCompactor
->
pIter
->
rowInfo
.
uid
==
pCompactor
->
tbid
.
uid
)
return
false
;
if
(
metaGetInfo
(
pCompactor
->
pTsdb
->
pVnode
->
pMeta
,
pCompactor
->
tbid
.
uid
,
&
info
,
NULL
))
{
if
(
metaGetInfo
(
pCompactor
->
pTsdb
->
pVnode
->
pMeta
,
pCompactor
->
pIter
->
rowInfo
.
uid
,
&
info
,
NULL
))
{
return
true
;
}
return
false
;
...
...
source/dnode/vnode/src/tsdb/tsdbUtil.c
浏览文件 @
f523a96c
...
...
@@ -1057,14 +1057,13 @@ _exit:
return
code
;
}
int32_t
tsdbBuildDeleteSkylineImpl
(
SArray
*
aSkyline
,
int32_t
sidx
,
int32_t
eidx
,
SArray
*
pSkyline
)
{
int32_t
code
=
0
;
SDelData
*
pDelData
;
int32_t
midx
;
taosArrayClear
(
pSkyline
);
if
(
sidx
==
eidx
)
{
if
(
sidx
==
eidx
)
{
TSDBKEY
*
pItem1
=
taosArrayGet
(
aSkyline
,
sidx
*
2
);
TSDBKEY
*
pItem2
=
taosArrayGet
(
aSkyline
,
sidx
*
2
+
1
);
taosArrayPush
(
pSkyline
,
&
pItem1
);
...
...
@@ -1097,14 +1096,13 @@ int32_t tsdbBuildDeleteSkylineImpl(SArray *aSkyline, int32_t sidx, int32_t eidx,
return
code
;
}
int32_t
tsdbBuildDeleteSkyline
(
SArray
*
aDelData
,
int32_t
sidx
,
int32_t
eidx
,
SArray
*
aSkyline
)
{
SDelData
*
pDelData
;
int32_t
code
=
0
;
int32_t
dataNum
=
eidx
-
sidx
+
1
;
SArray
*
aTmpSkyline
=
taosArrayInit
(
dataNum
*
2
,
sizeof
(
TSDBKEY
));
SArray
*
pSkyline
=
taosArrayInit
(
dataNum
*
2
,
POINTER_BYTES
);
int32_t
code
=
0
;
int32_t
dataNum
=
eidx
-
sidx
+
1
;
SArray
*
aTmpSkyline
=
taosArrayInit
(
dataNum
*
2
,
sizeof
(
TSDBKEY
));
SArray
*
pSkyline
=
taosArrayInit
(
dataNum
*
2
,
POINTER_BYTES
);
for
(
int32_t
i
=
sidx
;
i
<=
eidx
;
++
i
)
{
pDelData
=
(
SDelData
*
)
taosArrayGet
(
aDelData
,
i
);
taosArrayPush
(
aTmpSkyline
,
&
(
TSDBKEY
){.
ts
=
pDelData
->
sKey
,
.
version
=
pDelData
->
version
});
...
...
@@ -1116,8 +1114,8 @@ int32_t tsdbBuildDeleteSkyline(SArray *aDelData, int32_t sidx, int32_t eidx, SAr
int32_t
skylineNum
=
taosArrayGetSize
(
pSkyline
);
for
(
int32_t
i
=
0
;
i
<
skylineNum
;
++
i
)
{
TSDBKEY
*
p
=
taosArrayGetP
(
pSkyline
,
i
);
taosArrayPush
(
aSkyline
,
p
);
TSDBKEY
*
p
=
taosArrayGetP
(
pSkyline
,
i
);
taosArrayPush
(
aSkyline
,
p
);
}
_clear:
...
...
@@ -1394,7 +1392,7 @@ int32_t tBlockDataTryUpsertRow(SBlockData *pBlockData, TSDBROW *pRow, int64_t ui
}
int32_t
tBlockDataUpsertRow
(
SBlockData
*
pBlockData
,
TSDBROW
*
pRow
,
STSchema
*
pTSchema
,
int64_t
uid
)
{
if
(
pBlockData
->
aTSKEY
[
pBlockData
->
nRow
-
1
]
==
TSDBROW_TS
(
pRow
))
{
if
(
pBlockData
->
nRow
>
0
&&
pBlockData
->
aTSKEY
[
pBlockData
->
nRow
-
1
]
==
TSDBROW_TS
(
pRow
))
{
return
tBlockDataUpdateRow
(
pBlockData
,
pRow
,
pTSchema
);
}
else
{
return
tBlockDataAppendRow
(
pBlockData
,
pRow
,
pTSchema
,
uid
);
...
...
source/libs/CMakeLists.txt
浏览文件 @
f523a96c
add_subdirectory
(
tdb
)
add_subdirectory
(
cache
)
add_subdirectory
(
transport
)
add_subdirectory
(
wal
)
add_subdirectory
(
monitor
)
...
...
source/libs/cache/CMakeLists.txt
已删除
100644 → 0
浏览文件 @
ea5d925c
aux_source_directory
(
src CACHE_SRC
)
add_library
(
cache STATIC
${
CACHE_SRC
}
)
target_include_directories
(
cache
PUBLIC
"
${
TD_SOURCE_DIR
}
/include/libs/cache"
PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc"
)
\ No newline at end of file
source/libs/cache/inc/cacheDef.h
已删除
100644 → 0
浏览文件 @
ea5d925c
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _TD_CACHE_DEF_H_
#define _TD_CACHE_DEF_H_
#ifdef __cplusplus
extern
"C"
{
#endif
#ifdef __cplusplus
}
#endif
#endif
/*_TD_CACHE_DEF_H_*/
\ No newline at end of file
source/libs/cache/src/cache.c
已删除
100644 → 0
浏览文件 @
ea5d925c
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
\ No newline at end of file
source/libs/cache/test/cacheTests.cpp
已删除
100644 → 0
浏览文件 @
ea5d925c
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录