resolve conflicts
authorqiaojialin <646274302@qq.com>
Wed, 11 Mar 2020 07:58:31 +0000 (15:58 +0800)
committerqiaojialin <646274302@qq.com>
Wed, 11 Mar 2020 07:58:31 +0000 (15:58 +0800)
commit735977ee7c6fc0af70b43ec6c2b2d3e23206d14a
tree4def35f5f322aeec7ca4808880bba5c930d53670
parentfda05aac611a7ed8144cb3d6dfe2bb513d07500b
parent6df3d4354ac5f07e0a3df627b085a8d3dccf93c5
resolve conflicts
21 files changed:
example/session/src/main/java/org/apache/iotdb/SessionExample.java
server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java
server/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java
server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileTest.java
server/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java
server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
session/src/main/java/org/apache/iotdb/session/Session.java
session/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java