Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
35736cc6
I
Iotdb
项目概览
apache
/
Iotdb
8 个月 前同步成功
通知
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
35736cc6
编写于
8月 30, 2023
作者:
马
马子坤
提交者:
GitHub
8月 30, 2023
1
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Pipe: Fix start-time and end-time parameters not working when extracting history data (#11001)
上级
656c462a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
15 addition
and
11 deletion
+15
-11
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBAirGapConnector.java
.../pipe/connector/protocol/airgap/IoTDBAirGapConnector.java
+2
-2
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/IoTDBThriftAsyncConnector.java
...ctor/protocol/thrift/async/IoTDBThriftAsyncConnector.java
+2
-2
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBThriftSyncConnector.java
...nector/protocol/thrift/sync/IoTDBThriftSyncConnector.java
+2
-2
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/EnrichedEvent.java
...in/java/org/apache/iotdb/db/pipe/event/EnrichedEvent.java
+5
-4
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java
...pipe/event/common/tablet/PipeRawTabletInsertionEvent.java
+1
-1
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java
...db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java
+3
-0
未找到文件。
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBAirGapConnector.java
浏览文件 @
35736cc6
...
...
@@ -186,7 +186,7 @@ public class IoTDBAirGapConnector extends IoTDBConnector {
return
;
}
if
(((
EnrichedEvent
)
tabletInsertionEvent
).
shouldParsePattern
())
{
if
(((
EnrichedEvent
)
tabletInsertionEvent
).
shouldParsePattern
OrTime
())
{
if
(
tabletInsertionEvent
instanceof
PipeInsertNodeTabletInsertionEvent
)
{
transfer
(
((
PipeInsertNodeTabletInsertionEvent
)
tabletInsertionEvent
).
parseEventWithPattern
());
...
...
@@ -226,7 +226,7 @@ public class IoTDBAirGapConnector extends IoTDBConnector {
return
;
}
if
(((
EnrichedEvent
)
tsFileInsertionEvent
).
shouldParsePattern
())
{
if
(((
EnrichedEvent
)
tsFileInsertionEvent
).
shouldParsePattern
OrTime
())
{
for
(
final
TabletInsertionEvent
event
:
tsFileInsertionEvent
.
toTabletInsertionEvents
())
{
transfer
(
event
);
}
...
...
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/IoTDBThriftAsyncConnector.java
浏览文件 @
35736cc6
...
...
@@ -150,7 +150,7 @@ public class IoTDBThriftAsyncConnector extends IoTDBConnector {
return
;
}
if
(((
EnrichedEvent
)
tabletInsertionEvent
).
shouldParsePattern
())
{
if
(((
EnrichedEvent
)
tabletInsertionEvent
).
shouldParsePattern
OrTime
())
{
if
(
tabletInsertionEvent
instanceof
PipeInsertNodeTabletInsertionEvent
)
{
transfer
(
((
PipeInsertNodeTabletInsertionEvent
)
tabletInsertionEvent
).
parseEventWithPattern
());
...
...
@@ -291,7 +291,7 @@ public class IoTDBThriftAsyncConnector extends IoTDBConnector {
return
;
}
if
(((
EnrichedEvent
)
tsFileInsertionEvent
).
shouldParsePattern
())
{
if
(((
EnrichedEvent
)
tsFileInsertionEvent
).
shouldParsePattern
OrTime
())
{
for
(
final
TabletInsertionEvent
event
:
tsFileInsertionEvent
.
toTabletInsertionEvents
())
{
transfer
(
event
);
}
...
...
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBThriftSyncConnector.java
浏览文件 @
35736cc6
...
...
@@ -185,7 +185,7 @@ public class IoTDBThriftSyncConnector extends IoTDBConnector {
return
;
}
if
(((
EnrichedEvent
)
tabletInsertionEvent
).
shouldParsePattern
())
{
if
(((
EnrichedEvent
)
tabletInsertionEvent
).
shouldParsePattern
OrTime
())
{
if
(
tabletInsertionEvent
instanceof
PipeInsertNodeTabletInsertionEvent
)
{
transfer
(
((
PipeInsertNodeTabletInsertionEvent
)
tabletInsertionEvent
).
parseEventWithPattern
());
...
...
@@ -231,7 +231,7 @@ public class IoTDBThriftSyncConnector extends IoTDBConnector {
return
;
}
if
(((
EnrichedEvent
)
tsFileInsertionEvent
).
shouldParsePattern
())
{
if
(((
EnrichedEvent
)
tsFileInsertionEvent
).
shouldParsePattern
OrTime
())
{
for
(
final
TabletInsertionEvent
event
:
tsFileInsertionEvent
.
toTabletInsertionEvents
())
{
transfer
(
event
);
}
...
...
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/EnrichedEvent.java
浏览文件 @
35736cc6
...
...
@@ -39,13 +39,14 @@ public abstract class EnrichedEvent implements Event {
protected
final
PipeTaskMeta
pipeTaskMeta
;
private
final
String
pattern
;
pr
ivate
final
boolean
isPattern
Parsed
;
pr
otected
boolean
isPatternAndTime
Parsed
;
protected
EnrichedEvent
(
PipeTaskMeta
pipeTaskMeta
,
String
pattern
)
{
referenceCount
=
new
AtomicInteger
(
0
);
this
.
pipeTaskMeta
=
pipeTaskMeta
;
this
.
pattern
=
pattern
;
isPatternParsed
=
getPattern
().
equals
(
PipeExtractorConstant
.
EXTRACTOR_PATTERN_DEFAULT_VALUE
);
isPatternAndTimeParsed
=
getPattern
().
equals
(
PipeExtractorConstant
.
EXTRACTOR_PATTERN_DEFAULT_VALUE
);
}
/**
...
...
@@ -130,8 +131,8 @@ public abstract class EnrichedEvent implements Event {
return
pattern
==
null
?
PipeExtractorConstant
.
EXTRACTOR_PATTERN_DEFAULT_VALUE
:
pattern
;
}
public
boolean
shouldParsePattern
()
{
return
!
isPatternParsed
;
public
boolean
shouldParsePattern
OrTime
()
{
return
!
isPattern
AndTime
Parsed
;
}
public
abstract
EnrichedEvent
shallowCopySelfAndBindPipeTaskMetaForProgressReport
(
...
...
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java
浏览文件 @
35736cc6
...
...
@@ -140,7 +140,7 @@ public class PipeRawTabletInsertionEvent extends EnrichedEvent implements Tablet
}
public
Tablet
convertToTablet
()
{
if
(!
shouldParsePattern
())
{
if
(!
shouldParsePattern
OrTime
())
{
return
tablet
;
}
...
...
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java
浏览文件 @
35736cc6
...
...
@@ -69,6 +69,9 @@ public class PipeTsFileInsertionEvent extends EnrichedEvent implements TsFileIns
this
.
startTime
=
startTime
;
this
.
endTime
=
endTime
;
if
(
hasTimeFilter
())
{
this
.
isPatternAndTimeParsed
=
false
;
}
this
.
resource
=
resource
;
tsFile
=
resource
.
getTsFile
();
...
...
GitCode官方
@csdn_codechina
mentioned in commit
4b867eb5
·
9月 07, 2023
mentioned in commit
4b867eb5
mentioned in commit 4b867eb55ab6e872eb2e9673b313ac00457f0479
开关提交列表
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录