merge with master
authorHouliangQi <neuyilan@163.com>
Mon, 11 Jan 2021 12:31:01 +0000 (20:31 +0800)
committerHouliangQi <neuyilan@163.com>
Mon, 11 Jan 2021 12:31:01 +0000 (20:31 +0800)
commit4b7f40d8a7983fb96080ebf2710794fe585c3d3a
tree9f5733e9bf675ccb48f5af7caf9b7d4d3d136b04
parent0b51d8bcf82ec655d3cfd0064129f47fdfad41c7
parentbdb5d3e9cfc7cb70885fd4388f35d09b155c5bda
merge with master
server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
server/src/test/java/org/apache/iotdb/db/qp/physical/InsertTabletMultiPlanTest.java
server/src/test/java/org/apache/iotdb/db/qp/physical/InsertTabletPlanTest.java