This is an automated email from the ASF dual-hosted git repository. sunzesong pushed a change to branch pisa in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from d36b33e Merge master and resolve conflicts add 2cbee31 change the way to get MManager (#1431) add b9c6b17 Merge remote-tracking branch 'origin/master' into pisa add c2c4484 Merge master and resolve conflicts No new revisions were added by this update. Summary of changes: docs/SystemDesign/DataQuery/LastQuery.md | 2 +- docs/zh/SystemDesign/DataQuery/LastQuery.md | 2 +- .../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 10 ++--- .../db/conf/adapter/ManageDynamicParameters.java | 4 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 34 ++++++--------- .../iotdb/db/engine/merge/recover/LogAnalyzer.java | 22 +++++----- .../iotdb/db/engine/merge/task/MergeTask.java | 22 ++++------ .../engine/storagegroup/StorageGroupProcessor.java | 49 +++++++-------------- .../db/engine/storagegroup/TsFileResource.java | 35 ++++++--------- .../org/apache/iotdb/db/metadata/MManager.java | 4 ++ .../org/apache/iotdb/db/monitor/StatMonitor.java | 22 +++++----- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 29 +++++++------ .../iotdb/db/qp/strategy/PhysicalGenerator.java | 6 ++- .../qp/strategy/optimizer/ConcatPathOptimizer.java | 21 ++++----- .../db/query/dataset/AlignByDeviceDataSet.java | 10 ++--- .../iotdb/db/query/executor/LastQueryExecutor.java | 12 +++--- .../query/timegenerator/ServerTimeGenerator.java | 7 +-- .../java/org/apache/iotdb/db/service/IoTDB.java | 8 ++-- .../org/apache/iotdb/db/service/TSServiceImpl.java | 5 +-- .../db/sync/receiver/transfer/SyncServiceImpl.java | 23 +++++----- .../db/sync/sender/manage/SyncFileManager.java | 27 +++++------- .../db/tools/memestimation/MemEstToolCmd.java | 6 +-- .../org/apache/iotdb/db/utils/SchemaUtils.java | 14 +++--- .../iotdb/db/writelog/recover/LogReplayer.java | 13 +++--- .../writelog/recover/TsFileRecoverPerformer.java | 19 ++++---- .../adapter/IoTDBConfigDynamicAdapterTest.java | 20 ++++----- .../iotdb/db/engine/MetadataManagerHelper.java | 3 +- .../iotdb/db/engine/merge/MergePerfTest.java | 11 ++--- .../apache/iotdb/db/engine/merge/MergeTest.java | 27 ++++++------ .../engine/modification/DeletionFileNodeTest.java | 22 +++++----- .../db/engine/modification/DeletionQueryTest.java | 21 ++++----- .../storagegroup/FileNodeManagerBenchmark.java | 14 +++--- .../iotdb/db/engine/storagegroup/TTLTest.java | 35 +++++++-------- .../apache/iotdb/db/integration/IoTDBLastIT.java | 14 +++--- .../iotdb/db/metadata/MManagerAdvancedTest.java | 18 ++++---- .../iotdb/db/metadata/MManagerBasicTest.java | 13 +++--- .../iotdb/db/metadata/MManagerImproveTest.java | 22 +++++----- .../java/org/apache/iotdb/db/qp/PlannerTest.java | 5 ++- .../iotdb/db/qp/plan/ConcatOptimizerTest.java | 27 ++++++------ .../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 11 +++-- .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 50 +++++++--------------- .../dataset/EngineDataSetWithValueFilterTest.java | 11 ++--- .../db/query/dataset/GroupByLevelDataSetTest.java | 5 +-- .../db/query/dataset/GroupByTimeDataSetTest.java | 4 +- .../iotdb/db/query/reader/ReaderTestHelper.java | 7 +-- .../query/reader/series/SeriesReaderTestUtil.java | 11 +++-- .../db/sync/receiver/load/FileLoaderTest.java | 3 +- .../recover/SyncReceiverLogAnalyzerTest.java | 3 +- .../db/sync/sender/manage/SyncFileManagerTest.java | 27 ++++++------ .../sender/recover/SyncSenderLogAnalyzerTest.java | 25 +++++------ .../apache/iotdb/db/utils/EnvironmentUtils.java | 22 +++++----- .../apache/iotdb/db/writelog/PerformanceTest.java | 19 ++++---- .../db/writelog/recover/DeviceStringTest.java | 15 ++++--- .../iotdb/db/writelog/recover/LogReplayerTest.java | 19 ++++---- .../recover/RecoverResourceFromReaderTest.java | 10 ++--- .../db/writelog/recover/SeqTsFileRecoverTest.java | 23 ++++------ .../writelog/recover/UnseqTsFileRecoverTest.java | 21 ++++----- .../apache/iotdb/spark/db/EnvironmentUtils.java | 23 +++++----- 58 files changed, 453 insertions(+), 514 deletions(-)