This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a change to branch xkf_id_table
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 60a08c8 Merge branch 'master' of git://github.com/apache/iotdb into
xkf_id_table
new 61999aa fix normal query
add 9d5f4bc [IOTDB-1969] Remove statistic resources of old metric
framework from iotdb-server (#4551)
add 207b3e4 Fix deploying site fail caused by CI (#4553)
add 76a4fa5 [IOTDB-2129] Wrong result returned when querying by nested
expressions with aliases (#4552)
add 45e4faf [IOTDB-2130] IT fails on
MQTTSinkTest.onEventUsingMultiSensorsHandler (#4554)
add eaeaa52 [IOTDB-1970] Migrate the org.apache.iotdb.db.cost.statistic
module to the new metric framework (#4556)
add 5483abf [IOTDB-2092] Basic support aggregation query with UDF nested
(#4517)
add 9d241c7 [IOTDB-2131] Change the fill syntax (#4550)
add 9d2df64 [IOTDB-1973] Supports aggregate queries, constants, and
arithmetic nested expressions in SELECT clauses (#4453)
new b234a50 Merge branch 'master' of git://github.com/apache/iotdb into
xkf_id_table
new 2b8cfed fix restart
The 3 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:
Jenkinsfile | 42 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 6 +-
.../iotdb/cluster/query/LocalQueryExecutor.java | 8 +-
.../query/last/ClusterLastQueryExecutor.java | 8 +-
.../DML-Data-Manipulation-Language.md | 277 ++++++--
.../DML-Data-Manipulation-Language.md | 276 ++++++--
.../apache/iotdb/db/integration/IoTDBAliasIT.java | 37 +-
.../apache/iotdb/db/integration/IoTDBFillIT.java | 261 +++++++-
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 184 ++++--
.../db/integration/IoTDBGroupByFillMixPathsIT.java | 733 ++++++++++-----------
.../aggregation/IoTDBUDFNestAggregationIT.java | 515 +++++++++++++++
... => IoTDBUserDefinedAggregationFunctionIT.java} | 633 +++++-------------
.../resources/conf/iotdb-engine.properties | 9 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 22 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 15 -
.../db/cost/statistic/ConcurrentCircularArray.java | 67 --
.../iotdb/db/cost/statistic/Measurement.java | 423 ------------
.../iotdb/db/cost/statistic/MeasurementMBean.java | 60 --
.../org/apache/iotdb/db/engine/StorageEngine.java | 1 +
.../engine/storagegroup/StorageGroupProcessor.java | 8 +-
.../db/engine/storagegroup/TsFileProcessor.java | 8 +-
.../service/TriggerRegistrationService.java | 13 +-
.../org/apache/iotdb/db/metadata/MManager.java | 21 +-
.../id_table/AppendOnlyDiskSchemaManager.java | 27 +
.../iotdb/db/metadata/id_table/IDManager.java | 73 --
.../iotdb/db/metadata/id_table/IDManagerImpl.java | 85 ---
.../apache/iotdb/db/metadata/id_table/IDTable.java | 350 ++--------
.../{IDTable.java => IDTableHashmapImpl.java} | 9 +-
.../iotdb/db/metadata/id_table/IDTableManager.java | 99 +++
.../metadata/id_table/entry/DeviceIDFactory.java | 11 +-
.../db/metadata/id_table/entry/SHA256DeviceID.java | 30 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 21 +
.../qp/logical/crud/AggregationQueryOperator.java | 38 +-
.../db/qp/logical/crud/FillClauseComponent.java | 9 +
.../db/qp/logical/crud/FillQueryOperator.java | 4 +-
.../logical/crud/GroupByFillClauseComponent.java | 9 +
.../qp/logical/crud/GroupByFillQueryOperator.java | 2 +
.../iotdb/db/qp/logical/crud/QueryOperator.java | 31 +-
.../iotdb/db/qp/logical/crud/SelectComponent.java | 29 +-
.../db/qp/logical/crud/UDAFQueryOperator.java | 179 +++++
...DFQueryOperator.java => UDTFQueryOperator.java} | 6 +-
.../iotdb/db/qp/physical/crud/FillQueryPlan.java | 9 +
.../db/qp/physical/crud/GroupByTimeFillPlan.java | 9 +
.../iotdb/db/qp/physical/crud/InsertPlan.java | 12 +
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 4 +-
.../physical/crud/InsertRowsOfOneDevicePlan.java | 4 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 4 +-
.../apache/iotdb/db/qp/physical/crud/UDAFPlan.java | 68 ++
.../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 17 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 143 +++-
.../iotdb/db/qp/utils/GroupByLevelController.java | 83 ++-
...{UDFInputDataSet.java => IUDFInputDataSet.java} | 10 +-
.../dataset/RawQueryDataSetWithValueFilter.java | 2 +-
.../iotdb/db/query/dataset/UDFInputDataSet.java | 42 +-
.../UDFRawQueryInputDataSetWithoutValueFilter.java | 2 +-
.../db/query/dataset/UDTFAlignByTimeDataSet.java | 184 +++---
.../apache/iotdb/db/query/dataset/UDTFDataSet.java | 8 +
.../db/query/dataset/UDTFNonAlignDataSet.java | 2 +-
.../dataset/groupby/GroupByFillEngineDataSet.java | 22 +-
.../groupby/GroupByFillWithValueFilterDataSet.java | 23 +-
.../GroupByFillWithoutValueFilterDataSet.java | 24 +-
.../iotdb/db/query/executor/FillQueryExecutor.java | 20 +-
.../iotdb/db/query/executor/IQueryRouter.java | 6 +
.../iotdb/db/query/executor/LastQueryExecutor.java | 11 +-
.../iotdb/db/query/executor/QueryRouter.java | 35 +-
.../db/query/executor/RawDataQueryExecutor.java | 7 +
...DTFQueryExecutor.java => UDFQueryExecutor.java} | 16 +-
.../db/query/executor/fill/LastPointReader.java | 3 +-
.../iotdb/db/query/executor/fill/ValueFill.java | 44 +-
.../iotdb/db/query/expression/Expression.java | 48 +-
.../iotdb/db/query/expression/ResultColumn.java | 17 +
.../query/expression/binary/BinaryExpression.java | 24 +-
.../db/query/expression/unary/ConstantOperand.java | 6 +
.../query/expression/unary/FunctionExpression.java | 69 +-
.../query/expression/unary/NegationExpression.java | 14 +-
.../query/expression/unary/TimeSeriesOperand.java | 8 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 5 +-
.../db/query/udf/core/executor/UDTFExecutor.java | 13 +-
.../db/query/udf/core/layer/InputRowUtils.java | 25 +-
.../db/query/udf/core/layer/LayerCacheUtils.java | 53 +-
.../layer/MultiInputColumnIntermediateLayer.java | 65 +-
.../query/udf/core/layer/RawQueryInputLayer.java | 25 +-
...InputColumnMultiReferenceIntermediateLayer.java | 10 +
...nputColumnSingleReferenceIntermediateLayer.java | 11 +-
.../udf/core/reader/ConstantLayerPointReader.java | 5 +
.../db/query/udf/core/reader/LayerPointReader.java | 2 +
.../db/query/udf/core/reader/LayerRowReader.java | 3 +
.../transformer/ArithmeticBinaryTransformer.java | 12 +-
.../transformer/ArithmeticNegationTransformer.java | 36 +-
.../db/query/udf/core/transformer/Transformer.java | 10 +-
.../core/transformer/TransparentTransformer.java | 93 +++
.../core/transformer/UDFQueryRowTransformer.java | 5 +-
.../udf/core/transformer/UDFQueryTransformer.java | 14 +-
.../row/ElasticSerializableRowRecordList.java | 30 +-
.../row/SerializableRowRecordList.java | 3 +-
.../tv/ElasticSerializableBinaryTVList.java | 8 +-
.../tv/ElasticSerializableTVList.java | 47 ++
.../datastructure/tv/SerializableBinaryTVList.java | 5 +-
.../tv/SerializableBooleanTVList.java | 5 +-
.../datastructure/tv/SerializableDoubleTVList.java | 5 +-
.../datastructure/tv/SerializableFloatTVList.java | 5 +-
.../datastructure/tv/SerializableIntTVList.java | 3 +-
.../datastructure/tv/SerializableLongTVList.java | 5 +-
.../java/org/apache/iotdb/db/rest/RestService.java | 26 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 -
.../statistic => service/metrics}/Operation.java | 2 +-
.../db/service/thrift/impl/TSServiceImpl.java | 125 +++-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 5 +
.../src/main/resources/iotdb/ui/static/index.html | 79 ---
.../main/resources/iotdb/ui/static/iotdb-logo.png | Bin 1187 -> 0 bytes
.../src/main/resources/iotdb/ui/static/webui.css | 194 ------
.../db/cost/statistic/PerformanceStatTest.java | 105 ---
...est.java => IDTableHashmapImplLogFileTest.java} | 6 +-
... => IDTableHashmapImplResourceControlTest.java} | 7 +-
...est.java => IDTableHashmapImplRestartTest.java} | 158 ++---
...DTableTest.java => IDTableHashmapImplTest.java} | 33 +-
....java => InsertWithIDTableHashmapImplTest.java} | 12 +-
.../id_table/LastQueryWithIDTableHashmapImpl.java | 162 +++++
...t.java => QueryWithIDTableHashmapImplTest.java} | 63 +-
.../ElasticSerializableRowRecordListTest.java | 127 +++-
.../ElasticSerializableTVListTest.java | 175 +++--
.../org/apache/iotdb/db/sink/MQTTSinkTest.java | 18 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 3 +-
123 files changed, 4317 insertions(+), 3127 deletions(-)
create mode 100644
integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUDFNestAggregationIT.java
copy
integration/src/test/java/org/apache/iotdb/db/integration/aggregation/{IoTDBAggregationIT.java
=> IoTDBUserDefinedAggregationFunctionIT.java} (50%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/cost/statistic/ConcurrentCircularArray.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/cost/statistic/Measurement.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/cost/statistic/MeasurementMBean.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/id_table/IDManager.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/id_table/IDManagerImpl.java
copy server/src/main/java/org/apache/iotdb/db/metadata/id_table/{IDTable.java
=> IDTableHashmapImpl.java} (98%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/id_table/IDTableManager.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/qp/logical/crud/UDAFQueryOperator.java
rename
server/src/main/java/org/apache/iotdb/db/qp/logical/crud/{UDFQueryOperator.java
=> UDTFQueryOperator.java} (91%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDAFPlan.java
copy
server/src/main/java/org/apache/iotdb/db/query/dataset/{UDFInputDataSet.java =>
IUDFInputDataSet.java} (77%)
rename
server/src/main/java/org/apache/iotdb/db/query/executor/{UDTFQueryExecutor.java
=> UDFQueryExecutor.java} (86%)
copy
influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/protocol/util/ParameterUtils.java
=>
server/src/main/java/org/apache/iotdb/db/query/udf/core/layer/InputRowUtils.java
(57%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/TransparentTransformer.java
rename server/src/main/java/org/apache/iotdb/db/{cost/statistic =>
service/metrics}/Operation.java (96%)
delete mode 100644 server/src/main/resources/iotdb/ui/static/index.html
delete mode 100644 server/src/main/resources/iotdb/ui/static/iotdb-logo.png
delete mode 100644 server/src/main/resources/iotdb/ui/static/webui.css
delete mode 100644
server/src/test/java/org/apache/iotdb/db/cost/statistic/PerformanceStatTest.java
rename
server/src/test/java/org/apache/iotdb/db/metadata/id_table/{IDTableLogFileTest.java
=> IDTableHashmapImplLogFileTest.java} (96%)
copy
server/src/test/java/org/apache/iotdb/db/metadata/id_table/{IDTableResourceControlTest.java
=> IDTableHashmapImplResourceControlTest.java} (96%)
rename
server/src/test/java/org/apache/iotdb/db/metadata/id_table/{IDTableResourceControlTest.java
=> IDTableHashmapImplRestartTest.java} (50%)
rename
server/src/test/java/org/apache/iotdb/db/metadata/id_table/{IDTableTest.java =>
IDTableHashmapImplTest.java} (95%)
rename
server/src/test/java/org/apache/iotdb/db/metadata/id_table/{InsertWithIDTableTest.java
=> InsertWithIDTableHashmapImplTest.java} (99%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/metadata/id_table/LastQueryWithIDTableHashmapImpl.java
rename
server/src/test/java/org/apache/iotdb/db/metadata/id_table/{QueryWithIDTableTest.java
=> QueryWithIDTableHashmapImplTest.java} (85%)
