Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
0e1a91d1
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看板
提交
0e1a91d1
编写于
7月 13, 2023
作者:
Y
yihaoDeng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix compile error
上级
f3f38938
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
10 deletion
+8
-10
source/libs/stream/src/streamBackendRocksdb.c
source/libs/stream/src/streamBackendRocksdb.c
+5
-5
source/libs/stream/src/tstreamFileState.c
source/libs/stream/src/tstreamFileState.c
+3
-5
未找到文件。
source/libs/stream/src/streamBackendRocksdb.c
浏览文件 @
0e1a91d1
...
@@ -1490,6 +1490,7 @@ int32_t streamStateGetKVByCur_rocksdb(SStreamStateCur* pCur, SWinKey* pKey, cons
...
@@ -1490,6 +1490,7 @@ int32_t streamStateGetKVByCur_rocksdb(SStreamStateCur* pCur, SWinKey* pKey, cons
if
(
pKtmp
->
opNum
!=
pCur
->
number
)
{
if
(
pKtmp
->
opNum
!=
pCur
->
number
)
{
return
-
1
;
return
-
1
;
}
}
size_t
vlen
=
0
;
size_t
vlen
=
0
;
if
(
pVal
!=
NULL
)
*
pVal
=
(
char
*
)
rocksdb_iter_value
(
pCur
->
iter
,
&
vlen
);
if
(
pVal
!=
NULL
)
*
pVal
=
(
char
*
)
rocksdb_iter_value
(
pCur
->
iter
,
&
vlen
);
if
(
pVLen
!=
NULL
)
*
pVLen
=
vlen
;
if
(
pVLen
!=
NULL
)
*
pVLen
=
vlen
;
...
@@ -1555,19 +1556,18 @@ SStreamStateCur* streamStateSeekToLast_rocksdb(SStreamState* pState, const SWinK
...
@@ -1555,19 +1556,18 @@ SStreamStateCur* streamStateSeekToLast_rocksdb(SStreamState* pState, const SWinK
const
SStateKey
maxStateKey
=
{.
key
=
{.
groupId
=
UINT64_MAX
,
.
ts
=
INT64_MAX
},
.
opNum
=
INT64_MAX
};
const
SStateKey
maxStateKey
=
{.
key
=
{.
groupId
=
UINT64_MAX
,
.
ts
=
INT64_MAX
},
.
opNum
=
INT64_MAX
};
STREAM_STATE_PUT_ROCKSDB
(
pState
,
"state"
,
&
maxStateKey
,
""
,
0
);
STREAM_STATE_PUT_ROCKSDB
(
pState
,
"state"
,
&
maxStateKey
,
""
,
0
);
char
buf
[
128
]
=
{
0
};
char
buf
[
128
]
=
{
0
};
int32_t
klen
=
stateKeyEncode
((
void
*
)
&
maxStateKey
,
buf
);
int32_t
klen
=
stateKeyEncode
((
void
*
)
&
maxStateKey
,
buf
);
SStreamStateCur
*
pCur
=
taosMemoryCalloc
(
1
,
sizeof
(
SStreamStateCur
));
SStreamStateCur
*
pCur
=
taosMemoryCalloc
(
1
,
sizeof
(
SStreamStateCur
));
if
(
pCur
==
NULL
)
return
NULL
;
if
(
pCur
==
NULL
)
return
NULL
;
SBackendCfWrapper
*
wrapper
=
pState
->
pTdbState
->
pBackendCfWrapper
;
pCur
->
db
=
((
SBackendCfWrapper
*
)
pState
->
pTdbState
->
pBackendCfWrapper
)
->
rocksdb
;
pCur
->
db
=
wrapper
->
rocksdb
;
pCur
->
iter
=
streamStateIterCreate
(
pState
,
"state"
,
(
rocksdb_snapshot_t
**
)
&
pCur
->
snapshot
,
pCur
->
iter
=
streamStateIterCreate
(
pState
,
"state"
,
(
rocksdb_snapshot_t
**
)
&
pCur
->
snapshot
,
(
rocksdb_readoptions_t
**
)
&
pCur
->
readOpt
);
(
rocksdb_readoptions_t
**
)
&
pCur
->
readOpt
);
pCur
->
number
=
pState
->
number
;
pCur
->
number
=
pState
->
number
;
rocksdb_iter_seek
(
pCur
->
iter
,
buf
,
(
size_t
)
klen
);
rocksdb_iter_seek
(
pCur
->
iter
,
buf
,
(
size_t
)
klen
);
rocksdb_iter_prev
(
pCur
->
iter
);
rocksdb_iter_prev
(
pCur
->
iter
);
while
(
rocksdb_iter_valid
(
pCur
->
iter
)
&&
iterValueIsStale
(
pCur
->
iter
))
{
while
(
rocksdb_iter_valid
(
pCur
->
iter
)
&&
iterValueIsStale
(
pCur
->
iter
))
{
rocksdb_iter_prev
(
pCur
->
iter
);
rocksdb_iter_prev
(
pCur
->
iter
);
...
...
source/libs/stream/src/tstreamFileState.c
浏览文件 @
0e1a91d1
...
@@ -386,7 +386,7 @@ int32_t flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot,
...
@@ -386,7 +386,7 @@ int32_t flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot,
0
,
buf
);
0
,
buf
);
// todo handle failure
// todo handle failure
memset
(
buf
,
0
,
len
);
memset
(
buf
,
0
,
len
);
// qDebug("===stream===put %" PRId64 " to disc, res %d", sKey.key.ts, code);
// qDebug("===stream===put %" PRId64 " to disc, res %d", sKey.key.ts, code);
}
}
taosMemoryFree
(
buf
);
taosMemoryFree
(
buf
);
...
@@ -397,8 +397,8 @@ int32_t flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot,
...
@@ -397,8 +397,8 @@ int32_t flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot,
streamStateClearBatch
(
batch
);
streamStateClearBatch
(
batch
);
int64_t
elapsed
=
taosGetTimestampMs
()
-
st
;
int64_t
elapsed
=
taosGetTimestampMs
()
-
st
;
qDebug
(
"%s flush to disk in batch model completed, rows:%d, batch size:%d, elapsed time:%"
PRId64
"ms"
,
pFileState
->
id
,
numOfElems
,
qDebug
(
"%s flush to disk in batch model completed, rows:%d, batch size:%d, elapsed time:%"
PRId64
"ms"
,
BATCH_LIMIT
,
elapsed
);
pFileState
->
id
,
numOfElems
,
BATCH_LIMIT
,
elapsed
);
if
(
flushState
)
{
if
(
flushState
)
{
const
char
*
taskKey
=
"streamFileState"
;
const
char
*
taskKey
=
"streamFileState"
;
...
@@ -488,8 +488,6 @@ int32_t recoverSnapshot(SStreamFileState* pFileState, int64_t ckId) {
...
@@ -488,8 +488,6 @@ int32_t recoverSnapshot(SStreamFileState* pFileState, int64_t ckId) {
:
pFileState
->
maxTs
-
pFileState
->
deleteMark
;
:
pFileState
->
maxTs
-
pFileState
->
deleteMark
;
deleteExpiredCheckPoint
(
pFileState
,
mark
);
deleteExpiredCheckPoint
(
pFileState
,
mark
);
}
}
void
*
pStVal
=
NULL
;
int32_t
len
=
0
;
SWinKey
key
=
{.
groupId
=
0
,
.
ts
=
0
};
SWinKey
key
=
{.
groupId
=
0
,
.
ts
=
0
};
SStreamStateCur
*
pCur
=
streamStateSeekToLast_rocksdb
(
pFileState
->
pFileStore
,
&
key
);
SStreamStateCur
*
pCur
=
streamStateSeekToLast_rocksdb
(
pFileState
->
pFileStore
,
&
key
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录