Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
619172ff
I
Iotdb
项目概览
apache
/
Iotdb
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
619172ff
编写于
7月 15, 2020
作者:
H
HTHou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix sonar
上级
4b023b75
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
14 deletion
+10
-14
server/src/main/java/org/apache/iotdb/db/engine/flush/VmMergeUtils.java
...n/java/org/apache/iotdb/db/engine/flush/VmMergeUtils.java
+1
-4
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
...e/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+2
-3
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
.../apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+5
-5
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
...g/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+2
-2
未找到文件。
server/src/main/java/org/apache/iotdb/db/engine/flush/VmMergeUtils.java
浏览文件 @
619172ff
...
...
@@ -136,10 +136,7 @@ public class VmMergeUtils {
for
(
RestorableTsFileIOWriter
vmWriter
:
vmWriters
)
{
TsFileSequenceReader
reader
=
buildReaderFromVmWriter
(
vmWriter
,
writer
,
tsFileSequenceReaderMap
,
storageGroup
);
if
(
reader
==
null
)
{
continue
;
}
if
(!
vmWriter
.
getMetadatasForQuery
().
containsKey
(
deviceId
))
{
if
(
reader
==
null
||
!
vmWriter
.
getMetadatasForQuery
().
containsKey
(
deviceId
))
{
continue
;
}
List
<
ChunkMetadata
>
chunkMetadataList
=
vmWriter
.
getMetadatasForQuery
()
...
...
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
浏览文件 @
619172ff
...
...
@@ -594,7 +594,7 @@ public class StorageGroupProcessor {
}
vmTsFileResourceMap
.
values
()
.
forEach
(
tsFileResources
->
tsFileResources
.
forEach
(
(
subVmTsFileResources
)
->
subVmTsFileResources
.
sort
(
this
::
compareVMFileName
)));
.
forEach
(
subVmTsFileResources
->
subVmTsFileResources
.
sort
(
this
::
compareVMFileName
)));
return
vmTsFileResourceMap
;
}
...
...
@@ -632,7 +632,7 @@ public class StorageGroupProcessor {
writer
=
pair
.
left
;
vmWriters
=
pair
.
right
;
vmWriters
.
forEach
(
(
subVmWriters
)
->
subVmWriters
.
forEach
(
RestorableTsFileIOWriter:
:
makeMetadataVisible
));
subVmWriters
->
subVmWriters
.
forEach
(
RestorableTsFileIOWriter:
:
makeMetadataVisible
));
}
catch
(
StorageGroupProcessorException
e
)
{
logger
.
warn
(
"Skip TsFile: {} because of error in recover: "
,
tsFileResource
.
getTsFilePath
(),
e
);
...
...
@@ -2244,7 +2244,6 @@ public class StorageGroupProcessor {
* @param filePartitionId the partition id of the new file
* @return load the file successfully
* @UsedBy sync module, load external tsfile module.
* @UsedBy sync module, load external tsfile module.
*/
private
boolean
loadTsFileByType
(
LoadTsFileType
type
,
File
syncedTsFile
,
TsFileResource
tsFileResource
,
long
filePartitionId
)
...
...
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
浏览文件 @
619172ff
...
...
@@ -608,14 +608,14 @@ public class TsFileProcessor {
try
{
TimeUnit
.
MILLISECONDS
.
sleep
(
1
);
File
parent
=
tsFileResource
.
getTsFile
().
getParentFile
();
File
newVmFile
=
FSFactoryProducer
.
getFSFactory
().
getFile
(
parent
,
return
FSFactoryProducer
.
getFSFactory
().
getFile
(
parent
,
tsFileResource
.
getTsFile
().
getName
()
+
IoTDBConstant
.
FILE_NAME_SEPARATOR
+
level
+
IoTDBConstant
.
FILE_NAME_SEPARATOR
+
System
.
currentTimeMillis
()
+
VM_SUFFIX
);
return
newVmFile
;
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
"{}: {}, closing task is interrupted."
,
storageGroupName
,
tsFileResource
.
getTsFile
().
getName
(),
e
);
Thread
.
currentThread
().
interrupt
();
return
null
;
}
finally
{
vmFileCreateLock
.
writeLock
().
unlock
();
...
...
@@ -716,7 +716,7 @@ public class TsFileProcessor {
if
(
config
.
isEnableVm
())
{
logger
.
info
(
"[Flush] flush a vm"
);
File
newVmFile
=
createNewVMFile
(
tsFileResource
,
0
);
if
(
vmWriters
.
size
()
<=
0
)
{
if
(
vmWriters
.
isEmpty
()
)
{
vmWriters
.
add
(
new
ArrayList
<>());
vmTsFileResources
.
add
(
new
ArrayList
<>());
}
...
...
@@ -1174,15 +1174,15 @@ public class TsFileProcessor {
try
{
TimeUnit
.
MILLISECONDS
.
sleep
(
1
);
File
parent
=
writer
.
getFile
().
getParentFile
();
File
newTmpFile
=
FSFactoryProducer
.
getFSFactory
().
getFile
(
parent
,
return
FSFactoryProducer
.
getFSFactory
().
getFile
(
parent
,
writer
.
getFile
().
getName
()
+
IoTDBConstant
.
FILE_NAME_SEPARATOR
+
System
.
currentTimeMillis
()
+
VM_SUFFIX
+
IoTDBConstant
.
PATH_SEPARATOR
+
PATH_UPGRADE
);
return
newTmpFile
;
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
"{}: {}, closing task is interrupted."
,
storageGroupName
,
tsFileResource
.
getTsFile
().
getName
(),
e
);
Thread
.
currentThread
().
interrupt
();
return
null
;
}
finally
{
vmFileCreateLock
.
writeLock
().
unlock
();
...
...
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
浏览文件 @
619172ff
...
...
@@ -719,8 +719,8 @@ public class TsFileResource {
}
/**
* Used when load new TsFiles not generated by the server Check and get the time partition
TODO:
* when the partition violation happens, split the file and load into different partitions
* Used when load new TsFiles not generated by the server Check and get the time partition
*
TODO:
when the partition violation happens, split the file and load into different partitions
*
* @throws PartitionViolationException if the data of the file cross partitions or it is empty
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录