This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch enhance_merge_management
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 75c7486 clear task map when stopped
add 5cb248b IOTDB-734 Add Support for NaN in Double / Floats in SQL
Syntax. (#1305)
add 6a927f4 IOTDB-750 Allow SubDevices in IoTDB.
add a7ac8c1 [IOTDB-755] Fix count bug (#1335)
new ecfe945 Merge branch 'master' into enhance_merge_management
The 1 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:
docs/UserGuide/Server/Config Manual.md | 55 ++++++
docs/zh/UserGuide/Server/Config Manual.md | 58 ++++++
.../resources/conf/iotdb-engine.properties | 3 +
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 3 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 18 ++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +
.../iotdb/db/engine/merge/task/MergeTask.java | 4 +-
.../engine/storagegroup/StorageGroupProcessor.java | 6 +-
.../org/apache/iotdb/db/metadata/MManager.java | 60 +++---
.../java/org/apache/iotdb/db/metadata/MTree.java | 109 ++++++-----
.../iotdb/db/metadata/mnode/InternalMNode.java | 2 +-
.../{LeafMNode.java => MeasurementMNode.java} | 57 +-----
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 14 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 24 ++-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 71 +++++--
.../db/query/dataset/AlignByDeviceDataSet.java | 11 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 6 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +-
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 6 +-
.../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 203 +++++++++++++++++++++
.../IoTDBAggregationAlignByDeviceIT.java | 113 ++++++++++++
...FloatPrecisionIT.java => IoTDBInsertNaNIT.java} | 59 ++----
.../apache/iotdb/db/integration/IoTDBLastIT.java | 12 +-
.../iotdb/db/metadata/MManagerAdvancedTest.java | 14 +-
.../iotdb/db/metadata/MManagerImproveTest.java | 4 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 77 ++++----
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 13 ++
27 files changed, 723 insertions(+), 283 deletions(-)
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{LeafMNode.java
=> MeasurementMNode.java} (72%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAddSubDeviceIT.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationAlignByDeviceIT.java
copy
server/src/test/java/org/apache/iotdb/db/integration/{IoTDBFloatPrecisionIT.java
=> IoTDBInsertNaNIT.java} (77%)
