You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/23 07:57:57 UTC
[iotdb] branch timeIteratorBug created (now 795c6f57bc)
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch timeIteratorBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 795c6f57bc Fix timeIterator bug
This branch includes the following new commits:
new 985f7a9eea Merge branch 'master' of github.com:apache/iotdb
new 795c6f57bc Fix timeIterator bug
The 2 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.
[iotdb] 01/02: Merge branch 'master' of github.com:apache/iotdb
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch timeIteratorBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 985f7a9eeaff4f4a76a49f5da5f5e48319a3e0d3
Merge: 52062ada44 ec0ca1044d
Author: Alima777 <wx...@gmail.com>
AuthorDate: Mon May 23 15:39:42 2022 +0800
Merge branch 'master' of github.com:apache/iotdb
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 6 +-
.../query/ClusterPhysicalGeneratorTest.java | 4 +-
.../query/last/ClusterLastQueryExecutorTest.java | 2 +-
confignode/pom.xml | 5 -
.../request/read/GetChildNodesPartitionReq.java | 3 +-
.../request/read/GetChildPathsPartitionReq.java | 3 +-
.../confignode/persistence/PartitionInfo.java | 6 +-
.../confignode/persistence/ProcedureInfo.java | 9 +-
.../iotdb/confignode/procedure/Procedure.java | 43 +-
.../confignode/procedure/ProcedureExecutor.java | 68 +-
.../procedure/StateMachineProcedure.java | 4 +-
.../procedure/conf/ProcedureNodeConfig.java | 155 --
.../conf/ProcedureNodeConfigDescriptor.java | 219 ---
.../procedure/conf/ProcedureNodeConstant.java | 32 -
.../procedure/store/ConfigProcedureStore.java | 6 +-
.../procedure/store/IProcedureStore.java | 4 +-
.../procedure/store/ProcedureFactory.java | 5 +-
.../confignode/procedure/store/ProcedureStore.java | 14 +-
.../confignode/procedure/NoopProcedureStore.java | 4 +-
.../confignode/procedure/TestProcedureBase.java | 7 +-
.../procedure/TestProcedureExecutor.java | 2 -
.../procedure/store/TestProcedureStore.java | 9 +-
.../GrafanaPlugin/Dockerfile-0.14.0-iotdb | 42 +
.../DockerCompose/GrafanaPlugin/docker-compose.yml | 48 +
.../GrafanaPlugin/iotdb/conf/iotdb-rest.properties | 58 +
.../java/org/apache/iotdb/udf/UDTFExample.java | 14 +-
.../controller/DatabaseConnectController.java | 5 +-
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 2 +-
.../iotdb/db/query/udf/example/Accumulator.java | 22 +-
.../apache/iotdb/db/query/udf/example/Adder.java | 14 +-
.../apache/iotdb/db/query/udf/example/Counter.java | 18 +-
.../org/apache/iotdb/db/query/udf/example/Max.java | 14 +-
.../iotdb/db/query/udf/example/Multiplier.java | 14 +-
.../SlidingSizeWindowConstructorTester0.java | 12 +-
.../SlidingSizeWindowConstructorTester1.java | 14 +-
.../SlidingTimeWindowConstructionTester.java | 16 +-
.../db/query/udf/example/TerminateTester.java | 12 +-
.../iotdb/db/query/udf/example/ValidateTester.java | 10 +-
.../iotdb/db/query/udf/example/WindowStartEnd.java | 14 +-
.../iotdb/db/integration/IoTDBFuzzyQueryIT.java | 4 +-
.../IoTDBSyntaxConventionStringLiteralIT.java | 14 +-
.../iotdb/db/integration/IoTDBUDFManagementIT.java | 2 +-
.../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 2 +-
.../session/IoTDBSessionSyntaxConventionIT.java | 237 +++
library-udf/pom.xml | 24 +-
.../UDTFMinMax.java => anomaly/UDTFIQR.java} | 83 +-
.../apache/iotdb/library/anomaly/UDTFKSigma.java | 153 ++
.../org/apache/iotdb/library/anomaly/UDTFLOF.java | 215 +++
.../iotdb/library/anomaly/UDTFMissDetect.java | 74 +
.../apache/iotdb/library/anomaly/UDTFRange.java | 97 ++
.../UDTFTwoSidedFilter.java} | 68 +-
.../iotdb/library/anomaly/util/MissDetector.java | 240 +++
.../library/anomaly/util/StreamMissDetector.java | 189 +++
.../iotdb/library/anomaly/util/WindowDetect.java | 96 ++
.../org/apache/iotdb/library/dmatch/UDAFCov.java | 14 +-
.../org/apache/iotdb/library/dmatch/UDAFDtw.java | 16 +-
.../apache/iotdb/library/dmatch/UDAFPearson.java | 14 +-
.../apache/iotdb/library/dmatch/UDTFPtnSym.java | 16 +-
.../org/apache/iotdb/library/dmatch/UDTFXCorr.java | 14 +-
.../iotdb/library/dprofile/UDAFIntegral.java | 14 +-
.../iotdb/library/dprofile/UDAFIntegralAvg.java | 14 +-
.../org/apache/iotdb/library/dprofile/UDAFMad.java | 14 +-
.../apache/iotdb/library/dprofile/UDAFMedian.java | 14 +-
.../apache/iotdb/library/dprofile/UDAFMode.java | 14 +-
.../iotdb/library/dprofile/UDAFPercentile.java | 14 +-
.../apache/iotdb/library/dprofile/UDAFPeriod.java | 18 +-
.../apache/iotdb/library/dprofile/UDAFSkew.java | 14 +-
.../apache/iotdb/library/dprofile/UDAFSpread.java | 14 +-
.../apache/iotdb/library/dprofile/UDAFStddev.java | 14 +-
.../org/apache/iotdb/library/dprofile/UDTFACF.java | 14 +-
.../iotdb/library/dprofile/UDTFDistinct.java | 14 +-
.../iotdb/library/dprofile/UDTFHistogram.java | 14 +-
.../apache/iotdb/library/dprofile/UDTFMinMax.java | 14 +-
.../apache/iotdb/library/dprofile/UDTFMvAvg.java | 14 +-
.../apache/iotdb/library/dprofile/UDTFPACF.java | 14 +-
.../org/apache/iotdb/library/dprofile/UDTFQLB.java | 14 +-
.../iotdb/library/dprofile/UDTFResample.java | 14 +-
.../apache/iotdb/library/dprofile/UDTFSample.java | 20 +-
.../apache/iotdb/library/dprofile/UDTFSegment.java | 14 +-
.../apache/iotdb/library/dprofile/UDTFSpline.java | 14 +-
.../apache/iotdb/library/dprofile/UDTFZScore.java | 14 +-
.../dprofile/util/ExactOrderStatistics.java | 4 +-
.../iotdb/library/dquality/UDTFCompleteness.java | 14 +-
.../iotdb/library/dquality/UDTFConsistency.java | 14 +-
.../iotdb/library/dquality/UDTFTimeliness.java | 14 +-
.../iotdb/library/dquality/UDTFValidity.java | 14 +-
.../library/dquality/util/TimeSeriesQuality.java | 4 +-
.../iotdb/library/drepair/UDTFTimestampRepair.java | 14 +-
.../iotdb/library/drepair/UDTFValueFill.java | 14 +-
.../iotdb/library/drepair/UDTFValueRepair.java | 14 +-
.../apache/iotdb/library/drepair/util/ARFill.java | 4 +-
.../iotdb/library/drepair/util/LikelihoodFill.java | 2 +-
.../iotdb/library/drepair/util/LinearFill.java | 2 +-
.../iotdb/library/drepair/util/LsGreedy.java | 2 +-
.../apache/iotdb/library/drepair/util/MAFill.java | 2 +-
.../iotdb/library/drepair/util/MeanFill.java | 2 +-
.../iotdb/library/drepair/util/PreviousFill.java | 2 +-
.../apache/iotdb/library/drepair/util/Screen.java | 2 +-
.../iotdb/library/drepair/util/ScreenFill.java | 4 +-
.../library/drepair/util/TimestampRepair.java | 4 +-
.../iotdb/library/drepair/util/ValueFill.java | 6 +-
.../iotdb/library/drepair/util/ValueRepair.java | 4 +-
.../apache/iotdb/library/frequency/UDTFConv.java | 14 +-
.../apache/iotdb/library/frequency/UDTFDWT.java | 14 +-
.../apache/iotdb/library/frequency/UDTFDeconv.java | 14 +-
.../apache/iotdb/library/frequency/UDTFFFT.java | 14 +-
.../iotdb/library/frequency/UDTFHighPass.java | 14 +-
.../apache/iotdb/library/frequency/UDTFIDWT.java | 14 +-
.../apache/iotdb/library/frequency/UDTFIFFT.java | 14 +-
.../iotdb/library/frequency/UDTFLowPass.java | 14 +-
.../iotdb/library/frequency/util/FFTUtil.java | 2 +-
.../library/series/UDTFConsecutiveSequences.java | 14 +-
.../library/series/UDTFConsecutiveWindows.java | 14 +-
.../iotdb/library/series/util/ConsecutiveUtil.java | 4 +-
.../iotdb/library/string/UDTFRegexMatch.java | 14 +-
.../iotdb/library/string/UDTFRegexReplace.java | 14 +-
.../iotdb/library/string/UDTFRegexSplit.java | 14 +-
.../iotdb/library/string/UDTFStrReplace.java | 14 +-
.../iotdb/library/util/LinearRegression.java | 2 +-
.../java/org/apache/iotdb/library/util/Util.java | 7 +-
.../apache/iotdb/library/anomaly/AnomalyTests.java | 1534 ++++++++++++++++++++
.../org/apache/iotdb/commons/path/PartialPath.java | 7 +
.../org/apache/iotdb/commons}/udf/api/UDF.java | 8 +-
.../org/apache/iotdb/commons}/udf/api/UDTF.java | 20 +-
.../apache/iotdb/commons}/udf/api/access/Row.java | 2 +-
.../iotdb/commons}/udf/api/access/RowIterator.java | 2 +-
.../iotdb/commons}/udf/api/access/RowWindow.java | 6 +-
.../commons}/udf/api/collector/PointCollector.java | 21 +-
.../api/customizer/config/UDFConfigurations.java | 7 +-
.../api/customizer/config/UDTFConfigurations.java | 25 +-
.../parameter/UDFParameterValidator.java | 14 +-
.../api/customizer/parameter/UDFParameters.java | 57 +-
.../api/customizer/strategy/AccessStrategy.java | 13 +-
.../strategy/RowByRowAccessStrategy.java | 12 +-
.../strategy/SlidingSizeWindowAccessStrategy.java | 19 +-
.../strategy/SlidingTimeWindowAccessStrategy.java | 101 +-
.../UDFAttributeNotProvidedException.java | 2 +-
.../commons}/udf/api/exception/UDFException.java | 2 +-
.../UDFInputSeriesDataTypeNotValidException.java | 2 +-
.../UDFInputSeriesIndexNotValidException.java | 2 +-
.../UDFInputSeriesNumberNotValidException.java | 2 +-
.../UDFOutputSeriesDataTypeNotValidException.java | 2 +-
.../exception/UDFParameterNotValidException.java | 2 +-
.../commons}/udf/builtin/BuiltinFunction.java | 2 +-
.../apache/iotdb/commons}/udf/builtin/UDTFAbs.java | 14 +-
.../iotdb/commons}/udf/builtin/UDTFAcos.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFAsin.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFAtan.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFBottomK.java | 27 +-
.../iotdb/commons}/udf/builtin/UDTFCast.java | 42 +-
.../iotdb/commons}/udf/builtin/UDTFCeil.java | 2 +-
.../commons}/udf/builtin/UDTFCommonDerivative.java | 8 +-
.../udf/builtin/UDTFCommonValueDifference.java | 8 +-
.../iotdb/commons}/udf/builtin/UDTFConst.java | 18 +-
.../iotdb/commons}/udf/builtin/UDTFConstE.java | 14 +-
.../iotdb/commons}/udf/builtin/UDTFConstPi.java | 14 +-
.../iotdb/commons}/udf/builtin/UDTFContains.java | 18 +-
.../udf/builtin/UDTFContinuouslySatisfy.java | 20 +-
.../apache/iotdb/commons}/udf/builtin/UDTFCos.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFCosh.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFDegrees.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFDerivative.java | 14 +-
.../udf/builtin/UDTFEqualSizeBucketAggSample.java | 20 +-
.../udf/builtin/UDTFEqualSizeBucketM4Sample.java | 20 +-
.../builtin/UDTFEqualSizeBucketOutlierSample.java | 22 +-
.../builtin/UDTFEqualSizeBucketRandomSample.java | 16 +-
.../udf/builtin/UDTFEqualSizeBucketSample.java | 8 +-
.../apache/iotdb/commons}/udf/builtin/UDTFExp.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFFloor.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFInRange.java | 20 +-
.../iotdb/commons}/udf/builtin/UDTFJexl.java | 49 +-
.../apache/iotdb/commons}/udf/builtin/UDTFLog.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFLog10.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFMatches.java | 20 +-
.../iotdb/commons}/udf/builtin/UDTFMath.java | 20 +-
.../udf/builtin/UDTFNonNegativeDerivative.java | 8 +-
.../builtin/UDTFNonNegativeValueDifference.java | 8 +-
.../commons}/udf/builtin/UDTFNonZeroCount.java | 2 +-
.../commons}/udf/builtin/UDTFNonZeroDuration.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFOnOff.java | 18 +-
.../iotdb/commons}/udf/builtin/UDTFRadians.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFRound.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFSelectK.java | 23 +-
.../iotdb/commons}/udf/builtin/UDTFSign.java | 2 +-
.../apache/iotdb/commons}/udf/builtin/UDTFSin.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFSinh.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFSqrt.java | 2 +-
.../apache/iotdb/commons}/udf/builtin/UDTFTan.java | 2 +-
.../iotdb/commons}/udf/builtin/UDTFTanh.java | 2 +-
.../commons}/udf/builtin/UDTFTimeDifference.java | 16 +-
.../iotdb/commons}/udf/builtin/UDTFTopK.java | 4 +-
.../commons}/udf/builtin/UDTFValueDifference.java | 14 +-
.../iotdb/commons}/udf/builtin/UDTFValueTrend.java | 14 +-
.../iotdb/commons}/udf/builtin/UDTFZeroCount.java | 2 +-
.../commons}/udf/builtin/UDTFZeroDuration.java | 2 +-
.../selectinto/InsertTabletPlansIterator.java | 2 +-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 26 +-
.../iotdb/db/mpp/common/header/DatasetHeader.java | 4 +
.../db/mpp/common/schematree/PathPatternTree.java | 12 +-
.../execution/operator/process/FilterOperator.java | 4 +-
.../operator/process/TransformOperator.java | 16 +-
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 185 ++-
.../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 628 ++++----
.../db/mpp/plan/analyze/ConcatPathRewriter.java | 67 +-
.../db/mpp/plan/analyze/ExpressionAnalyzer.java | 440 +++---
.../iotdb/db/mpp/plan/analyze/ExpressionUtils.java | 50 +-
.../mpp/plan/analyze/GroupByLevelController.java | 6 +-
.../db/mpp/plan/execution/QueryExecution.java | 2 +-
.../mpp/plan/execution/config/ConfigExecution.java | 2 +-
.../{query => mpp/plan}/expression/Expression.java | 60 +-
.../plan}/expression/ExpressionType.java | 2 +-
.../plan}/expression/ResultColumn.java | 2 +-
.../expression/binary/AdditionExpression.java | 12 +-
.../binary/ArithmeticBinaryExpression.java | 4 +-
.../plan}/expression/binary/BinaryExpression.java | 28 +-
.../expression/binary/CompareBinaryExpression.java | 4 +-
.../expression/binary/DivisionExpression.java | 12 +-
.../plan}/expression/binary/EqualToExpression.java | 12 +-
.../expression/binary/GreaterEqualExpression.java | 12 +-
.../expression/binary/GreaterThanExpression.java | 12 +-
.../expression/binary/LessEqualExpression.java | 12 +-
.../expression/binary/LessThanExpression.java | 12 +-
.../expression/binary/LogicAndExpression.java | 12 +-
.../expression/binary/LogicBinaryExpression.java | 4 +-
.../plan}/expression/binary/LogicOrExpression.java | 12 +-
.../plan}/expression/binary/ModuloExpression.java | 12 +-
.../binary/MultiplicationExpression.java | 12 +-
.../expression/binary/NonEqualExpression.java | 12 +-
.../expression/binary/SubtractionExpression.java | 12 +-
.../plan}/expression/leaf/ConstantOperand.java | 20 +-
.../plan}/expression/leaf/LeafOperand.java | 6 +-
.../plan}/expression/leaf/TimeSeriesOperand.java | 24 +-
.../plan}/expression/leaf/TimestampOperand.java | 24 +-
.../plan}/expression/multi/FunctionExpression.java | 76 +-
.../plan}/expression/unary/InExpression.java | 12 +-
.../plan}/expression/unary/LikeExpression.java | 14 +-
.../plan}/expression/unary/LogicNotExpression.java | 20 +-
.../plan}/expression/unary/NegationExpression.java | 20 +-
.../plan}/expression/unary/RegularExpression.java | 12 +-
.../plan}/expression/unary/UnaryExpression.java | 26 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 93 +-
.../db/mpp/plan/parser/StatementGenerator.java | 16 +-
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 12 +-
.../db/mpp/plan/planner/LogicalPlanBuilder.java | 169 ++-
.../iotdb/db/mpp/plan/planner/LogicalPlanner.java | 57 +-
.../mpp/plan/planner/plan/node/PlanNodeType.java | 26 +-
.../db/mpp/plan/planner/plan/node/PlanVisitor.java | 15 +
.../node/metedata/write/DeleteTimeSeriesNode.java | 100 ++
.../metedata/write/InvalidateSchemaCacheNode.java | 127 ++
.../plan/planner/plan/node/process/FilterNode.java | 2 +-
.../planner/plan/node/process/FilterNullNode.java | 2 +-
.../plan/node/process/LastQueryMergeNode.java | 110 ++
.../planner/plan/node/process/TransformNode.java | 2 +-
.../plan/node/source/AlignedLastQueryScanNode.java | 171 +++
.../source/AlignedSeriesAggregationScanNode.java | 6 +-
.../plan/node/source/AlignedSeriesScanNode.java | 13 +-
.../plan/node/source/LastQueryScanNode.java | 173 +++
.../node/source/SeriesAggregationScanNode.java | 6 +-
.../planner/plan/node/source/SeriesScanNode.java | 13 +-
.../planner/plan/node/write/DeleteDataNode.java | 100 ++
.../plan/parameter/AggregationDescriptor.java | 2 +-
.../plan/parameter/FilterNullParameter.java | 2 +-
.../db/mpp/plan/statement/StatementVisitor.java | 5 +
.../statement/component/FilterNullComponent.java | 2 +-
.../mpp/plan/statement/component/ResultColumn.java | 20 +-
.../plan/statement/component/SelectComponent.java | 25 +-
.../plan/statement/component/WhereCondition.java | 2 +-
.../db/mpp/plan/statement/crud/QueryStatement.java | 46 +-
.../metadata/DeleteTimeSeriesStatement.java} | 27 +-
.../transformation/api}/LayerPointReader.java | 2 +-
.../transformation/api}/LayerRowReader.java | 4 +-
.../transformation/api}/LayerRowWindowReader.java | 4 +-
...ializableRowRecordListBackedMultiColumnRow.java | 4 +-
...izableRowRecordListBackedMultiColumnWindow.java | 10 +-
...wRecordListBackedMultiColumnWindowIterator.java | 8 +-
...ticSerializableTVListBackedSingleColumnRow.java | 6 +-
...SerializableTVListBackedSingleColumnWindow.java | 10 +-
...ableTVListBackedSingleColumnWindowIterator.java | 8 +-
.../LayerPointReaderBackedSingleColumnRow.java | 6 +-
.../transformation/dag/builder}/DAGBuilder.java | 15 +-
.../dag/builder}/EvaluationDAGBuilder.java | 15 +-
.../dag/input/ConstantInputReader.java} | 9 +-
.../dag/input/QueryDataSetInputLayer.java} | 21 +-
.../dag/input}/TsBlockInputDataSet.java | 2 +-
.../intermediate}/ConstantIntermediateLayer.java | 18 +-
.../dag/intermediate}/IntermediateLayer.java | 16 +-
.../MultiInputColumnIntermediateLayer.java | 26 +-
...InputColumnMultiReferenceIntermediateLayer.java | 31 +-
...nputColumnSingleReferenceIntermediateLayer.java | 28 +-
.../dag/memory}/LayerMemoryAssigner.java | 6 +-
.../transformation/dag/memory}/SafetyLine.java | 4 +-
.../dag}/transformer/Transformer.java | 4 +-
.../binary/ArithmeticAdditionTransformer.java | 4 +-
.../binary/ArithmeticBinaryTransformer.java | 4 +-
.../binary/ArithmeticDivisionTransformer.java | 4 +-
.../binary/ArithmeticModuloTransformer.java | 4 +-
.../ArithmeticMultiplicationTransformer.java | 4 +-
.../binary/ArithmeticSubtractionTransformer.java | 4 +-
.../dag}/transformer/binary/BinaryTransformer.java | 6 +-
.../binary/CompareBinaryTransformer.java | 4 +-
.../binary/CompareEqualToTransformer.java | 4 +-
.../binary/CompareGreaterEqualTransformer.java | 4 +-
.../binary/CompareGreaterThanTransformer.java | 4 +-
.../binary/CompareLessEqualTransformer.java | 4 +-
.../binary/CompareLessThanTransformer.java | 4 +-
.../binary/CompareNonEqualTransformer.java | 4 +-
.../transformer/binary/LogicAndTransformer.java | 5 +-
.../transformer/binary/LogicBinaryTransformer.java | 4 +-
.../transformer/binary/LogicOrTransformer.java | 4 +-
.../transformer/multi/UDFQueryRowTransformer.java | 6 +-
.../multi/UDFQueryRowWindowTransformer.java | 6 +-
.../transformer/multi/UDFQueryTransformer.java | 8 +-
.../unary/ArithmeticNegationTransformer.java | 4 +-
.../dag}/transformer/unary/InTransformer.java | 4 +-
.../transformer/unary/LogicNotTransformer.java | 4 +-
.../dag}/transformer/unary/RegularTransformer.java | 4 +-
.../transformer/unary/TransparentTransformer.java | 4 +-
.../dag}/transformer/unary/UnaryTransformer.java | 6 +-
.../transformation/dag/udf}/UDTFContext.java | 8 +-
.../transformation/dag/udf}/UDTFExecutor.java | 82 +-
.../transformation/dag/udf}/UDTFTypeInferrer.java | 33 +-
.../transformation/dag/util}/InputRowUtils.java | 2 +-
.../transformation/dag/util}/LayerCacheUtils.java | 8 +-
.../transformation}/datastructure/Cache.java | 2 +-
.../datastructure/SerializableList.java | 4 +-
.../row/ElasticSerializableRowRecordList.java | 19 +-
.../row/SerializableRowRecordList.java | 4 +-
.../tv/ElasticSerializableBinaryTVList.java | 28 +-
.../tv/ElasticSerializableTVList.java | 27 +-
.../datastructure/tv/SerializableBinaryTVList.java | 2 +-
.../tv/SerializableBooleanTVList.java | 2 +-
.../datastructure/tv/SerializableDoubleTVList.java | 2 +-
.../datastructure/tv/SerializableFloatTVList.java | 2 +-
.../datastructure/tv/SerializableIntTVList.java | 2 +-
.../datastructure/tv/SerializableLongTVList.java | 2 +-
.../datastructure/tv/SerializableTVList.java | 10 +-
.../protocol/influxdb/function/InfluxFunction.java | 4 +-
.../influxdb/function/InfluxFunctionFactory.java | 2 +-
.../function/aggregator/InfluxAggregator.java | 2 +-
.../function/aggregator/InfluxCountFunction.java | 2 +-
.../function/aggregator/InfluxMeanFunction.java | 2 +-
.../function/aggregator/InfluxMedianFunction.java | 2 +-
.../function/aggregator/InfluxModeFunction.java | 2 +-
.../function/aggregator/InfluxSpreadFunction.java | 2 +-
.../function/aggregator/InfluxStddevFunction.java | 2 +-
.../function/aggregator/InfluxSumFunction.java | 2 +-
.../function/selector/InfluxFirstFunction.java | 2 +-
.../function/selector/InfluxLastFunction.java | 2 +-
.../function/selector/InfluxMaxFunction.java | 2 +-
.../function/selector/InfluxMinFunction.java | 2 +-
.../influxdb/function/selector/InfluxSelector.java | 2 +-
.../db/protocol/influxdb/handler/QueryHandler.java | 8 +-
.../influxdb/operator/InfluxSelectComponent.java | 8 +-
.../protocol/influxdb/sql/InfluxDBSqlVisitor.java | 20 +-
.../protocol/rest/handler/QueryDataSetHandler.java | 2 +-
.../iotdb/db/qp/constant/FilterConstant.java | 2 +-
.../qp/logical/crud/AggregationQueryOperator.java | 8 +-
.../db/qp/logical/crud/LastQueryOperator.java | 6 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 8 +-
.../iotdb/db/qp/logical/crud/SelectComponent.java | 8 +-
.../db/qp/logical/crud/SpecialClauseComponent.java | 2 +-
.../db/qp/logical/crud/UDAFQueryOperator.java | 8 +-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 2 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 2 +-
.../iotdb/db/qp/physical/crud/LastQueryPlan.java | 2 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 2 +-
.../db/qp/physical/crud/RawDataQueryPlan.java | 2 +-
.../apache/iotdb/db/qp/physical/crud/UDAFPlan.java | 2 +-
.../apache/iotdb/db/qp/physical/crud/UDFPlan.java | 2 +-
.../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 6 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 79 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 4 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 6 +-
.../apache/iotdb/db/qp/utils/DatetimeUtils.java | 12 +-
.../iotdb/db/qp/utils/GroupByLevelController.java | 6 +-
.../apache/iotdb/db/qp/utils/WildcardsRemover.java | 4 +-
.../db/query/control/QueryResourceManager.java | 4 +-
.../db/query/dataset/UDTFAlignByTimeDataSet.java | 6 +-
.../apache/iotdb/db/query/dataset/UDTFDataSet.java | 21 +-
.../db/query/dataset/UDTFNonAlignDataSet.java | 4 +-
.../query/dataset/groupby/GroupByFillDataSet.java | 2 +-
.../query/udf/service/UDFClassLoaderManager.java | 3 +-
.../udf/service/UDFRegistrationInformation.java | 2 +-
.../query/udf/service/UDFRegistrationService.java | 14 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 1 -
.../java/org/apache/iotdb/db/service/IoTDB.java | 1 -
.../service/TemporaryQueryDataFileService.java | 4 +-
.../thrift/impl/DataNodeTSIServiceImpl.java | 63 +
.../db/service/thrift/impl/TSServiceImpl.java | 82 +-
.../db/sync/sender/service/TransportHandler.java | 33 +-
.../db/tools/watermark/WatermarkDetector.java | 9 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeFailTest.java | 18 +
.../mpp/plan/plan/FragmentInstanceSerdeTest.java | 9 -
.../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java | 1 +
.../db/mpp/plan/plan/QueryLogicalPlanUtil.java | 360 ++---
.../write/DeleteTimeSeriesNodeSerdeTest.java | 61 +
.../node/process/AggregationNodeSerdeTest.java | 8 +-
.../plan/node/process/FilterNodeSerdeTest.java | 8 +-
.../plan/node/process/FilterNullNodeSerdeTest.java | 2 +-
.../node/process/GroupByLevelNodeSerdeTest.java | 12 +-
.../plan/plan/node/process/LimitNodeSerdeTest.java | 7 +-
.../plan/node/process/OffsetNodeSerdeTest.java | 7 +-
.../plan/plan/node/process/SortNodeSerdeTest.java | 7 +-
.../plan/node/process/TimeJoinNodeSerdeTest.java | 10 +-
.../source/SeriesAggregationScanNodeSerdeTest.java | 8 +-
.../plan/node/source/SeriesScanNodeSerdeTest.java | 7 +-
.../plan/node/write/DeleteDataNodeSerdeTest.java | 61 +
.../write/InvalidateSchemaCacheNodeSerdeTest.java | 76 +
.../influxdb/sql/InfluxDBLogicalGeneratorTest.java | 4 +-
.../ElasticSerializableRowRecordListTest.java | 3 +-
.../ElasticSerializableTVListTest.java | 17 +-
.../iotdb/db/query/udf/datastructure/LRUCache.java | 2 +
.../SerializableBinaryTVListTest.java | 4 +-
.../SerializableBooleanTVListTest.java | 4 +-
.../SerializableDoubleTVListTest.java | 4 +-
.../datastructure/SerializableFloatTVListTest.java | 4 +-
.../datastructure/SerializableIntTVListTest.java | 4 +-
.../udf/datastructure/SerializableListTest.java | 2 +-
.../datastructure/SerializableLongTVListTest.java | 4 +-
.../SerializableRowRecordListTest.java | 2 +-
.../apache/iotdb/db/query/udf/example/Adder.java | 14 +-
.../.vuepress/theme/global-components/IoTDB.vue | 72 +-
422 files changed, 7302 insertions(+), 3496 deletions(-)
[iotdb] 02/02: Fix timeIterator bug
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch timeIteratorBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 795c6f57bc696f818559da99e2743268a5dffe1d
Author: Alima777 <wx...@gmail.com>
AuthorDate: Mon May 23 15:57:29 2022 +0800
Fix timeIterator bug
---
data | 1 +
.../aggregation/timerangeiterator/AggrWindowIterator.java | 9 ++++++++-
.../aggregation/timerangeiterator/PreAggrWindowIterator.java | 9 ++++++++-
.../PreAggrWindowWithNaturalMonthIterator.java | 9 ++++++++-
.../timerangeiterator/SingleTimeWindowIterator.java | 12 ++++++++----
5 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/data b/data
new file mode 120000
index 0000000000..dc6adc3d96
--- /dev/null
+++ b/data
@@ -0,0 +1 @@
+/Users/alima/Downloads/apache-iotdb-0.13.0-all-bin/data
\ No newline at end of file
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/AggrWindowIterator.java b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/AggrWindowIterator.java
index d53678bad2..f27c56223c 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/AggrWindowIterator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/AggrWindowIterator.java
@@ -43,6 +43,7 @@ public class AggrWindowIterator implements ITimeRangeIterator {
private final boolean leftCRightO;
private TimeRange curTimeRange;
+ private boolean hasCachedTimeRange;
public AggrWindowIterator(
long startTime,
@@ -114,8 +115,12 @@ public class AggrWindowIterator implements ITimeRangeIterator {
@Override
public boolean hasNextTimeRange() {
+ if (hasCachedTimeRange) {
+ return true;
+ }
if (curTimeRange == null) {
curTimeRange = getFirstTimeRange();
+ hasCachedTimeRange = true;
return true;
}
@@ -149,12 +154,14 @@ public class AggrWindowIterator implements ITimeRangeIterator {
}
retEndTime = Math.min(retEndTime, endTime);
curTimeRange = new TimeRange(retStartTime, retEndTime);
+ hasCachedTimeRange = true;
return true;
}
@Override
public TimeRange nextTimeRange() {
- if (curTimeRange != null || hasNextTimeRange()) {
+ if (hasCachedTimeRange || hasNextTimeRange()) {
+ hasCachedTimeRange = false;
return getFinalTimeRange(curTimeRange, leftCRightO);
}
return null;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowIterator.java b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowIterator.java
index ab018e3cb7..f7f6297ddb 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowIterator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowIterator.java
@@ -43,6 +43,7 @@ public class PreAggrWindowIterator implements ITimeRangeIterator {
private int intervalCnt = 0;
private TimeRange curTimeRange;
+ private boolean hasCachedTimeRange;
public PreAggrWindowIterator(
long startTime,
@@ -91,8 +92,12 @@ public class PreAggrWindowIterator implements ITimeRangeIterator {
@Override
public boolean hasNextTimeRange() {
+ if (hasCachedTimeRange) {
+ return true;
+ }
if (curTimeRange == null) {
curTimeRange = getFirstTimeRange();
+ hasCachedTimeRange = true;
return true;
}
@@ -113,12 +118,14 @@ public class PreAggrWindowIterator implements ITimeRangeIterator {
retEndTime = Math.min(retStartTime + curInterval, endTime);
updateIntervalAndStep();
curTimeRange = new TimeRange(retStartTime, retEndTime);
+ hasCachedTimeRange = true;
return true;
}
@Override
public TimeRange nextTimeRange() {
- if (curTimeRange != null || hasNextTimeRange()) {
+ if (hasCachedTimeRange || hasNextTimeRange()) {
+ hasCachedTimeRange = false;
return getFinalTimeRange(curTimeRange, leftCRightO);
}
return null;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowWithNaturalMonthIterator.java b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowWithNaturalMonthIterator.java
index 0a0d630811..d8eede01ef 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowWithNaturalMonthIterator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/PreAggrWindowWithNaturalMonthIterator.java
@@ -35,6 +35,7 @@ public class PreAggrWindowWithNaturalMonthIterator implements ITimeRangeIterator
private long lastEndTime;
private TimeRange curTimeRange;
+ private boolean hasCachedTimeRange;
public PreAggrWindowWithNaturalMonthIterator(
long startTime,
@@ -70,8 +71,12 @@ public class PreAggrWindowWithNaturalMonthIterator implements ITimeRangeIterator
@Override
public boolean hasNextTimeRange() {
+ if (hasCachedTimeRange) {
+ return true;
+ }
if (curTimeRange == null) {
curTimeRange = getFirstTimeRange();
+ hasCachedTimeRange = true;
return true;
}
@@ -90,12 +95,14 @@ public class PreAggrWindowWithNaturalMonthIterator implements ITimeRangeIterator
}
lastEndTime = timeBoundaryHeap.first();
curTimeRange = new TimeRange(retStartTime, lastEndTime);
+ hasCachedTimeRange = true;
return true;
}
@Override
public TimeRange nextTimeRange() {
- if (curTimeRange != null || hasNextTimeRange()) {
+ if (hasCachedTimeRange || hasNextTimeRange()) {
+ hasCachedTimeRange = false;
return getFinalTimeRange(curTimeRange, leftCRightO);
}
return null;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/SingleTimeWindowIterator.java b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/SingleTimeWindowIterator.java
index 2145b51f45..b998557604 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/SingleTimeWindowIterator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/timerangeiterator/SingleTimeWindowIterator.java
@@ -29,6 +29,7 @@ public class SingleTimeWindowIterator implements ITimeRangeIterator {
private final long endTime;
private TimeRange curTimeRange;
+ private boolean hasCachedTimeRange;
public SingleTimeWindowIterator(long startTime, long endTime) {
this.startTime = startTime;
@@ -42,17 +43,20 @@ public class SingleTimeWindowIterator implements ITimeRangeIterator {
@Override
public boolean hasNextTimeRange() {
+ if (hasCachedTimeRange) {
+ return true;
+ }
if (curTimeRange == null) {
curTimeRange = getFirstTimeRange();
- return true;
- } else {
- return false;
+ hasCachedTimeRange = true;
}
+ return hasCachedTimeRange;
}
@Override
public TimeRange nextTimeRange() {
- if (curTimeRange != null || hasNextTimeRange()) {
+ if (hasCachedTimeRange || hasNextTimeRange()) {
+ hasCachedTimeRange = false;
return curTimeRange;
}
return null;