Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
41a60b50
I
Iotdb
项目概览
apache
/
Iotdb
11 个月 前同步成功
通知
25
Star
3344
Fork
916
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iotdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
41a60b50
编写于
8月 16, 2022
作者:
H
Haonan
提交者:
GitHub
8月 16, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[IOTDB-4047] Fix query NPE after change device alignment (#7009)
上级
ea4bbfe7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
67 addition
and
0 deletion
+67
-0
integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBDeleteTimeseriesIT.java
...iotdb/db/integration/aligned/IoTDBDeleteTimeseriesIT.java
+64
-0
server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
...org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+3
-0
未找到文件。
integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBDeleteTimeseriesIT.java
浏览文件 @
41a60b50
...
...
@@ -169,6 +169,70 @@ public class IoTDBDeleteTimeseriesIT {
}
}
@Test
public
void
deleteTimeseriesAndChangeDeviceAlignmentTest
()
throws
Exception
{
String
[]
retArray
=
new
String
[]
{
"1,1.0,2.0,"
};
int
cnt
=
0
;
try
(
Connection
connection
=
DriverManager
.
getConnection
(
"jdbc:iotdb://127.0.0.1:6667/"
,
"root"
,
"root"
);
Statement
statement
=
connection
.
createStatement
())
{
statement
.
execute
(
"INSERT INTO root.sg3.d1(timestamp,s1,s2) ALIGNED VALUES(1,1,2)"
);
statement
.
execute
(
"SHOW DEVICES"
);
try
(
ResultSet
resultSet
=
statement
.
getResultSet
())
{
while
(
resultSet
.
next
())
{
Assert
.
assertEquals
(
"true"
,
resultSet
.
getString
(
"isAligned"
));
}
}
cnt
=
0
;
statement
.
execute
(
"DELETE timeseries root.sg3.d1.s1"
);
statement
.
execute
(
"DELETE timeseries root.sg3.d1.s2"
);
statement
.
execute
(
"INSERT INTO root.sg3.d1(timestamp,s1,s2) VALUES(1,1,2)"
);
statement
.
execute
(
"SHOW DEVICES"
);
try
(
ResultSet
resultSet
=
statement
.
getResultSet
())
{
while
(
resultSet
.
next
())
{
Assert
.
assertEquals
(
"false"
,
resultSet
.
getString
(
"isAligned"
));
}
}
boolean
hasResult
=
statement
.
execute
(
"SELECT * FROM root.sg3.d1"
);
Assert
.
assertTrue
(
hasResult
);
try
(
ResultSet
resultSet
=
statement
.
getResultSet
())
{
ResultSetMetaData
resultSetMetaData
=
resultSet
.
getMetaData
();
while
(
resultSet
.
next
())
{
StringBuilder
builder
=
new
StringBuilder
();
for
(
int
i
=
1
;
i
<=
resultSetMetaData
.
getColumnCount
();
i
++)
{
builder
.
append
(
resultSet
.
getString
(
i
)).
append
(
","
);
}
Assert
.
assertEquals
(
retArray
[
cnt
],
builder
.
toString
());
cnt
++;
}
}
cnt
=
0
;
statement
.
execute
(
"DELETE timeseries root.sg3.d1.s1"
);
statement
.
execute
(
"DELETE timeseries root.sg3.d1.s2"
);
statement
.
execute
(
"INSERT INTO root.sg3.d1(timestamp,s1,s2) ALIGNED VALUES(1,1,2)"
);
statement
.
execute
(
"SHOW DEVICES"
);
try
(
ResultSet
resultSet
=
statement
.
getResultSet
())
{
while
(
resultSet
.
next
())
{
Assert
.
assertEquals
(
"true"
,
resultSet
.
getString
(
"isAligned"
));
}
}
hasResult
=
statement
.
execute
(
"SELECT * FROM root.sg3.d1"
);
Assert
.
assertTrue
(
hasResult
);
try
(
ResultSet
resultSet
=
statement
.
getResultSet
())
{
ResultSetMetaData
resultSetMetaData
=
resultSet
.
getMetaData
();
while
(
resultSet
.
next
())
{
StringBuilder
builder
=
new
StringBuilder
();
for
(
int
i
=
1
;
i
<=
resultSetMetaData
.
getColumnCount
();
i
++)
{
builder
.
append
(
resultSet
.
getString
(
i
)).
append
(
","
);
}
Assert
.
assertEquals
(
retArray
[
cnt
],
builder
.
toString
());
cnt
++;
}
}
}
}
@Test
public
void
deleteTimeSeriesMultiIntervalTest
()
{
String
[]
retArray1
=
new
String
[]
{
"0,0"
};
...
...
server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
浏览文件 @
41a60b50
...
...
@@ -642,6 +642,9 @@ public abstract class AbstractMemTable implements IMemTable {
return
;
}
totalPointsNum
-=
memChunkGroup
.
delete
(
originalPath
,
devicePath
,
startTimestamp
,
endTimestamp
);
if
(
memChunkGroup
.
getMemChunkMap
().
isEmpty
())
{
memTableMap
.
remove
(
getDeviceID
(
devicePath
));
}
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录