未验证 提交 35736cc6 编写于 作者: 马子坤 提交者: GitHub

Pipe: Fix start-time and end-time parameters not working when extracting history data (#11001)

上级 656c462a
......@@ -186,7 +186,7 @@ public class IoTDBAirGapConnector extends IoTDBConnector {
return;
}
if (((EnrichedEvent) tabletInsertionEvent).shouldParsePattern()) {
if (((EnrichedEvent) tabletInsertionEvent).shouldParsePatternOrTime()) {
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).shouldParsePatternOrTime()) {
for (final TabletInsertionEvent event : tsFileInsertionEvent.toTabletInsertionEvents()) {
transfer(event);
}
......
......@@ -150,7 +150,7 @@ public class IoTDBThriftAsyncConnector extends IoTDBConnector {
return;
}
if (((EnrichedEvent) tabletInsertionEvent).shouldParsePattern()) {
if (((EnrichedEvent) tabletInsertionEvent).shouldParsePatternOrTime()) {
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).shouldParsePatternOrTime()) {
for (final TabletInsertionEvent event : tsFileInsertionEvent.toTabletInsertionEvents()) {
transfer(event);
}
......
......@@ -185,7 +185,7 @@ public class IoTDBThriftSyncConnector extends IoTDBConnector {
return;
}
if (((EnrichedEvent) tabletInsertionEvent).shouldParsePattern()) {
if (((EnrichedEvent) tabletInsertionEvent).shouldParsePatternOrTime()) {
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).shouldParsePatternOrTime()) {
for (final TabletInsertionEvent event : tsFileInsertionEvent.toTabletInsertionEvents()) {
transfer(event);
}
......
......@@ -39,13 +39,14 @@ public abstract class EnrichedEvent implements Event {
protected final PipeTaskMeta pipeTaskMeta;
private final String pattern;
private final boolean isPatternParsed;
protected boolean isPatternAndTimeParsed;
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 shouldParsePatternOrTime() {
return !isPatternAndTimeParsed;
}
public abstract EnrichedEvent shallowCopySelfAndBindPipeTaskMetaForProgressReport(
......
......@@ -140,7 +140,7 @@ public class PipeRawTabletInsertionEvent extends EnrichedEvent implements Tablet
}
public Tablet convertToTablet() {
if (!shouldParsePattern()) {
if (!shouldParsePatternOrTime()) {
return tablet;
}
......
......@@ -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();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册