You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by li...@apache.org on 2019/06/14 10:56:35 UTC
[incubator-iotdb] 02/02: fix conflict
This is an automated email from the ASF dual-hosted git repository.
liurui pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 61f865952ba641eec8822d947a8e0832d757eb48
Merge: 4fa3caa e6a5bfa
Author: liuruiyiyang <24...@qq.com>
AuthorDate: Fri Jun 14 18:56:21 2019 +0800
fix conflict
iotdb/pom.xml | 46 +--
.../engine/bufferwrite/BufferWriteProcessor.java | 60 ++--
.../iotdb/db/engine/filenode/FileNodeManager.java | 50 +--
.../db/engine/filenode/FileNodeProcessor.java | 153 ++++-----
.../iotdb/db/engine/filenode/TsFileResource.java | 8 +
.../iotdb/db/engine/overflow/io/OverflowIO.java | 1 +
.../db/engine/overflow/io/OverflowProcessor.java | 117 ++++---
.../db/engine/overflow/io/OverflowResource.java | 40 ++-
.../exception/BufferWriteProcessorException.java | 3 +
.../physical/transfer/PhysicalPlanLogTransfer.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 41 +--
.../java/org/apache/iotdb/db/tools/WalChecker.java | 8 +-
.../apache/iotdb/db/writelog/io/ILogReader.java | 2 -
.../iotdb/db/writelog/io/MultiFileLogReader.java | 71 ++++
...{RAFLogReader.java => SingleFileLogReader.java} | 33 +-
.../writelog/manager/MultiFileLogNodeManager.java | 13 -
.../db/writelog/manager/WriteLogNodeManager.java | 5 -
.../db/writelog/node/ExclusiveWriteLogNode.java | 36 +-
.../iotdb/db/writelog/node/WriteLogNode.java | 14 +-
.../recover/ExclusiveLogRecoverPerformer.java | 370 ---------------------
.../iotdb/db/writelog/recover/LogReplayer.java | 119 +++++++
.../db/writelog/recover/RecoverPerformer.java | 32 --
.../recover/StorageGroupRecoverPerformer.java | 84 -----
.../writelog/recover/TsFileRecoverPerformer.java | 149 +++++++++
.../db/writelog/replay/ConcreteLogReplayer.java | 102 ------
.../iotdb/db/writelog/replay/LogReplayer.java | 27 --
.../transfer/PhysicalPlanLogTransferTest.java | 14 +-
.../apache/iotdb/db/writelog/PerformanceTest.java | 7 +-
.../apache/iotdb/db/writelog/WriteLogNodeTest.java | 7 +-
.../iotdb/db/writelog/io/LogWriterReaderTest.java | 2 +-
.../write/writer/IncompleteFileTestUtil.java | 2 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 4 +-
.../write/writer/NativeRestorableIOWriterTest.java | 20 +-
33 files changed, 651 insertions(+), 991 deletions(-)
diff --cc iotdb/pom.xml
index 37f5cf4,37f5cf4..eba79cc
--- a/iotdb/pom.xml
+++ b/iotdb/pom.xml
@@@ -165,29 -165,29 +165,29 @@@
</plugin>
<!-- for TsFile Checker -->
<!--<plugin>-->
-- <!--<groupId>org.apache.maven.plugins</groupId>-->
-- <!--<artifactId>maven-assembly-plugin</artifactId>-->
-- <!--<version>2.5.5</version>-->
-- <!--<configuration>-->
-- <!--<archive>-->
-- <!--<manifest>-->
-- <!--<addClasspath>true</addClasspath>-->
-- <!--<mainClass>org.apache.iotdb.db.tools.TsFileChecker</mainClass>-->
-- <!--</manifest>-->
-- <!--</archive>-->
-- <!--<descriptorRefs>-->
-- <!--<descriptorRef>jar-with-dependencies</descriptorRef>-->
-- <!--</descriptorRefs>-->
-- <!--</configuration>-->
-- <!--<executions>-->
-- <!--<execution>-->
-- <!--<id>make-assembly</id>-->
-- <!--<phase>package</phase>-->
-- <!--<goals>-->
-- <!--<goal>single</goal>-->
-- <!--</goals>-->
-- <!--</execution>-->
-- <!--</executions>-->
++ <!--<groupId>org.apache.maven.plugins</groupId>-->
++ <!--<artifactId>maven-assembly-plugin</artifactId>-->
++ <!--<version>2.5.5</version>-->
++ <!--<configuration>-->
++ <!--<archive>-->
++ <!--<manifest>-->
++ <!--<addClasspath>true</addClasspath>-->
++ <!--<mainClass>org.apache.iotdb.db.tools.TsFileChecker</mainClass>-->
++ <!--</manifest>-->
++ <!--</archive>-->
++ <!--<descriptorRefs>-->
++ <!--<descriptorRef>jar-with-dependencies</descriptorRef>-->
++ <!--</descriptorRefs>-->
++ <!--</configuration>-->
++ <!--<executions>-->
++ <!--<execution>-->
++ <!--<id>make-assembly</id>-->
++ <!--<phase>package</phase>-->
++ <!--<goals>-->
++ <!--<goal>single</goal>-->
++ <!--</goals>-->
++ <!--</execution>-->
++ <!--</executions>-->
<!--</plugin>-->
<!-- Might require this in Eclipse -->
<!--plugin>
diff --cc iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
index ded049b,2e445f4..7b35348
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
@@@ -50,8 -48,7 +48,9 @@@ import org.apache.iotdb.db.engine.pool.
import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk;
import org.apache.iotdb.db.engine.version.VersionController;
import org.apache.iotdb.db.exception.BufferWriteProcessorException;
+ import org.apache.iotdb.db.exception.ProcessorException;
+import org.apache.iotdb.db.monitor.collector.MemTableWriteTimeCost;
+import org.apache.iotdb.db.monitor.collector.MemTableWriteTimeCost.MemTableWriteTimeCostType;
import org.apache.iotdb.db.qp.constant.DatetimeUtils;
import org.apache.iotdb.db.utils.ImmediateFuture;
import org.apache.iotdb.db.utils.MemUtils;