This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_new
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 30cbbd3 Merge pull request #1339 from neuyilan/cluster_new_IOTDB-723
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)
add 297ab12 Merge branch 'master' into cluster_premerge2
add c345c23 fix some error in documents (#1342)
add 3bad01d Lazy Contruct AliasMap in InternalMNode (#1343)
add 91d5222 Merge branch 'master' into cluster_premerge2
add aa27f32 Merge branch 'cluster_premerge2' into cluster_new
No new revisions were added by this update.
Summary of changes:
README.md | 2 +-
README_ZH.md | 2 +-
docs/Development/VoteRelease.md | 2 +-
.../Ecosystem Integration/Spark TsFile.md | 2 +-
docs/UserGuide/Server/Config Manual.md | 55 ++++++
docs/UserGuide/Server/Docker Image.md | 8 +-
docs/zh/Development/VoteRelease.md | 2 +-
docs/zh/UserGuide/Client/Programming - JDBC.md | 2 +-
.../Ecosystem Integration/Spark TsFile.md | 2 +-
docs/zh/UserGuide/Server/Config Manual.md | 58 ++++++
docs/zh/UserGuide/Server/Docker Image.md | 8 +-
docs/zh/UserGuide/System Tools/Sync Tool.md | 2 +-
.../resources/conf/iotdb-engine.properties | 7 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 4 +
.../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 | 66 +++----
.../java/org/apache/iotdb/db/metadata/MTree.java | 109 ++++++-----
.../iotdb/db/metadata/mnode/InternalMNode.java | 25 ++-
.../{LeafMNode.java => MeasurementMNode.java} | 57 +-----
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 14 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 26 ++-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 73 ++++++--
.../db/query/dataset/AlignByDeviceDataSet.java | 11 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 10 +-
.../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 ++
service-rpc/rpc-changelist.md | 4 +-
tsfile/format-changelist.md | 4 +-
39 files changed, 767 insertions(+), 321 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%)
