You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/06/10 08:26:02 UTC
[incubator-iotdb] branch dev_new_merge updated (b306363 -> a966d20)
This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a change to branch dev_new_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from b306363 finish new merge V1
add 37380fd add nohup start server doc
add fccbadd [IOTDB-718]Fix wrong time precision of NOW() (#1290)
add 6a3e40a continue write (#1297)
add b2652d9 [IOTDB-729] shutdown uncessary threadpool (#1295)
add 4350fd9 Revert "remove echo in cli (#1287)" (#1304)
add 248ce94 change 10w to 100k (#1301)
add 7e88043 [IOTDB-615]fix session.insertTablets api and add test methods (#1302)
add aa37f59 [IOTDB-733] Enable setting for mqtt max length (#1300)
add 42ef51c [IOTDB-731] Continue write inside InsertPlan (#1298)
add ae723b7 [IOTDB-732] Upgrade fastjson version to 1.2.70 (#1299)
add 6378243 [IOTDB-735] Fix Concurrent error for MNode when creating time series automatically (#1306)
add 392b64e [IOTDB-738] Fix measurements has blank (#1308)
add a24bc19 add measurement with blank insert in session test
add fb9ef99 remove synchronized and trim (#1309)
add 8f3edd7 [IOTDB-672] Fix delete storage group bug during restart (#1310)
add ee35cfc use lock instead while (#1313)
add b1d422a [IOTDB-695] Accelerate the count timeseries query (#1311)
add b54923e Update Last query design documentation (#1312)
add ddd724e add printing one resource file (#1316)
add 6c188f8 Allow count timeseries group by level=x using default path (#1317)
add 4407466 [IOTDB-744] Support upsert alias (#1315)
add 9d5fc6a [IOTDB-745] fix partial write and sync close bug (#1318)
add 1e3c65b [To rel/0.10] add config description (#1320)
add 27c2ce0 [IOTDB-622] add count records for all databases
add 2e5d682 [IOTDB-622] split group by level to two parts
add 4f98a51 fix enable_parameter_adapter comment
add 1079e2e0 Premerge for the distributed version (#1169)
add 92f014f [IOTDB-753] Add a judgement before removing entry from tag inverted index (#1328)
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 a966d20 merge master
No new revisions were added by this update.
Summary of changes:
LICENSE-binary | 2 +-
README.md | 4 +-
README_ZH.md | 4 +-
cli/src/main/java/org/apache/iotdb/cli/Cli.java | 17 +-
docs/Development/VoteRelease.md | 2 +-
docs/SystemDesign/DataQuery/AggregationQuery.md | 22 +
docs/SystemDesign/DataQuery/AlignByDeviceQuery.md | 4 +-
docs/SystemDesign/DataQuery/GroupByQuery.md | 25 +-
docs/SystemDesign/DataQuery/LastQuery.md | 67 +--
docs/SystemDesign/SchemaManager/SchemaManager.md | 22 +-
docs/UserGuide/Client/Programming - MQTT.md | 1 +
docs/UserGuide/Get Started/QuickStart.md | 4 +-
.../DDL Data Definition Language.md | 6 +-
.../DML Data Manipulation Language.md | 82 ++++
docs/UserGuide/Operation Manual/SQL Reference.md | 5 +-
docs/UserGuide/Server/Config Manual.md | 66 ++-
docs/UserGuide/Server/Single Node Setup.md | 4 +-
.../System Tools/Memory Estimation Tool.md | 8 +-
docs/zh/Development/VoteRelease.md | 2 +-
docs/zh/SystemDesign/DataQuery/AggregationQuery.md | 20 +
.../SystemDesign/DataQuery/AlignByDeviceQuery.md | 4 +-
docs/zh/SystemDesign/DataQuery/GroupByQuery.md | 24 +-
docs/zh/SystemDesign/DataQuery/LastQuery.md | 66 +--
.../zh/SystemDesign/SchemaManager/SchemaManager.md | 17 +-
docs/zh/UserGuide/Client/Programming - MQTT.md | 2 +-
docs/zh/UserGuide/Get Started/QuickStart.md | 4 +-
.../DDL Data Definition Language.md | 6 +-
.../DML Data Manipulation Language.md | 85 +++-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 5 +-
docs/zh/UserGuide/Server/Config Manual.md | 69 ++-
docs/zh/UserGuide/Server/Single Node Setup.md | 4 +-
.../iotdb/flink/tsfile/RowRowRecordParser.java | 2 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 7 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 9 +-
pom.xml | 2 +-
server/pom.xml | 10 +
.../resources/conf/iotdb-engine.properties | 28 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 36 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 2 +-
.../iotdb/db/auth/authorizer/BasicAuthorizer.java | 73 ++-
.../iotdb/db/auth/authorizer/IAuthorizer.java | 186 ++++----
.../apache/iotdb/db/auth/entity/PathPrivilege.java | 26 +-
.../java/org/apache/iotdb/db/auth/entity/Role.java | 35 +-
.../java/org/apache/iotdb/db/auth/entity/User.java | 51 ++-
.../iotdb/db/auth/role/BasicRoleManager.java | 18 +
.../apache/iotdb/db/auth/role/IRoleManager.java | 30 +-
.../iotdb/db/auth/user/BasicUserManager.java | 20 +
.../apache/iotdb/db/auth/user/IUserManager.java | 96 ++--
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 71 ++-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 47 +-
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 83 +++-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 9 +-
.../merge/seqMerge/inplace/task/MergeFileTask.java | 8 +-
.../db/engine/modification/ModificationFile.java | 40 +-
.../engine/storagegroup/StorageGroupProcessor.java | 223 ++++++---
.../iotdb/db/engine/storagegroup/TsFileLock.java | 111 +++++
.../db/engine/storagegroup/TsFileProcessor.java | 4 +-
.../db/engine/storagegroup/TsFileResource.java | 112 ++++-
.../iotdb/db/engine/upgrade/UpgradeTask.java | 8 +-
.../version/SimpleFileVersionController.java | 1 -
.../iotdb/db/engine/version/VersionController.java | 1 +
.../org/apache/iotdb/db/metadata/MLogWriter.java | 6 +
.../org/apache/iotdb/db/metadata/MManager.java | 438 +++++++++++++-----
.../java/org/apache/iotdb/db/metadata/MTree.java | 263 +++++++----
.../org/apache/iotdb/db/metadata/MetaUtils.java | 2 +-
.../iotdb/db/metadata/MetadataOperationType.java | 1 +
.../iotdb/db/metadata/mnode/InternalMNode.java | 4 +-
.../{LeafMNode.java => MeasurementMNode.java} | 51 +--
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 4 +-
.../org/apache/iotdb/db/mqtt/PublishHandler.java | 6 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 +
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 3 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 273 ++++++-----
.../org/apache/iotdb/db/qp/logical/Operator.java | 2 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 27 +-
.../db/qp/logical/sys/AlterTimeSeriesOperator.java | 9 +
.../qp/logical/sys/LoadConfigurationOperator.java | 13 +-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 127 +++++-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 10 +
.../db/qp/physical/crud/AlignByDevicePlan.java | 36 +-
.../iotdb/db/qp/physical/crud/DeletePlan.java | 21 +-
...oupByFillPlan.java => GroupByTimeFillPlan.java} | 4 +-
.../{GroupByPlan.java => GroupByTimePlan.java} | 7 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 98 +++-
.../db/qp/physical/crud/InsertTabletPlan.java | 6 +-
.../db/qp/physical/sys/AlterTimeSeriesPlan.java | 14 +-
.../iotdb/db/qp/physical/sys/AuthorPlan.java | 189 +++++++-
.../db/qp/physical/sys/CreateTimeSeriesPlan.java | 8 +-
.../iotdb/db/qp/physical/sys/DataAuthPlan.java | 53 ++-
.../db/qp/physical/sys/DeleteStorageGroupPlan.java | 36 ++
.../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 48 +-
.../db/qp/physical/sys/LoadConfigurationPlan.java | 102 ++++-
.../db/qp/physical/sys/SetStorageGroupPlan.java | 4 +-
.../iotdb/db/qp/physical/sys/SetTTLPlan.java | 29 ++
.../db/qp/physical/sys/ShowChildPathsPlan.java | 2 +-
.../db/qp/physical/sys/ShowTimeSeriesPlan.java | 31 ++
.../iotdb/db/qp/strategy/LogicalGenerator.java | 207 +++++----
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 141 ++++--
.../db/query/aggregation/AggregateResult.java | 7 +-
.../iotdb/db/query/control/FileReaderManager.java | 4 +-
.../db/query/dataset/AlignByDeviceDataSet.java | 53 ++-
.../db/query/dataset/ShowTimeSeriesResult.java | 79 +++-
.../iotdb/db/query/dataset/SingleDataSet.java | 4 +-
.../dataset/groupby/GroupByEngineDataSet.java | 16 +-
.../query/dataset/groupby/GroupByFillDataSet.java | 10 +-
.../query/dataset/groupby/GroupByTimeDataSet.java | 96 ++++
.../groupby/GroupByWithValueFilterDataSet.java | 26 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 16 +-
.../dataset/groupby/LocalGroupByExecutor.java | 11 +-
.../db/query/executor/AggregationExecutor.java | 30 +-
.../iotdb/db/query/executor/FillQueryExecutor.java | 9 +-
.../iotdb/db/query/executor/IQueryRouter.java | 4 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 11 +-
.../iotdb/db/query/executor/QueryRouter.java | 78 +++-
.../apache/iotdb/db/query/executor/fill/IFill.java | 15 +-
.../db/query/executor/fill/LastPointReader.java | 17 +-
.../iotdb/db/query/executor/fill/LinearFill.java | 39 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 8 +-
.../org/apache/iotdb/db/service/JMXService.java | 2 +-
.../org/apache/iotdb/db/service/MQTTService.java | 1 +
.../org/apache/iotdb/db/service/RPCService.java | 2 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 50 +--
.../org/apache/iotdb/db/service/UpgradeSevice.java | 4 +
.../iotdb/db/tools/TsFileResourcePrinter.java | 29 +-
.../org/apache/iotdb/db/utils/FilePathUtils.java | 87 ++++
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 2 +-
.../org/apache/iotdb/db/utils/SerializeUtils.java | 497 +++++++++++++++++++++
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 6 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 4 +-
.../writelog/manager/MultiFileLogNodeManager.java | 4 +-
.../db/writelog/node/ExclusiveWriteLogNode.java | 4 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 3 +-
...{IoTDBAliasIT.java => IoTDBAddSubDeviceIT.java} | 158 ++-----
.../IoTDBAggregationAlignByDeviceIT.java | 113 +++++
.../apache/iotdb/db/integration/IoTDBAliasIT.java | 92 +++-
...FloatPrecisionIT.java => IoTDBInsertNaNIT.java} | 59 +--
.../apache/iotdb/db/integration/IoTDBLastIT.java | 54 ++-
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 62 +++
.../iotdb/db/metadata/MManagerAdvancedTest.java | 62 ++-
.../iotdb/db/metadata/MManagerImproveTest.java | 4 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 104 +++--
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 15 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 120 +++--
.../iotdb/db/qp/strategy/LogicalGeneratorTest.java | 21 +
.../db/query/dataset/GroupByLevelDataSetTest.java | 169 +++++++
.../db/query/dataset/GroupByTimeDataSetTest.java | 186 ++++++++
.../query/executor/GroupByEngineDataSetTest.java | 62 +--
.../org/apache/iotdb/db/tools/WalCheckerTest.java | 4 +-
.../iotdb/db/writelog/io/LogWriterReaderTest.java | 2 +-
.../db/writelog/io/MultiFileLogReaderTest.java | 2 +-
service-rpc/rpc-changelist.md | 1 +
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 9 +
service-rpc/src/main/thrift/cluster.thrift | 387 ++++++++++++++++
service-rpc/src/main/thrift/rpc.thrift | 2 +
.../java/org/apache/iotdb/session/Session.java | 221 ++++++---
.../org/apache/iotdb/session/pool/SessionPool.java | 68 +++
.../org/apache/iotdb/session/IoTDBSessionIT.java | 26 ++
.../apache/iotdb/tsfile/common/cache/LRUCache.java | 10 +-
.../apache/iotdb/tsfile/read/TimeValuePair.java | 1 -
.../org/apache/iotdb/tsfile/read/common/Path.java | 3 +-
.../apache/iotdb/tsfile/read/common/RowRecord.java | 8 +
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 9 +
164 files changed, 6025 insertions(+), 1520 deletions(-)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileLock.java
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{LeafMNode.java => MeasurementMNode.java} (78%)
rename server/src/main/java/org/apache/iotdb/db/qp/physical/crud/{GroupByFillPlan.java => GroupByTimeFillPlan.java} (93%)
rename server/src/main/java/org/apache/iotdb/db/qp/physical/crud/{GroupByPlan.java => GroupByTimePlan.java} (93%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByTimeDataSet.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/utils/SerializeUtils.java
copy server/src/test/java/org/apache/iotdb/db/integration/{IoTDBAliasIT.java => IoTDBAddSubDeviceIT.java} (51%)
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%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByLevelDataSetTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByTimeDataSetTest.java
create mode 100644 service-rpc/src/main/thrift/cluster.thrift