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 2020/04/30 10:27:37 UTC
[GitHub] [incubator-iotdb] wshao08 opened a new pull request #1136: [IOTDB-632]Performance improve for Linear Fill
wshao08 opened a new pull request #1136:
URL: https://github.com/apache/incubator-iotdb/pull/1136
This PR is a reimplementation for Linear Fill.
Consider the Linear Fill function within range [T-before_range, T+after_range].
* Search the "before_value" within [T-before_range, T] in a reverse order.
* Search the "after_value" within [T, T+after_range] using aggregation functions.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #1136: [IOTDB-632]Performance improve for Linear Fill
Posted by GitBox <gi...@apache.org>.
qiaojialin commented on a change in pull request #1136:
URL: https://github.com/apache/incubator-iotdb/pull/1136#discussion_r420608387
##########
File path: server/src/main/java/org/apache/iotdb/db/query/executor/fill/LinearFill.java
##########
@@ -83,57 +92,80 @@ public IFill copy() {
}
@Override
- Filter constructFilter() {
+ void constructFilter() {
Filter lowerBound = beforeRange == -1 ? TimeFilter.gtEq(Long.MIN_VALUE)
: TimeFilter.gtEq(queryTime - beforeRange);
Filter upperBound = afterRange == -1 ? TimeFilter.ltEq(Long.MAX_VALUE)
: TimeFilter.ltEq(queryTime + afterRange);
// [queryTIme - beforeRange, queryTime + afterRange]
- return FilterFactory.and(lowerBound, upperBound);
+ beforeFilter = FilterFactory.and(lowerBound, TimeFilter.ltEq(queryTime));
+ afterFilter = FilterFactory.and(TimeFilter.gtEq(queryTime), upperBound);
}
@Override
- public void configureFill(Path path, TSDataType dataType, long queryTime,
- Set<String> sensors, QueryContext context)
- throws StorageEngineException, QueryProcessException {
+ public void configureFill(
+ Path path, TSDataType dataType, long queryTime, Set<String> sensors, QueryContext context) {
+ this.seriesPath = path;
this.dataType = dataType;
this.queryTime = queryTime;
- Filter timeFilter = constructFilter();
- dataReader = new SeriesRawDataBatchReader(path, sensors, dataType, context,
- QueryResourceManager.getInstance().getQueryDataSource(path, context, timeFilter),
- timeFilter, null, null);
+ this.context = context;
+ this.allSensors = sensors;
+ constructFilter();
}
@Override
- public TimeValuePair getFillResult() throws IOException, UnSupportedFillTypeException {
- TimeValuePair beforePair = null;
- TimeValuePair afterPair = null;
- while (batchData.hasCurrent() || dataReader.hasNextBatch()) {
- if (!batchData.hasCurrent() && dataReader.hasNextBatch()) {
- batchData = dataReader.nextBatch();
- }
- afterPair = new TimeValuePair(batchData.currentTime(), batchData.currentTsPrimitiveType());
- batchData.next();
- if (afterPair.getTimestamp() <= queryTime) {
- beforePair = afterPair;
- } else {
- break;
- }
- }
+ public TimeValuePair getFillResult()
+ throws IOException, QueryProcessException, StorageEngineException {
+ QueryDataSource dataSource =
+ QueryResourceManager.getInstance().getQueryDataSource(seriesPath, context, beforeFilter);
+ LastPointReader lastReader =
+ new LastPointReader(seriesPath, dataType, allSensors, context, dataSource, queryTime, beforeFilter);
+
+ TimeValuePair beforePair = lastReader.readLastPoint();
+ TimeValuePair afterPair = calculatFirstPointAfterQueryTime();
// no before data or has data on the query timestamp
- if (beforePair == null || beforePair.getTimestamp() == queryTime) {
+ if (beforePair.getValue() == null || beforePair.getTimestamp() == queryTime) {
return beforePair;
}
// on after data or after data is out of range
- if (afterPair.getTimestamp() < queryTime || (afterRange != -1 && afterPair.getTimestamp() > queryTime + afterRange)) {
+ if (afterPair.getValue() == null || afterPair.getTimestamp() < queryTime ||
+ (afterRange != -1 && afterPair.getTimestamp() > queryTime + afterRange)) {
return new TimeValuePair(queryTime, null);
}
return average(beforePair, afterPair);
}
+ private TimeValuePair calculatFirstPointAfterQueryTime()
Review comment:
```suggestion
private TimeValuePair calculateFirstPointAfterQueryTime()
```
##########
File path: server/src/main/java/org/apache/iotdb/db/query/executor/fill/LinearFill.java
##########
@@ -83,57 +92,80 @@ public IFill copy() {
}
@Override
- Filter constructFilter() {
+ void constructFilter() {
Filter lowerBound = beforeRange == -1 ? TimeFilter.gtEq(Long.MIN_VALUE)
: TimeFilter.gtEq(queryTime - beforeRange);
Filter upperBound = afterRange == -1 ? TimeFilter.ltEq(Long.MAX_VALUE)
: TimeFilter.ltEq(queryTime + afterRange);
// [queryTIme - beforeRange, queryTime + afterRange]
- return FilterFactory.and(lowerBound, upperBound);
+ beforeFilter = FilterFactory.and(lowerBound, TimeFilter.ltEq(queryTime));
+ afterFilter = FilterFactory.and(TimeFilter.gtEq(queryTime), upperBound);
}
@Override
- public void configureFill(Path path, TSDataType dataType, long queryTime,
- Set<String> sensors, QueryContext context)
- throws StorageEngineException, QueryProcessException {
+ public void configureFill(
+ Path path, TSDataType dataType, long queryTime, Set<String> sensors, QueryContext context) {
+ this.seriesPath = path;
this.dataType = dataType;
this.queryTime = queryTime;
- Filter timeFilter = constructFilter();
- dataReader = new SeriesRawDataBatchReader(path, sensors, dataType, context,
- QueryResourceManager.getInstance().getQueryDataSource(path, context, timeFilter),
- timeFilter, null, null);
+ this.context = context;
+ this.allSensors = sensors;
+ constructFilter();
}
@Override
- public TimeValuePair getFillResult() throws IOException, UnSupportedFillTypeException {
- TimeValuePair beforePair = null;
- TimeValuePair afterPair = null;
- while (batchData.hasCurrent() || dataReader.hasNextBatch()) {
- if (!batchData.hasCurrent() && dataReader.hasNextBatch()) {
- batchData = dataReader.nextBatch();
- }
- afterPair = new TimeValuePair(batchData.currentTime(), batchData.currentTsPrimitiveType());
- batchData.next();
- if (afterPair.getTimestamp() <= queryTime) {
- beforePair = afterPair;
- } else {
- break;
- }
- }
+ public TimeValuePair getFillResult()
+ throws IOException, QueryProcessException, StorageEngineException {
+ QueryDataSource dataSource =
+ QueryResourceManager.getInstance().getQueryDataSource(seriesPath, context, beforeFilter);
+ LastPointReader lastReader =
+ new LastPointReader(seriesPath, dataType, allSensors, context, dataSource, queryTime, beforeFilter);
+
+ TimeValuePair beforePair = lastReader.readLastPoint();
+ TimeValuePair afterPair = calculatFirstPointAfterQueryTime();
// no before data or has data on the query timestamp
- if (beforePair == null || beforePair.getTimestamp() == queryTime) {
+ if (beforePair.getValue() == null || beforePair.getTimestamp() == queryTime) {
return beforePair;
}
// on after data or after data is out of range
- if (afterPair.getTimestamp() < queryTime || (afterRange != -1 && afterPair.getTimestamp() > queryTime + afterRange)) {
+ if (afterPair.getValue() == null || afterPair.getTimestamp() < queryTime ||
+ (afterRange != -1 && afterPair.getTimestamp() > queryTime + afterRange)) {
return new TimeValuePair(queryTime, null);
}
return average(beforePair, afterPair);
}
+ private TimeValuePair calculatFirstPointAfterQueryTime()
+ throws IOException, StorageEngineException, QueryProcessException {
+ TimeValuePair result = new TimeValuePair(0, null);
+ List<String> aggregations = new ArrayList<>();
+ aggregations.add(AggregationType.MIN_TIME.toString());
+ aggregations.add(AggregationType.FIRST_VALUE.toString());
Review comment:
This is not needed, you could directly construct AggregateResult using dataType.
##########
File path: server/src/main/java/org/apache/iotdb/db/query/executor/fill/LinearFill.java
##########
@@ -83,57 +92,80 @@ public IFill copy() {
}
@Override
- Filter constructFilter() {
+ void constructFilter() {
Filter lowerBound = beforeRange == -1 ? TimeFilter.gtEq(Long.MIN_VALUE)
: TimeFilter.gtEq(queryTime - beforeRange);
Filter upperBound = afterRange == -1 ? TimeFilter.ltEq(Long.MAX_VALUE)
: TimeFilter.ltEq(queryTime + afterRange);
// [queryTIme - beforeRange, queryTime + afterRange]
- return FilterFactory.and(lowerBound, upperBound);
+ beforeFilter = FilterFactory.and(lowerBound, TimeFilter.ltEq(queryTime));
+ afterFilter = FilterFactory.and(TimeFilter.gtEq(queryTime), upperBound);
}
@Override
- public void configureFill(Path path, TSDataType dataType, long queryTime,
- Set<String> sensors, QueryContext context)
- throws StorageEngineException, QueryProcessException {
+ public void configureFill(
+ Path path, TSDataType dataType, long queryTime, Set<String> sensors, QueryContext context) {
+ this.seriesPath = path;
this.dataType = dataType;
this.queryTime = queryTime;
- Filter timeFilter = constructFilter();
- dataReader = new SeriesRawDataBatchReader(path, sensors, dataType, context,
- QueryResourceManager.getInstance().getQueryDataSource(path, context, timeFilter),
- timeFilter, null, null);
+ this.context = context;
+ this.allSensors = sensors;
+ constructFilter();
}
@Override
- public TimeValuePair getFillResult() throws IOException, UnSupportedFillTypeException {
- TimeValuePair beforePair = null;
- TimeValuePair afterPair = null;
- while (batchData.hasCurrent() || dataReader.hasNextBatch()) {
- if (!batchData.hasCurrent() && dataReader.hasNextBatch()) {
- batchData = dataReader.nextBatch();
- }
- afterPair = new TimeValuePair(batchData.currentTime(), batchData.currentTsPrimitiveType());
- batchData.next();
- if (afterPair.getTimestamp() <= queryTime) {
- beforePair = afterPair;
- } else {
- break;
- }
- }
+ public TimeValuePair getFillResult()
+ throws IOException, QueryProcessException, StorageEngineException {
+ QueryDataSource dataSource =
+ QueryResourceManager.getInstance().getQueryDataSource(seriesPath, context, beforeFilter);
+ LastPointReader lastReader =
+ new LastPointReader(seriesPath, dataType, allSensors, context, dataSource, queryTime, beforeFilter);
+
+ TimeValuePair beforePair = lastReader.readLastPoint();
+ TimeValuePair afterPair = calculatFirstPointAfterQueryTime();
// no before data or has data on the query timestamp
- if (beforePair == null || beforePair.getTimestamp() == queryTime) {
+ if (beforePair.getValue() == null || beforePair.getTimestamp() == queryTime) {
Review comment:
add the LinearFill in UserGuide, explain how we fill when beforePair or afterPair is null
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-iotdb] qiaojialin commented on a change in pull request #1136: [IOTDB-632]Performance improve for Linear Fill
Posted by GitBox <gi...@apache.org>.
qiaojialin commented on a change in pull request #1136:
URL: https://github.com/apache/incubator-iotdb/pull/1136#discussion_r417957578
##########
File path: server/src/main/java/org/apache/iotdb/db/query/executor/fill/PreviousFill.java
##########
@@ -0,0 +1,117 @@
+/*
+ * 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.query.executor.fill;
+
+import org.apache.iotdb.db.engine.querycontext.QueryDataSource;
+import org.apache.iotdb.db.exception.StorageEngineException;
+import org.apache.iotdb.db.exception.query.QueryProcessException;
+import org.apache.iotdb.db.qp.physical.crud.RawDataQueryPlan;
+import org.apache.iotdb.db.query.context.QueryContext;
+import org.apache.iotdb.db.query.control.QueryResourceManager;
+import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+import org.apache.iotdb.tsfile.read.TimeValuePair;
+import org.apache.iotdb.tsfile.read.common.Path;
+import org.apache.iotdb.tsfile.read.filter.TimeFilter;
+import org.apache.iotdb.tsfile.read.filter.basic.Filter;
+import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory;
+
+import java.io.IOException;
+import java.util.*;
+
+public class PreviousFill extends IFill {
+
+ private Path seriesPath;
+ private QueryContext context;
+ private long beforeRange;
+ private Set<String> allSensors;
+ private Filter timeFilter;
+
+ private boolean untilLast;
+
+ public PreviousFill(TSDataType dataType, long queryTime, long beforeRange) {
+ this(dataType, queryTime, beforeRange, false);
+ }
+
+ public PreviousFill(long beforeRange) {
+ this(beforeRange, false);
+ }
+
+
+ public PreviousFill(long beforeRange, boolean untilLast) {
+ this.beforeRange = beforeRange;
+ this.untilLast = untilLast;
+ }
+
+
+ public PreviousFill(TSDataType dataType, long queryTime, long beforeRange, boolean untilLast) {
+ super(dataType, queryTime);
+ this.beforeRange = beforeRange;
+ this.untilLast = untilLast;
+ }
+
+ @Override
+ public IFill copy() {
+ return new PreviousFill(dataType, queryTime, beforeRange, untilLast);
+ }
+
+ @Override
+ void constructFilter() {
+ Filter lowerBound = beforeRange == -1 ? TimeFilter.gtEq(Long.MIN_VALUE)
+ : TimeFilter.gtEq(queryTime - beforeRange);
+ // time in [queryTime - beforeRange, queryTime]
+ timeFilter = FilterFactory.and(lowerBound, TimeFilter.ltEq(queryTime));
+ }
+
+ public long getBeforeRange() {
+ return beforeRange;
+ }
+
+ @Override
+ public void configureFill(
+ Path path, TSDataType dataType, long queryTime, Set<String> sensors, QueryContext context) {
+ this.seriesPath = path;
+ this.dataType = dataType;
+ this.context = context;
+ this.queryTime = queryTime;
+ this.allSensors = sensors;
+ constructFilter();
+ }
+
+ @Override
+ public TimeValuePair getFillResult()
+ throws IOException, QueryProcessException, StorageEngineException {
+ QueryDataSource dataSource =
+ QueryResourceManager.getInstance().getQueryDataSource(seriesPath, context, timeFilter);
+ // update filter by TTL
+ timeFilter = dataSource.updateFilterUsingTTL(timeFilter);
+ LastPointReader lastReader = new LastPointReader(
+ seriesPath, dataType, allSensors, context, dataSource, queryTime, timeFilter);
+
+ return lastReader.getTimeseriesLastPointXXX();
Review comment:
XXX?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-iotdb] JackieTien97 commented on a change in pull request #1136: [IOTDB-632]Performance improve for Linear Fill
Posted by GitBox <gi...@apache.org>.
JackieTien97 commented on a change in pull request #1136:
URL: https://github.com/apache/incubator-iotdb/pull/1136#discussion_r421194003
##########
File path: docs/zh/SystemDesign/5-DataQuery/9-FillFunction.md
##########
@@ -146,3 +146,14 @@ public TimeValuePair getFillResult() throws IOException {
return lastPointResult;
}
```
+
+# Linear 填充
+
+对于T时间的 Linear Fill 线性填充值是由该时间序列的两个相关值做线性拟合得到的:T之前的最近时间戳对应的值,T之后的最近时间戳对应的值。
Review comment:
T之后的最早时间戳对应的值
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-iotdb] wshao08 commented on a change in pull request #1136: [IOTDB-632]Performance improve for Linear Fill
Posted by GitBox <gi...@apache.org>.
wshao08 commented on a change in pull request #1136:
URL: https://github.com/apache/incubator-iotdb/pull/1136#discussion_r418466705
##########
File path: server/src/main/java/org/apache/iotdb/db/query/executor/fill/PreviousFill.java
##########
@@ -0,0 +1,117 @@
+/*
+ * 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.query.executor.fill;
+
+import org.apache.iotdb.db.engine.querycontext.QueryDataSource;
+import org.apache.iotdb.db.exception.StorageEngineException;
+import org.apache.iotdb.db.exception.query.QueryProcessException;
+import org.apache.iotdb.db.qp.physical.crud.RawDataQueryPlan;
+import org.apache.iotdb.db.query.context.QueryContext;
+import org.apache.iotdb.db.query.control.QueryResourceManager;
+import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+import org.apache.iotdb.tsfile.read.TimeValuePair;
+import org.apache.iotdb.tsfile.read.common.Path;
+import org.apache.iotdb.tsfile.read.filter.TimeFilter;
+import org.apache.iotdb.tsfile.read.filter.basic.Filter;
+import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory;
+
+import java.io.IOException;
+import java.util.*;
+
+public class PreviousFill extends IFill {
+
+ private Path seriesPath;
+ private QueryContext context;
+ private long beforeRange;
+ private Set<String> allSensors;
+ private Filter timeFilter;
+
+ private boolean untilLast;
+
+ public PreviousFill(TSDataType dataType, long queryTime, long beforeRange) {
+ this(dataType, queryTime, beforeRange, false);
+ }
+
+ public PreviousFill(long beforeRange) {
+ this(beforeRange, false);
+ }
+
+
+ public PreviousFill(long beforeRange, boolean untilLast) {
+ this.beforeRange = beforeRange;
+ this.untilLast = untilLast;
+ }
+
+
+ public PreviousFill(TSDataType dataType, long queryTime, long beforeRange, boolean untilLast) {
+ super(dataType, queryTime);
+ this.beforeRange = beforeRange;
+ this.untilLast = untilLast;
+ }
+
+ @Override
+ public IFill copy() {
+ return new PreviousFill(dataType, queryTime, beforeRange, untilLast);
+ }
+
+ @Override
+ void constructFilter() {
+ Filter lowerBound = beforeRange == -1 ? TimeFilter.gtEq(Long.MIN_VALUE)
+ : TimeFilter.gtEq(queryTime - beforeRange);
+ // time in [queryTime - beforeRange, queryTime]
+ timeFilter = FilterFactory.and(lowerBound, TimeFilter.ltEq(queryTime));
+ }
+
+ public long getBeforeRange() {
+ return beforeRange;
+ }
+
+ @Override
+ public void configureFill(
+ Path path, TSDataType dataType, long queryTime, Set<String> sensors, QueryContext context) {
+ this.seriesPath = path;
+ this.dataType = dataType;
+ this.context = context;
+ this.queryTime = queryTime;
+ this.allSensors = sensors;
+ constructFilter();
+ }
+
+ @Override
+ public TimeValuePair getFillResult()
+ throws IOException, QueryProcessException, StorageEngineException {
+ QueryDataSource dataSource =
+ QueryResourceManager.getInstance().getQueryDataSource(seriesPath, context, timeFilter);
+ // update filter by TTL
+ timeFilter = dataSource.updateFilterUsingTTL(timeFilter);
+ LastPointReader lastReader = new LastPointReader(
+ seriesPath, dataType, allSensors, context, dataSource, queryTime, timeFilter);
+
+ return lastReader.getTimeseriesLastPointXXX();
Review comment:
Oh, that's a temporary name forgot to correct.. Fixed
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org