This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 6d8e206 Merge branch 'master' into cluster_premerge
add 1c1ccb6 rm update in md (#1835)
add 90ff56a IOTDB-932 Removed (wrong and redundant) Verification of Paths
in Session API.
add df48add IOTDB-932 Removed unnecessary Constant PATH_PATTERN and
related Test.
add 8ba9284 Trigger
add 6ba9889 Merge pull request #1793 from
apache/bugfix/932-wrong-verification
add 48f01b7 [IOTDB-926] Support reconnection of Session (#1821)
add c889776 [IOTDB-845]Enable to stop iotdb server by iotdb.IoTDB (#1633)
add 7755ffc [IOTDB-912] Implement wasNull method in
AbstractIoTDBJDBCResultSet (#1791)
add 6511a88 [IOTDB-908] Implement ResultSetMetadata interface for JDBC
(#1768)
add b67f669 Add readChunksInDevice method to TsFileSequenceReader (#1765)
add f352932 [IOTDB-942] Optimization of query with long time unsequence
page (#1824)
add 74eedae add device chunk point cache (#1758)
add e5f213c [IOTDB-949] fix align by device bug (#1837)
add 64dc16b [IOTDB-927] Remove fastjson introduced by rocketmq (#1782)
add ac48ffb Merge branch 'master' into cluster_premerge
No new revisions were added by this update.
Summary of changes:
docs/UserGuide/Operation Manual/Administration.md | 1 -
docs/UserGuide/Operation Manual/SQL Reference.md | 19 +-
.../UserGuide/Operation Manual/Administration.md | 1 -
.../zh/UserGuide/Operation Manual/SQL Reference.md | 17 +-
example/rocketmq/pom.xml | 6 +
.../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 19 +-
.../main/java/org/apache/iotdb/jdbc/Config.java | 2 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 2 +-
.../iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java | 8 +-
.../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 46 +-
.../resources/conf/iotdb-engine.properties | 29 +-
server/src/assembly/resources/conf/iotdb-env.bat | 70 ++-
server/src/assembly/resources/sbin/stop-server.bat | 17 +-
server/src/assembly/resources/sbin/stop-server.sh | 11 +-
.../iotdb/db/auth/authorizer/BasicAuthorizer.java | 1 -
.../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 23 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 21 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 104 +++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 18 +
.../db/engine/fileSystem/SystemFileFactory.java | 5 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 1 -
.../db/engine/memtable/PrimitiveMemTable.java | 1 -
.../iotdb/db/engine/merge/manage/MergeManager.java | 33 +-
.../db/engine/merge/manage/MergeResource.java | 2 -
.../engine/modification/io/ModificationReader.java | 1 -
.../engine/modification/io/ModificationWriter.java | 1 -
.../db/engine/querycontext/ReadOnlyMemChunk.java | 5 +-
.../engine/storagegroup/StorageGroupProcessor.java | 299 ++---------
.../db/engine/storagegroup/TsFileProcessor.java | 11 +-
.../db/engine/storagegroup/TsFileResource.java | 6 +-
.../HotCompactionMergeTaskPoolManager.java | 9 +-
.../engine/tsfilemanagement/TsFileManagement.java | 238 +++++++++
.../level/LevelTsFileManagement.java | 253 ++++++----
.../tsfilemanagement/utils/HotCompactionUtils.java | 268 ++++++----
.../apache/iotdb/db/engine/upgrade/UpgradeLog.java | 9 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 11 +-
.../org/apache/iotdb/db/metadata/TagLogFile.java | 15 +-
.../apache/iotdb/db/metrics/server/JettyUtil.java | 4 +-
.../iotdb/db/metrics/server/MetricsSystem.java | 2 +-
.../iotdb/db/metrics/server/ServerArgument.java | 2 +-
.../apache/iotdb/db/metrics/sink/ConsoleSink.java | 2 +-
.../iotdb/db/metrics/sink/MetricsServletSink.java | 6 +-
.../apache/iotdb/db/metrics/source/JvmSource.java | 2 +-
.../iotdb/db/metrics/source/MetricsSource.java | 2 +-
.../apache/iotdb/db/metrics/ui/MetricsPage.java | 2 +-
.../apache/iotdb/db/metrics/ui/MetricsWebUI.java | 2 +-
.../org/apache/iotdb/db/monitor/IStatistic.java | 1 -
.../org/apache/iotdb/db/monitor/StatMonitor.java | 15 +-
.../apache/iotdb/db/mqtt/BrokerAuthenticator.java | 2 +-
.../apache/iotdb/db/mqtt/JSONPayloadFormatter.java | 1 -
.../apache/iotdb/db/mqtt/PayloadFormatManager.java | 1 -
.../org/apache/iotdb/db/mqtt/PayloadFormatter.java | 1 -
.../main/java/org/apache/iotdb/db/qp/Planner.java | 20 +-
.../db/qp/logical/crud/BasicOperatorType.java | 3 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 3 +-
.../db/qp/physical/crud/GroupByTimeFillPlan.java | 3 +-
.../apache/iotdb/db/qp/physical/sys/CountPlan.java | 1 -
.../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 15 +-
.../optimizer/MergeSingleFilterOptimizer.java | 7 +-
.../aggregation/impl/FirstValueAggrResult.java | 1 -
.../iotdb/db/query/control/FileReaderManager.java | 15 +-
.../iotdb/db/query/control/QueryFileManager.java | 9 +-
.../db/query/control/QueryResourceManager.java | 2 -
.../db/query/dataset/ShowTimeseriesDataSet.java | 1 +
.../dataset/groupby/GroupByEngineDataSet.java | 3 +-
.../db/query/dataset/groupby/GroupByExecutor.java | 5 +-
.../iotdb/db/query/executor/IQueryRouter.java | 10 +-
.../query/externalsort/ExternalSortJobEngine.java | 7 +-
.../iotdb/db/query/externalsort/LineMerger.java | 2 +-
.../externalsort/SimpleExternalSortEngine.java | 11 +-
.../SingleSourceExternalSortJobPart.java | 2 +-
.../adapter/ByTimestampReaderAdapter.java | 2 +-
.../serialize/IExternalSortFileDeserializer.java | 2 +-
.../FixLengthIExternalSortFileDeserializer.java | 4 +-
.../impl/FixLengthTimeValuePairSerializer.java | 2 +-
.../db/query/reader/chunk/ChunkDataIterator.java | 5 +-
.../db/query/reader/chunk/ChunkReaderWrap.java | 3 +-
.../reader/chunk/DiskChunkReaderByTimestamp.java | 3 +-
.../db/query/reader/chunk/MemChunkLoader.java | 3 +-
.../db/query/reader/chunk/MemChunkReader.java | 7 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 4 +-
.../resource/CachedUnseqResourceMergeReader.java | 5 +-
.../db/query/reader/series/IAggregateReader.java | 3 +-
.../reader/series/SeriesRawDataPointReader.java | 3 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 243 ++++++---
.../universal/CachedPriorityMergeReader.java | 2 +-
.../reader/universal/PriorityMergeReader.java | 4 +-
.../org/apache/iotdb/db/rescon/MemTablePool.java | 5 +-
.../org/apache/iotdb/db/service/MQTTService.java | 5 +-
.../apache/iotdb/db/service/RegisterManager.java | 1 -
.../org/apache/iotdb/db/service/StaticResps.java | 1 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 41 +-
.../receiver/recover/SyncReceiverLogAnalyzer.java | 2 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 19 +-
.../db/sync/sender/manage/SyncFileManager.java | 22 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 1 -
.../java/org/apache/iotdb/db/tools/WalChecker.java | 1 -
.../iotdb/db/tools/memestimation/MemEstTool.java | 1 -
.../org/apache/iotdb/db/utils/CommonUtils.java | 1 -
.../java/org/apache/iotdb/db/utils/MathUtils.java | 1 -
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 13 +-
.../iotdb/db/utils/datastructure/TVList.java | 2 +-
.../iotdb/db/engine/merge/MergeManagerTest.java | 7 +-
.../storagegroup/StorageGroupProcessorTest.java | 85 ++--
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 60 +++
.../iotdb/db/integration/IoTDBMergeTest.java | 14 +-
.../apache/iotdb/db/sql/CheckPathValidityTest.java | 53 --
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 23 +-
.../main/java/org/apache/iotdb/session/Config.java | 3 +-
.../java/org/apache/iotdb/session/Session.java | 131 ++++-
.../iotdb/session/IoTDBSessionComplexIT.java | 45 --
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 554 +++++++++++----------
thrift/src/main/thrift/rpc.thrift | 2 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 14 +
.../tsfile/file/metadata/TimeseriesMetadata.java | 11 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 28 ++
.../tsfile/read/TsFileSequenceReaderTest.java | 40 +-
117 files changed, 1915 insertions(+), 1314 deletions(-)
delete mode 100644
server/src/test/java/org/apache/iotdb/db/sql/CheckPathValidityTest.java
