You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by GitBox <gi...@apache.org> on 2022/12/05 06:06:30 UTC
[GitHub] [iotdb] JackieTien97 commented on a diff in pull request #8175: [To rel/1.0] [IOTDB-4902]Optimize process logic for aggregation when there is only one data region
JackieTien97 commented on code in PR #8175:
URL: https://github.com/apache/iotdb/pull/8175#discussion_r1039169978
##########
server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/VerticallyConcatOperator.java:
##########
@@ -0,0 +1,206 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.mpp.execution.operator.process.join;
+
+import org.apache.iotdb.db.mpp.execution.operator.Operator;
+import org.apache.iotdb.db.mpp.execution.operator.OperatorContext;
+import org.apache.iotdb.db.mpp.execution.operator.process.ProcessOperator;
+import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+import org.apache.iotdb.tsfile.read.common.block.TsBlock;
+import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder;
+import org.apache.iotdb.tsfile.read.common.block.column.Column;
+import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder;
+import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn;
+import org.apache.iotdb.tsfile.read.common.block.column.TimeColumnBuilder;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.util.concurrent.Futures.successfulAsList;
+
+public class VerticallyConcatOperator implements ProcessOperator {
+
+ private final OperatorContext operatorContext;
+
+ private final List<Operator> children;
+
+ private final int inputOperatorsCount;
+
+ /** TsBlock from child operator. Only one cache now. */
+ private final TsBlock[] inputTsBlocks;
+
+ /** start index for each input TsBlocks and size of it is equal to inputTsBlocks */
+ private final int[] inputIndex;
+
+ private final int outputColumnCount;
+
+ private final TsBlockBuilder tsBlockBuilder;
+
+ private boolean finished;
+
+ public VerticallyConcatOperator(
+ OperatorContext operatorContext, List<Operator> children, List<TSDataType> dataTypes) {
+ checkArgument(
+ children != null && children.size() > 0,
+ "child size of VerticallyConcatOperator should be larger than 0");
+ this.operatorContext = operatorContext;
+ this.children = children;
+ this.inputOperatorsCount = children.size();
+ this.inputTsBlocks = new TsBlock[this.inputOperatorsCount];
+ this.inputIndex = new int[this.inputOperatorsCount];
+ this.outputColumnCount = dataTypes.size();
+ this.tsBlockBuilder = new TsBlockBuilder(dataTypes);
+ }
+
+ @Override
+ public OperatorContext getOperatorContext() {
+ return operatorContext;
+ }
+
+ @Override
+ public ListenableFuture<?> isBlocked() {
+ List<ListenableFuture<?>> listenableFutures = new ArrayList<>();
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ if (empty(i)) {
+ ListenableFuture<?> blocked = children.get(i).isBlocked();
+ if (!blocked.isDone()) {
+ listenableFutures.add(blocked);
+ }
+ }
+ }
+ return listenableFutures.isEmpty() ? NOT_BLOCKED : successfulAsList(listenableFutures);
+ }
+
+ @Override
+ public TsBlock next() {
+ tsBlockBuilder.reset();
+ // indicates how many rows can be built in this calculate
+ int maxRowCanBuild = Integer.MAX_VALUE;
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ if (empty(i)) {
+ inputIndex[i] = 0;
+ inputTsBlocks[i] = children.get(i).next();
+ if (empty(i)) {
+ // child operator has not prepared TsBlock well
+ return null;
+ }
+ }
+ maxRowCanBuild =
+ Math.min(maxRowCanBuild, inputTsBlocks[i].getPositionCount() - inputIndex[i]);
+ }
+
+ TimeColumn firstTimeColumn = inputTsBlocks[0].getTimeColumn();
+ TimeColumnBuilder timeColumnBuilder = tsBlockBuilder.getTimeColumnBuilder();
+ ColumnBuilder[] valueColumnBuilders = tsBlockBuilder.getValueColumnBuilders();
+
+ for (int row = 0; row < maxRowCanBuild; row++) {
+ // build TimeColumn
+ timeColumnBuilder.writeLong(firstTimeColumn.getLong(inputIndex[0]));
+ tsBlockBuilder.declarePosition();
+ }
+
+ // build each ValueColumn in every inputTsBlock
+ int valueBuilderIndex = 0; // indicate which valueColumnBuilder should use
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ int currTsBlockIndex = inputIndex[i];
Review Comment:
Actually, I didn't see that you increase this `currTsBlockIndex`, it seems that you always append the same value in the for-loop
##########
server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/VerticallyConcatOperator.java:
##########
@@ -0,0 +1,206 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.mpp.execution.operator.process.join;
+
+import org.apache.iotdb.db.mpp.execution.operator.Operator;
+import org.apache.iotdb.db.mpp.execution.operator.OperatorContext;
+import org.apache.iotdb.db.mpp.execution.operator.process.ProcessOperator;
+import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+import org.apache.iotdb.tsfile.read.common.block.TsBlock;
+import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder;
+import org.apache.iotdb.tsfile.read.common.block.column.Column;
+import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder;
+import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn;
+import org.apache.iotdb.tsfile.read.common.block.column.TimeColumnBuilder;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.util.concurrent.Futures.successfulAsList;
+
+public class VerticallyConcatOperator implements ProcessOperator {
+
+ private final OperatorContext operatorContext;
+
+ private final List<Operator> children;
+
+ private final int inputOperatorsCount;
+
+ /** TsBlock from child operator. Only one cache now. */
+ private final TsBlock[] inputTsBlocks;
+
+ /** start index for each input TsBlocks and size of it is equal to inputTsBlocks */
+ private final int[] inputIndex;
+
+ private final int outputColumnCount;
+
+ private final TsBlockBuilder tsBlockBuilder;
+
+ private boolean finished;
+
+ public VerticallyConcatOperator(
+ OperatorContext operatorContext, List<Operator> children, List<TSDataType> dataTypes) {
+ checkArgument(
+ children != null && children.size() > 0,
+ "child size of VerticallyConcatOperator should be larger than 0");
+ this.operatorContext = operatorContext;
+ this.children = children;
+ this.inputOperatorsCount = children.size();
+ this.inputTsBlocks = new TsBlock[this.inputOperatorsCount];
+ this.inputIndex = new int[this.inputOperatorsCount];
+ this.outputColumnCount = dataTypes.size();
+ this.tsBlockBuilder = new TsBlockBuilder(dataTypes);
+ }
+
+ @Override
+ public OperatorContext getOperatorContext() {
+ return operatorContext;
+ }
+
+ @Override
+ public ListenableFuture<?> isBlocked() {
+ List<ListenableFuture<?>> listenableFutures = new ArrayList<>();
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ if (empty(i)) {
+ ListenableFuture<?> blocked = children.get(i).isBlocked();
+ if (!blocked.isDone()) {
+ listenableFutures.add(blocked);
+ }
+ }
+ }
+ return listenableFutures.isEmpty() ? NOT_BLOCKED : successfulAsList(listenableFutures);
+ }
+
+ @Override
+ public TsBlock next() {
+ tsBlockBuilder.reset();
+ // indicates how many rows can be built in this calculate
+ int maxRowCanBuild = Integer.MAX_VALUE;
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ if (empty(i)) {
+ inputIndex[i] = 0;
+ inputTsBlocks[i] = children.get(i).next();
+ if (empty(i)) {
+ // child operator has not prepared TsBlock well
+ return null;
+ }
+ }
+ maxRowCanBuild =
+ Math.min(maxRowCanBuild, inputTsBlocks[i].getPositionCount() - inputIndex[i]);
+ }
+
+ TimeColumn firstTimeColumn = inputTsBlocks[0].getTimeColumn();
+ TimeColumnBuilder timeColumnBuilder = tsBlockBuilder.getTimeColumnBuilder();
+ ColumnBuilder[] valueColumnBuilders = tsBlockBuilder.getValueColumnBuilders();
+
+ for (int row = 0; row < maxRowCanBuild; row++) {
+ // build TimeColumn
+ timeColumnBuilder.writeLong(firstTimeColumn.getLong(inputIndex[0]));
+ tsBlockBuilder.declarePosition();
+ }
+
+ // build each ValueColumn in every inputTsBlock
+ int valueBuilderIndex = 0; // indicate which valueColumnBuilder should use
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ int currTsBlockIndex = inputIndex[i];
+ for (Column column : inputTsBlocks[i].getValueColumns()) {
+ for (int row = 0; row < maxRowCanBuild; row++) {
+ if (column.isNull(currTsBlockIndex)) {
+ valueColumnBuilders[valueBuilderIndex].appendNull();
+ } else {
+ valueColumnBuilders[valueBuilderIndex].writeObject(column.getObject(currTsBlockIndex));
Review Comment:
Remember that `writeObject` is ineffective, never use that if possible.
##########
server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/VerticallyConcatOperator.java:
##########
@@ -0,0 +1,206 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.mpp.execution.operator.process.join;
+
+import org.apache.iotdb.db.mpp.execution.operator.Operator;
+import org.apache.iotdb.db.mpp.execution.operator.OperatorContext;
+import org.apache.iotdb.db.mpp.execution.operator.process.ProcessOperator;
+import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+import org.apache.iotdb.tsfile.read.common.block.TsBlock;
+import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder;
+import org.apache.iotdb.tsfile.read.common.block.column.Column;
+import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder;
+import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn;
+import org.apache.iotdb.tsfile.read.common.block.column.TimeColumnBuilder;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.util.concurrent.Futures.successfulAsList;
+
+public class VerticallyConcatOperator implements ProcessOperator {
+
+ private final OperatorContext operatorContext;
+
+ private final List<Operator> children;
+
+ private final int inputOperatorsCount;
+
+ /** TsBlock from child operator. Only one cache now. */
+ private final TsBlock[] inputTsBlocks;
+
+ /** start index for each input TsBlocks and size of it is equal to inputTsBlocks */
+ private final int[] inputIndex;
+
+ private final int outputColumnCount;
+
+ private final TsBlockBuilder tsBlockBuilder;
+
+ private boolean finished;
+
+ public VerticallyConcatOperator(
+ OperatorContext operatorContext, List<Operator> children, List<TSDataType> dataTypes) {
+ checkArgument(
+ children != null && children.size() > 0,
+ "child size of VerticallyConcatOperator should be larger than 0");
+ this.operatorContext = operatorContext;
+ this.children = children;
+ this.inputOperatorsCount = children.size();
+ this.inputTsBlocks = new TsBlock[this.inputOperatorsCount];
+ this.inputIndex = new int[this.inputOperatorsCount];
+ this.outputColumnCount = dataTypes.size();
+ this.tsBlockBuilder = new TsBlockBuilder(dataTypes);
+ }
+
+ @Override
+ public OperatorContext getOperatorContext() {
+ return operatorContext;
+ }
+
+ @Override
+ public ListenableFuture<?> isBlocked() {
+ List<ListenableFuture<?>> listenableFutures = new ArrayList<>();
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ if (empty(i)) {
+ ListenableFuture<?> blocked = children.get(i).isBlocked();
+ if (!blocked.isDone()) {
+ listenableFutures.add(blocked);
+ }
+ }
+ }
+ return listenableFutures.isEmpty() ? NOT_BLOCKED : successfulAsList(listenableFutures);
+ }
+
+ @Override
+ public TsBlock next() {
+ tsBlockBuilder.reset();
+ // indicates how many rows can be built in this calculate
+ int maxRowCanBuild = Integer.MAX_VALUE;
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ if (empty(i)) {
+ inputIndex[i] = 0;
+ inputTsBlocks[i] = children.get(i).next();
+ if (empty(i)) {
+ // child operator has not prepared TsBlock well
+ return null;
+ }
+ }
+ maxRowCanBuild =
+ Math.min(maxRowCanBuild, inputTsBlocks[i].getPositionCount() - inputIndex[i]);
+ }
+
+ TimeColumn firstTimeColumn = inputTsBlocks[0].getTimeColumn();
+ TimeColumnBuilder timeColumnBuilder = tsBlockBuilder.getTimeColumnBuilder();
+ ColumnBuilder[] valueColumnBuilders = tsBlockBuilder.getValueColumnBuilders();
+
+ for (int row = 0; row < maxRowCanBuild; row++) {
+ // build TimeColumn
+ timeColumnBuilder.writeLong(firstTimeColumn.getLong(inputIndex[0]));
+ tsBlockBuilder.declarePosition();
+ }
+
+ // build each ValueColumn in every inputTsBlock
+ int valueBuilderIndex = 0; // indicate which valueColumnBuilder should use
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ int currTsBlockIndex = inputIndex[i];
+ for (Column column : inputTsBlocks[i].getValueColumns()) {
+ for (int row = 0; row < maxRowCanBuild; row++) {
+ if (column.isNull(currTsBlockIndex)) {
+ valueColumnBuilders[valueBuilderIndex].appendNull();
+ } else {
+ valueColumnBuilders[valueBuilderIndex].writeObject(column.getObject(currTsBlockIndex));
Review Comment:
```suggestion
valueColumnBuilders[valueBuilderIndex].write(column, currTsBlockIndex);
```
##########
server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/VerticallyConcatOperator.java:
##########
@@ -0,0 +1,206 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.mpp.execution.operator.process.join;
+
+import org.apache.iotdb.db.mpp.execution.operator.Operator;
+import org.apache.iotdb.db.mpp.execution.operator.OperatorContext;
+import org.apache.iotdb.db.mpp.execution.operator.process.ProcessOperator;
+import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+import org.apache.iotdb.tsfile.read.common.block.TsBlock;
+import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder;
+import org.apache.iotdb.tsfile.read.common.block.column.Column;
+import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder;
+import org.apache.iotdb.tsfile.read.common.block.column.TimeColumn;
+import org.apache.iotdb.tsfile.read.common.block.column.TimeColumnBuilder;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.util.concurrent.Futures.successfulAsList;
+
+public class VerticallyConcatOperator implements ProcessOperator {
+
+ private final OperatorContext operatorContext;
+
+ private final List<Operator> children;
+
+ private final int inputOperatorsCount;
+
+ /** TsBlock from child operator. Only one cache now. */
+ private final TsBlock[] inputTsBlocks;
+
+ /** start index for each input TsBlocks and size of it is equal to inputTsBlocks */
+ private final int[] inputIndex;
+
+ private final int outputColumnCount;
+
+ private final TsBlockBuilder tsBlockBuilder;
+
+ private boolean finished;
+
+ public VerticallyConcatOperator(
+ OperatorContext operatorContext, List<Operator> children, List<TSDataType> dataTypes) {
+ checkArgument(
+ children != null && children.size() > 0,
+ "child size of VerticallyConcatOperator should be larger than 0");
+ this.operatorContext = operatorContext;
+ this.children = children;
+ this.inputOperatorsCount = children.size();
+ this.inputTsBlocks = new TsBlock[this.inputOperatorsCount];
+ this.inputIndex = new int[this.inputOperatorsCount];
+ this.outputColumnCount = dataTypes.size();
+ this.tsBlockBuilder = new TsBlockBuilder(dataTypes);
+ }
+
+ @Override
+ public OperatorContext getOperatorContext() {
+ return operatorContext;
+ }
+
+ @Override
+ public ListenableFuture<?> isBlocked() {
+ List<ListenableFuture<?>> listenableFutures = new ArrayList<>();
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ if (empty(i)) {
+ ListenableFuture<?> blocked = children.get(i).isBlocked();
+ if (!blocked.isDone()) {
+ listenableFutures.add(blocked);
+ }
+ }
+ }
+ return listenableFutures.isEmpty() ? NOT_BLOCKED : successfulAsList(listenableFutures);
+ }
+
+ @Override
+ public TsBlock next() {
+ tsBlockBuilder.reset();
+ // indicates how many rows can be built in this calculate
+ int maxRowCanBuild = Integer.MAX_VALUE;
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ if (empty(i)) {
+ inputIndex[i] = 0;
+ inputTsBlocks[i] = children.get(i).next();
+ if (empty(i)) {
+ // child operator has not prepared TsBlock well
+ return null;
+ }
+ }
+ maxRowCanBuild =
+ Math.min(maxRowCanBuild, inputTsBlocks[i].getPositionCount() - inputIndex[i]);
+ }
+
+ TimeColumn firstTimeColumn = inputTsBlocks[0].getTimeColumn();
+ TimeColumnBuilder timeColumnBuilder = tsBlockBuilder.getTimeColumnBuilder();
+ ColumnBuilder[] valueColumnBuilders = tsBlockBuilder.getValueColumnBuilders();
+
+ for (int row = 0; row < maxRowCanBuild; row++) {
+ // build TimeColumn
+ timeColumnBuilder.writeLong(firstTimeColumn.getLong(inputIndex[0]));
+ tsBlockBuilder.declarePosition();
+ }
+
+ // build each ValueColumn in every inputTsBlock
+ int valueBuilderIndex = 0; // indicate which valueColumnBuilder should use
+ for (int i = 0; i < inputOperatorsCount; i++) {
+ int currTsBlockIndex = inputIndex[i];
Review Comment:
If so, add a new UT for this Operator.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org