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 2812d40  Delete useless codes
     add 22a82b3  Abstract insertPlan
     add 58b10ff  rename markMeasurementInsertionFailed to 
markFailedMeasurementInsertion
     add e04f701  Merge remote-tracking branch 'origin/master' into pisa
     add d36b33e  Merge master and resolve conflicts

No new revisions were added by this update.

Summary of changes:
 .../SystemDesign/StorageEngine/DataManipulation.md |   4 +-
 .../SystemDesign/StorageEngine/DataManipulation.md |   4 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  16 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |  18 +-
 .../apache/iotdb/db/engine/memtable/IMemTable.java |   4 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  32 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |  20 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |  36 +-
 .../org/apache/iotdb/db/monitor/StatMonitor.java   |   4 +-
 .../org/apache/iotdb/db/mqtt/PublishHandler.java   |   9 +-
 .../apache/iotdb/db/qp/executor/IPlanExecutor.java |   9 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  31 +-
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |  14 +-
 .../iotdb/db/qp/physical/crud/InsertPlan.java      | 429 ++-------------------
 .../crud/{InsertPlan.java => InsertRowPlan.java}   | 174 +++------
 .../db/qp/physical/crud/InsertTabletPlan.java      | 104 ++---
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   4 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  22 +-
 .../iotdb/db/writelog/recover/LogReplayer.java     |  76 ++--
 .../db/engine/cache/ChunkMetadataCacheTest.java    |   6 +-
 .../engine/modification/DeletionFileNodeTest.java  |  16 +-
 .../db/engine/modification/DeletionQueryTest.java  |  21 +-
 .../storagegroup/FileNodeManagerBenchmark.java     |   6 +-
 .../storagegroup/StorageGroupProcessorTest.java    |  22 +-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |  48 +--
 .../engine/storagegroup/TsFileProcessorTest.java   |  10 +-
 .../apache/iotdb/db/mqtt/PublishHandlerTest.java   |   4 +-
 .../java/org/apache/iotdb/db/qp/PlannerTest.java   |  15 +-
 .../iotdb/db/query/reader/ReaderTestHelper.java    |   4 -
 .../org/apache/iotdb/db/tools/WalCheckerTest.java  |   6 +-
 .../apache/iotdb/db/writelog/PerformanceTest.java  |   8 +-
 .../iotdb/db/writelog/WriteLogNodeManagerTest.java |   4 +-
 .../apache/iotdb/db/writelog/WriteLogNodeTest.java |  15 +-
 .../iotdb/db/writelog/io/LogWriterReaderTest.java  |  10 +-
 .../iotdb/db/writelog/recover/LogReplayerTest.java |   8 +-
 .../recover/RecoverResourceFromReaderTest.java     |  15 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |   8 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |  14 +-
 38 files changed, 360 insertions(+), 890 deletions(-)
 copy 
server/src/main/java/org/apache/iotdb/db/qp/physical/crud/{InsertPlan.java => 
InsertRowPlan.java} (73%)

Reply via email to