This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge2
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 332d51b fix variable name
add f7b7bdc fix review
add 22a82b3 Abstract insertPlan
add 58b10ff rename markMeasurementInsertionFailed to
markFailedMeasurementInsertion
add 2cbee31 change the way to get MManager (#1431)
add 2de26fe Merge branch 'master' into cluster_premerge2
No new revisions were added by this update.
Summary of changes:
docs/SystemDesign/DataQuery/LastQuery.md | 2 +-
.../SystemDesign/StorageEngine/DataManipulation.md | 4 +-
docs/zh/SystemDesign/DataQuery/LastQuery.md | 2 +-
.../SystemDesign/StorageEngine/DataManipulation.md | 4 +-
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 10 +-
.../db/conf/adapter/ManageDynamicParameters.java | 4 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 50 +--
.../iotdb/db/engine/memtable/AbstractMemTable.java | 18 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 4 +-
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 22 +-
.../iotdb/db/engine/merge/task/MergeTask.java | 22 +-
.../engine/storagegroup/StorageGroupProcessor.java | 82 ++--
.../db/engine/storagegroup/TsFileProcessor.java | 20 +-
.../db/engine/storagegroup/TsFileResource.java | 35 +-
.../iotdb/db/engine/version/VersionController.java | 2 -
.../org/apache/iotdb/db/metadata/MManager.java | 91 +++--
.../org/apache/iotdb/db/monitor/StatMonitor.java | 26 +-
.../org/apache/iotdb/db/mqtt/PublishHandler.java | 9 +-
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 9 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 53 ++-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 14 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 447 ++-------------------
.../crud/{InsertPlan.java => InsertRowPlan.java} | 195 ++++-----
.../db/qp/physical/crud/InsertTabletPlan.java | 91 +----
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 10 +-
.../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 | 27 +-
.../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 | 21 +-
.../org/apache/iotdb/db/utils/SerializeUtils.java | 5 +
.../iotdb/db/writelog/recover/LogReplayer.java | 87 ++--
.../writelog/recover/TsFileRecoverPerformer.java | 19 +-
.../adapter/IoTDBConfigDynamicAdapterTest.java | 20 +-
.../iotdb/db/engine/MetadataManagerHelper.java | 3 +-
.../db/engine/cache/ChunkMetadataCacheTest.java | 6 +-
.../iotdb/db/engine/merge/MergePerfTest.java | 11 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 27 +-
.../engine/modification/DeletionFileNodeTest.java | 38 +-
.../db/engine/modification/DeletionQueryTest.java | 42 +-
.../storagegroup/FileNodeManagerBenchmark.java | 18 +-
.../storagegroup/StorageGroupProcessorTest.java | 22 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 83 ++--
.../engine/storagegroup/TsFileProcessorTest.java | 10 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 14 +-
.../iotdb/db/metadata/MManagerAdvancedTest.java | 18 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 29 +-
.../iotdb/db/metadata/MManagerImproveTest.java | 22 +-
.../apache/iotdb/db/mqtt/PublishHandlerTest.java | 4 +-
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 20 +-
.../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 | 11 +-
.../query/reader/series/SeriesReaderTestUtil.java | 28 +-
.../db/sync/receiver/load/FileLoaderTest.java | 3 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 3 +-
.../db/sync/sender/manage/SyncFileManagerTest.java | 27 +-
.../sender/recover/SyncSenderLogAnalyzerTest.java | 25 +-
.../org/apache/iotdb/db/tools/WalCheckerTest.java | 6 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 22 +-
.../apache/iotdb/db/writelog/PerformanceTest.java | 27 +-
.../iotdb/db/writelog/WriteLogNodeManagerTest.java | 4 +-
.../apache/iotdb/db/writelog/WriteLogNodeTest.java | 15 +-
.../iotdb/db/writelog/io/LogWriterReaderTest.java | 10 +-
.../db/writelog/recover/DeviceStringTest.java | 15 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 27 +-
.../recover/RecoverResourceFromReaderTest.java | 25 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 31 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 35 +-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 23 +-
79 files changed, 867 insertions(+), 1464 deletions(-)
copy
server/src/main/java/org/apache/iotdb/db/qp/physical/crud/{InsertPlan.java =>
InsertRowPlan.java} (73%)
