You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/04/21 12:55:44 UTC
[iotdb] 03/04: s
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch TimeJoinOperatorBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 15a367331aef9f72e55c3e455cc052e5ff3d8625
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu Apr 21 17:20:54 2022 +0800
s
---
.../apache/iotdb/db/mpp/operator/process/TimeJoinOperator.java | 7 +++++++
.../org/apache/iotdb/tsfile/read/common/block/TsBlock.java | 10 +---------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/operator/process/TimeJoinOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/operator/process/TimeJoinOperator.java
index c5fbaf10b5..1b9cadeb39 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/operator/process/TimeJoinOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/operator/process/TimeJoinOperator.java
@@ -58,6 +58,8 @@ public class TimeJoinOperator implements ProcessOperator {
*/
private final List<TSDataType> dataTypes;
+ private List<ColumnMerger> mergers;
+
private boolean finished;
public TimeJoinOperator(
@@ -137,6 +139,11 @@ public class TimeJoinOperator implements ProcessOperator {
tsBlockBuilder.buildValueColumnBuilders(dataTypes);
+ for (int i = 0; i < columnCount; i++) {
+ ColumnMerger merger = mergers.get(i);
+
+ }
+
for (int i = 0, column = 0; i < inputCount; i++) {
TsBlock block = inputTsBlocks[i];
TimeColumn timeColumn = block.getTimeColumn();
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java
index 256b95498d..b8d3175a45 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java
@@ -50,15 +50,11 @@ public class TsBlock {
* Visible to give trusted classes like {@link TsBlockBuilder} access to a constructor that
* doesn't defensively copy the valueColumns
*/
- static TsBlock wrapBlocksWithoutCopy(
+ public static TsBlock wrapBlocksWithoutCopy(
int positionCount, TimeColumn timeColumn, Column[] valueColumns) {
return new TsBlock(false, positionCount, timeColumn, valueColumns);
}
- // TODO rethink about if we really need this field
- // Describe the column info
- private TsBlockMetadata metadata;
-
private final TimeColumn timeColumn;
private final Column[] valueColumns;
@@ -102,10 +98,6 @@ public class TsBlock {
public void next() {}
- public TsBlockMetadata getMetadata() {
- return metadata;
- }
-
public int getPositionCount() {
return positionCount;
}