This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch IOTDB-6243
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/IOTDB-6243 by this push:
new 878c9fb5b25 try fix
878c9fb5b25 is described below
commit 878c9fb5b25591677bf3bafe855f923ba2bb9540
Author: JackieTien97 <[email protected]>
AuthorDate: Thu Nov 9 21:52:32 2023 +0800
try fix
---
iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl | 1 +
.../db/queryengine/execution/operator/process/FillOperator.java | 2 +-
.../iotdb/db/queryengine/execution/operator/FillOperatorTest.java | 7 ++++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl
b/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl
index e564fcfabba..d283535ce33 100644
--- a/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl
+++ b/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl
@@ -27,6 +27,7 @@ import
org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill;
import org.apache.iotdb.tsfile.read.common.block.column.${type.column};
import org.apache.iotdb.tsfile.access.Column;
import org.apache.iotdb.tsfile.read.common.block.column.RunLengthEncodedColumn;
+import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn;
<#if type.dataType == "Binary">
import org.apache.iotdb.tsfile.utils.Binary;
</#if>
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FillOperator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FillOperator.java
index 8719a7c69e4..3fe87f843cb 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FillOperator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FillOperator.java
@@ -71,7 +71,7 @@ public class FillOperator implements ProcessOperator {
Column[] valueColumns = new Column[outputColumnCount];
for (int i = 0; i < outputColumnCount; i++) {
- valueColumns[i] = fillArray[i].fill(block.getColumn(i));
+ valueColumns[i] = fillArray[i].fill(block.getTimeColumn(),
block.getColumn(i));
}
return TsBlock.wrapBlocksWithoutCopy(
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java
index abb1bbfc801..96a528eecda 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java
@@ -27,6 +27,7 @@ import
org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContex
import
org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine;
import org.apache.iotdb.db.queryengine.execution.operator.process.FillOperator;
import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill;
+import
org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFillFilter;
import
org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.DoubleConstantFill;
import
org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.IntPreviousFill;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
@@ -236,7 +237,11 @@ public class FillOperatorTest {
driverContext.addOperatorContext(1, planNodeId1,
FillOperator.class.getSimpleName());
IFill[] fillArray =
- new IFill[] {new IntPreviousFill(), new IntPreviousFill(), new
IntPreviousFill()};
+ new IFill[] {
+ new IntPreviousFill(IFillFilter.TRUE),
+ new IntPreviousFill(IFillFilter.TRUE),
+ new IntPreviousFill(IFillFilter.TRUE)
+ };
FillOperator fillOperator =
new FillOperator(
driverContext.getOperatorContexts().get(0),
