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 2023/03/09 06:33:37 UTC
[iotdb] branch SeriesScanOperatorImprove updated (6bc30553e3 -> 400f3b75dd)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch SeriesScanOperatorImprove
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 6bc30553e3 Merge remote-tracking branch 'origin/master' into SeriesScanOperatorImprove
new 1744d12877 delete useless logs
new 8a6f947962 add logs
new bf92dca755 opt
new 400f3b75dd add stack
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../process/join/RowBasedTimeJoinOperator.java | 3 +-
.../tsfile/read/common/block/TsBlockBuilder.java | 51 ----------------------
.../common/block/column/BinaryColumnBuilder.java | 4 +-
.../common/block/column/DoubleColumnBuilder.java | 3 +-
.../read/common/block/column/IntColumnBuilder.java | 3 +-
.../common/block/column/TimeColumnBuilder.java | 8 +++-
6 files changed, 11 insertions(+), 61 deletions(-)
[iotdb] 01/04: delete useless logs
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch SeriesScanOperatorImprove
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1744d128773217e97f8c1cfe10db0c6a0ffcc9e9
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu Mar 9 10:13:47 2023 +0800
delete useless logs
---
.../mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java | 3 +--
.../iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java | 3 +--
.../iotdb/tsfile/read/common/block/column/DoubleColumnBuilder.java | 3 +--
.../apache/iotdb/tsfile/read/common/block/column/IntColumnBuilder.java | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
index d920d8dc32..4ad910c1af 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
@@ -128,7 +128,7 @@ public class RowBasedTimeJoinOperator extends AbstractConsumeAllOperator {
if (retainedTsBlock != null) {
return getResultFromRetainedTsBlock();
}
- tsBlockBuilder.reset(20000);
+ tsBlockBuilder.reset();
if (!prepareInput()) {
return null;
}
@@ -282,7 +282,6 @@ public class RowBasedTimeJoinOperator extends AbstractConsumeAllOperator {
if (canCallNext[i]) {
if (children.get(i).hasNextWithTimer()) {
inputTsBlocks[i] = getNextTsBlock(i);
- LOGGER.info("get inputTsBlock with size: " + inputTsBlocks[i].getPositionCount());
canCallNext[i] = false;
if (isEmpty(i)) {
allReady = false;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
index de01e7b336..ab35a31c41 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
@@ -148,13 +148,12 @@ public class BinaryColumnBuilder implements ColumnBuilder {
int newSize;
if (initialized) {
newSize = ColumnUtil.calculateNewArraySize(values.length);
+ LOGGER.info("grow capacity from {} to {}", values.length, newSize);
} else {
newSize = initialEntryCount;
initialized = true;
}
- LOGGER.info("grow capacity from {} to {}", values.length, newSize);
-
valueIsNull = Arrays.copyOf(valueIsNull, newSize);
values = Arrays.copyOf(values, newSize);
updateArraysDataSize();
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumnBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumnBuilder.java
index 2c54464c9e..e88982981e 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumnBuilder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumnBuilder.java
@@ -146,13 +146,12 @@ public class DoubleColumnBuilder implements ColumnBuilder {
int newSize;
if (initialized) {
newSize = ColumnUtil.calculateNewArraySize(values.length);
+ LOGGER.info("grow capacity from {} to {}", values.length, newSize);
} else {
newSize = initialEntryCount;
initialized = true;
}
- LOGGER.info("grow capacity from {} to {}", values.length, newSize);
-
valueIsNull = Arrays.copyOf(valueIsNull, newSize);
values = Arrays.copyOf(values, newSize);
updateDataSize();
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumnBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumnBuilder.java
index 2d17b2c4a9..dcbd56bd16 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumnBuilder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumnBuilder.java
@@ -146,13 +146,12 @@ public class IntColumnBuilder implements ColumnBuilder {
int newSize;
if (initialized) {
newSize = ColumnUtil.calculateNewArraySize(values.length);
+ LOGGER.info("grow capacity from {} to {}", values.length, newSize);
} else {
newSize = initialEntryCount;
initialized = true;
}
- LOGGER.info("grow capacity from {} to {}", values.length, newSize);
-
valueIsNull = Arrays.copyOf(valueIsNull, newSize);
values = Arrays.copyOf(values, newSize);
updateDataSize();
[iotdb] 04/04: add stack
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch SeriesScanOperatorImprove
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 400f3b75dd45cf113eb6af2aef0bec7dd230e548
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu Mar 9 14:33:28 2023 +0800
add stack
---
.../tsfile/read/common/block/TsBlockBuilder.java | 51 ----------------------
.../common/block/column/TimeColumnBuilder.java | 2 +-
2 files changed, 1 insertion(+), 52 deletions(-)
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java
index a874edeab4..ee56fb5287 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java
@@ -137,30 +137,6 @@ public class TsBlockBuilder {
}
}
- private TsBlockBuilder(
- int maxTsBlockBytes,
- List<TSDataType> types,
- TimeColumnBuilder templateTimeColumnBuilder,
- ColumnBuilder[] templateValueColumnBuilders) {
- this.types = requireNonNull(types, "types is null");
-
- tsBlockBuilderStatus = new TsBlockBuilderStatus(maxTsBlockBytes);
- valueColumnBuilders = new ColumnBuilder[types.size()];
-
- checkArgument(
- templateValueColumnBuilders.length == types.size(),
- "Size of templates and types should match");
- timeColumnBuilder =
- (TimeColumnBuilder)
- templateTimeColumnBuilder.newColumnBuilderLike(
- tsBlockBuilderStatus.createColumnBuilderStatus());
- for (int i = 0; i < valueColumnBuilders.length; i++) {
- valueColumnBuilders[i] =
- templateValueColumnBuilders[i].newColumnBuilderLike(
- tsBlockBuilderStatus.createColumnBuilderStatus());
- }
- }
-
public void buildValueColumnBuilders(List<TSDataType> types) {
this.types = requireNonNull(types, "types is null");
valueColumnBuilders = new ColumnBuilder[types.size()];
@@ -225,33 +201,6 @@ public class TsBlockBuilder {
}
}
- public void reset(int initialEntryCount) {
- tsBlockBuilderStatus =
- new TsBlockBuilderStatus(tsBlockBuilderStatus.getMaxTsBlockSizeInBytes());
-
- declaredPositions = 0;
-
- timeColumnBuilder =
- (TimeColumnBuilder)
- timeColumnBuilder.newColumnBuilderLike(
- tsBlockBuilderStatus.createColumnBuilderStatus());
- timeColumnBuilder.updateInitialEntryCount(initialEntryCount);
- for (int i = 0; i < valueColumnBuilders.length; i++) {
- valueColumnBuilders[i] =
- valueColumnBuilders[i].newColumnBuilderLike(
- tsBlockBuilderStatus.createColumnBuilderStatus());
- valueColumnBuilders[i].updateInitialEntryCount(initialEntryCount);
- }
- }
-
- public TsBlockBuilder newTsBlockBuilderLike() {
- return new TsBlockBuilder(
- tsBlockBuilderStatus.getMaxTsBlockSizeInBytes(),
- types,
- timeColumnBuilder,
- valueColumnBuilders);
- }
-
public TimeColumnBuilder getTimeColumnBuilder() {
return timeColumnBuilder;
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java
index 2dabbabfe5..b257e87893 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java
@@ -113,7 +113,7 @@ public class TimeColumnBuilder implements ColumnBuilder {
@Override
public ColumnBuilder newColumnBuilderLike(ColumnBuilderStatus columnBuilderStatus) {
int count = calculateBlockResetSize(positionCount);
- LOGGER.info("reset size: {}", count);
+ LOGGER.info("reset size: {}", count, new Exception("print"));
return new TimeColumnBuilder(columnBuilderStatus, count);
}
[iotdb] 03/04: opt
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch SeriesScanOperatorImprove
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bf92dca755650eabc35f2e448a4408615d925e1d
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu Mar 9 13:38:24 2023 +0800
opt
---
.../execution/operator/process/join/RowBasedTimeJoinOperator.java | 2 +-
.../tsfile/read/common/block/column/BinaryColumnBuilder.java | 4 +---
.../iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java | 8 +++++++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
index 4ad910c1af..38baf81024 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
@@ -128,7 +128,6 @@ public class RowBasedTimeJoinOperator extends AbstractConsumeAllOperator {
if (retainedTsBlock != null) {
return getResultFromRetainedTsBlock();
}
- tsBlockBuilder.reset();
if (!prepareInput()) {
return null;
}
@@ -157,6 +156,7 @@ public class RowBasedTimeJoinOperator extends AbstractConsumeAllOperator {
return tsBlockBuilder.build();
}
+ tsBlockBuilder.reset();
TimeColumnBuilder timeBuilder = tsBlockBuilder.getTimeColumnBuilder();
long currentTime;
do {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
index 8b501c7e07..3e2ddce667 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
@@ -135,9 +135,7 @@ public class BinaryColumnBuilder implements ColumnBuilder {
@Override
public ColumnBuilder newColumnBuilderLike(ColumnBuilderStatus columnBuilderStatus) {
// TODO we should take retain size into account here
- int count = calculateBlockResetSize(positionCount);
- LOGGER.info("reset size: " + count);
- return new BinaryColumnBuilder(columnBuilderStatus, count);
+ return new BinaryColumnBuilder(columnBuilderStatus, calculateBlockResetSize(positionCount));
}
@Override
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java
index 05b15779f6..2dabbabfe5 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java
@@ -22,6 +22,8 @@ import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.openjdk.jol.info.ClassLayout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Arrays;
@@ -31,6 +33,8 @@ import static org.apache.iotdb.tsfile.read.common.block.column.ColumnUtil.calcul
public class TimeColumnBuilder implements ColumnBuilder {
+ private static final Logger LOGGER = LoggerFactory.getLogger(TimeColumnBuilder.class);
+
private static final int INSTANCE_SIZE =
ClassLayout.parseClass(TimeColumnBuilder.class).instanceSize();
@@ -108,7 +112,9 @@ public class TimeColumnBuilder implements ColumnBuilder {
@Override
public ColumnBuilder newColumnBuilderLike(ColumnBuilderStatus columnBuilderStatus) {
- return new TimeColumnBuilder(columnBuilderStatus, calculateBlockResetSize(positionCount));
+ int count = calculateBlockResetSize(positionCount);
+ LOGGER.info("reset size: {}", count);
+ return new TimeColumnBuilder(columnBuilderStatus, count);
}
@Override
[iotdb] 02/04: add logs
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch SeriesScanOperatorImprove
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8a6f9479627560b5acd589237ffbb5bebb2e6d40
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu Mar 9 11:13:27 2023 +0800
add logs
---
.../iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
index ab35a31c41..8b501c7e07 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
@@ -67,7 +67,6 @@ public class BinaryColumnBuilder implements ColumnBuilder {
public ColumnBuilder writeBinary(Binary value) {
if (values.length <= positionCount) {
growCapacity();
- LOGGER.info("binary size: " + value.getValues().length);
}
values[positionCount] = value;
@@ -136,7 +135,9 @@ public class BinaryColumnBuilder implements ColumnBuilder {
@Override
public ColumnBuilder newColumnBuilderLike(ColumnBuilderStatus columnBuilderStatus) {
// TODO we should take retain size into account here
- return new BinaryColumnBuilder(columnBuilderStatus, calculateBlockResetSize(positionCount));
+ int count = calculateBlockResetSize(positionCount);
+ LOGGER.info("reset size: " + count);
+ return new BinaryColumnBuilder(columnBuilderStatus, count);
}
@Override