Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
645a2cce
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1181
Star
22014
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,发现更多精彩内容 >>
提交
645a2cce
编写于
8月 16, 2022
作者:
L
Liu Jicong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(stream): window delete
上级
2ced6c28
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
25 deletion
+23
-25
source/dnode/vnode/src/tq/tqSink.c
source/dnode/vnode/src/tq/tqSink.c
+5
-7
source/dnode/vnode/src/tsdb/tsdbMemTable.c
source/dnode/vnode/src/tsdb/tsdbMemTable.c
+3
-3
tests/script/jenkins/basic.txt
tests/script/jenkins/basic.txt
+2
-2
tests/script/tsim/stream/session0.sim
tests/script/tsim/stream/session0.sim
+13
-13
未找到文件。
source/dnode/vnode/src/tq/tqSink.c
浏览文件 @
645a2cce
...
...
@@ -17,7 +17,7 @@
#include "tmsg.h"
#include "tq.h"
int32_t
t
d
BuildDeleteReq
(
SVnode
*
pVnode
,
const
char
*
stbFullName
,
const
SSDataBlock
*
pDataBlock
,
int32_t
t
q
BuildDeleteReq
(
SVnode
*
pVnode
,
const
char
*
stbFullName
,
const
SSDataBlock
*
pDataBlock
,
SBatchDeleteReq
*
deleteReq
)
{
ASSERT
(
pDataBlock
->
info
.
type
==
STREAM_DELETE_RESULT
);
int32_t
totRow
=
pDataBlock
->
info
.
rows
;
...
...
@@ -68,9 +68,10 @@ SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchem
SSDataBlock
*
pDataBlock
=
taosArrayGet
(
pBlocks
,
i
);
if
(
pDataBlock
->
info
.
type
==
STREAM_DELETE_RESULT
)
{
int32_t
padding1
=
0
;
void
*
padding2
=
taosMemoryMalloc
(
1
)
;
void
*
padding2
=
NULL
;
taosArrayPush
(
schemaReqSz
,
&
padding1
);
taosArrayPush
(
schemaReqs
,
&
padding2
);
continue
;
}
STagVal
tagVal
=
{
...
...
@@ -138,8 +139,7 @@ SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchem
continue
;
}
int32_t
rows
=
pDataBlock
->
info
.
rows
;
// TODO min
int32_t
rowSize
=
pDataBlock
->
info
.
rowSize
;
/*int32_t rowSize = pDataBlock->info.rowSize;*/
int32_t
maxLen
=
TD_ROW_MAX_BYTES_FROM_SCHEMA
(
pTSchema
);
int32_t
schemaLen
=
0
;
...
...
@@ -150,7 +150,6 @@ SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchem
}
// assign data
// TODO
ret
=
rpcMallocCont
(
cap
);
ret
->
header
.
vgId
=
pVnode
->
config
.
vgId
;
ret
->
length
=
sizeof
(
SSubmitReq
);
...
...
@@ -161,13 +160,12 @@ SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchem
SSDataBlock
*
pDataBlock
=
taosArrayGet
(
pBlocks
,
i
);
if
(
pDataBlock
->
info
.
type
==
STREAM_DELETE_RESULT
)
{
pDeleteReq
->
suid
=
suid
;
t
d
BuildDeleteReq
(
pVnode
,
stbFullName
,
pDataBlock
,
pDeleteReq
);
t
q
BuildDeleteReq
(
pVnode
,
stbFullName
,
pDataBlock
,
pDeleteReq
);
continue
;
}
blkHead
->
numOfRows
=
htonl
(
pDataBlock
->
info
.
rows
);
blkHead
->
sversion
=
htonl
(
pTSchema
->
version
);
// TODO
blkHead
->
suid
=
htobe64
(
suid
);
// uid is assigned by vnode
blkHead
->
uid
=
0
;
...
...
source/dnode/vnode/src/tsdb/tsdbMemTable.c
浏览文件 @
645a2cce
...
...
@@ -196,9 +196,9 @@ int32_t tsdbDeleteTableData(STsdb *pTsdb, int64_t version, tb_uid_t suid, tb_uid
tsdbCacheDeleteLast
(
pTsdb
->
lruCache
,
pTbData
->
uid
,
eKey
);
}
tsdb
Error
(
"vgId:%d, delete data from table suid:%"
PRId64
" uid:%"
PRId64
" skey:%"
PRId64
" eKey:%"
PRId64
" since %s"
,
TD_VID
(
pTsdb
->
pVnode
),
suid
,
uid
,
sKey
,
eKey
,
tstrerror
(
code
));
tsdb
Info
(
"vgId:%d, delete data from table suid:%"
PRId64
" uid:%"
PRId64
" skey:%"
PRId64
" eKey:%"
PRId64
" since %s"
,
TD_VID
(
pTsdb
->
pVnode
),
suid
,
uid
,
sKey
,
eKey
,
tstrerror
(
code
));
return
code
;
_err:
...
...
tests/script/jenkins/basic.txt
浏览文件 @
645a2cce
...
...
@@ -237,8 +237,8 @@
./test.sh -f tsim/stream/distributeInterval0.sim
./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
./test.sh -f tsim/stream/distributeSession0.sim
#
./test.sh -f tsim/stream/session0.sim
#
./test.sh -f tsim/stream/session1.sim
./test.sh -f tsim/stream/session0.sim
./test.sh -f tsim/stream/session1.sim
./test.sh -f tsim/stream/state0.sim
./test.sh -f tsim/stream/triggerInterval0.sim
./test.sh -f tsim/stream/triggerSession0.sim
...
...
tests/script/tsim/stream/session0.sim
浏览文件 @
645a2cce
...
...
@@ -83,22 +83,22 @@ if $data11 != 3 then
goto loop0
endi
if $data12 !=
NULL
then
if $data12 !=
10
then
print ======data12=$data12
goto loop0
endi
if $data13 !=
NULL
then
if $data13 !=
10
then
print ======data13=$data13
goto loop0
endi
if $data14 !=
NULL
then
if $data14 !=
1.100000000
then
print ======data14=$data14
return -1
endi
if $data15 !=
NULL
then
if $data15 !=
0.000000000
then
print ======data15=$data15
return -1
endi
...
...
@@ -141,38 +141,38 @@ if $data01 != 7 then
goto loop1
endi
if $data02 !=
NULL
then
if $data02 !=
18
then
print =====data02=$data02
goto loop1
endi
if $data03 !=
NULL
then
if $data03 !=
4
then
print =====data03=$data03
goto loop1
endi
if $data04 !=
NULL
then
print ======$data04
if $data04 !=
1.000000000
then
print ======
data04=
$data04
return -1
endi
if $data05 !=
NULL
then
print ======$data05
if $data05 !=
1.154700538
then
print ======
data05=
$data05
return -1
endi
if $data06 != 4 then
print ======$data06
print ======
data06=
$data06
return -1
endi
if $data07 != 1.000000000 then
print ======$data07
print ======
data07=
$data07
return -1
endi
if $data08 != 13 then
print ======$data08
print ======
data08=
$data08
return -1
endi
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录