You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/05/10 00:46:42 UTC
[incubator-iotdb] 01/02: temporary commit
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch refactor_overflow
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d98144c499f0edbe2800c2a6b8ed9ebe69cefd62
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed May 8 15:14:14 2019 +0800
temporary commit
---
iotdb/pom.xml | 20 ++++++++++++++++++++
.../org/apache/cassandra/utils/ObjectSizes.java | 2 +-
.../db/engine/overflowdata/OverflowProcessor.java | 5 +++++
.../iotdb/db/engine/tsfiledata/TsFileProcessor.java | 15 +++++----------
.../engine/overflowdata/OverflowProcessorTest.java | 2 ++
.../db/engine/tsfiledata/TsFileProcessorTest.java | 2 +-
6 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/iotdb/pom.xml b/iotdb/pom.xml
index 5552876..c531846 100644
--- a/iotdb/pom.xml
+++ b/iotdb/pom.xml
@@ -79,6 +79,26 @@
</dependencies>
<build>
<plugins>
+ <!-- add cassandra's source file -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/src/main/cassandra</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
diff --git a/iotdb/src/main/java/org/apache/cassandra/utils/ObjectSizes.java b/iotdb/src/main/cassandra/org/apache/cassandra/utils/ObjectSizes.java
similarity index 99%
rename from iotdb/src/main/java/org/apache/cassandra/utils/ObjectSizes.java
rename to iotdb/src/main/cassandra/org/apache/cassandra/utils/ObjectSizes.java
index 1ca3f97..2bddd9e 100644
--- a/iotdb/src/main/java/org/apache/cassandra/utils/ObjectSizes.java
+++ b/iotdb/src/main/cassandra/org/apache/cassandra/utils/ObjectSizes.java
@@ -164,4 +164,4 @@ public class ObjectSizes
{
return meter.measure(pojo);
}
-}
+}
\ No newline at end of file
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflowdata/OverflowProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflowdata/OverflowProcessor.java
index 6c31247..14b68c0 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflowdata/OverflowProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflowdata/OverflowProcessor.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.directories.Directories;
import org.apache.iotdb.db.engine.bufferwrite.Action;
import org.apache.iotdb.db.engine.querycontext.OverflowInsertFile;
@@ -75,6 +76,10 @@ public class OverflowProcessor extends TsFileProcessor {
return true;
}
+ @Override
+ protected String getLogSuffix() {
+ return IoTDBConstant.OVERFLOW_LOG_NODE_SUFFIX;
+ }
public OperationResult update(UpdatePlan plan) {
return null;
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
index 3a5bc1f..22c5d73 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
@@ -221,7 +221,7 @@ public class TsFileProcessor extends Processor {
if (IoTDBDescriptor.getInstance().getConfig().isEnableWal()) {
try {
logNode = MultiFileLogNodeManager.getInstance().getNode(
- processorName + IoTDBConstant.BUFFERWRITE_LOG_NODE_SUFFIX,
+ processorName + getLogSuffix(),
writer.getRestoreFilePath(),
FileNodeManager.getInstance().getRestoreFilePath(processorName));
} catch (IOException e) {
@@ -794,17 +794,12 @@ public class TsFileProcessor extends Processor {
return Directories.getInstance().getNextFolderForTsfile();
}
+ protected String getLogSuffix() {
+ return IoTDBConstant.BUFFERWRITE_LOG_NODE_SUFFIX;
+ }
+
@Override
public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof TsFileProcessor)) {
- return false;
- }
- if (!super.equals(o)) {
- return false;
- }
return this == o;
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflowdata/OverflowProcessorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflowdata/OverflowProcessorTest.java
index c568fc3..8eb681a 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflowdata/OverflowProcessorTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflowdata/OverflowProcessorTest.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.util.Collections;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.sgmanager.OperationResult;
import org.apache.iotdb.db.engine.tsfiledata.TsFileProcessorTest;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
@@ -48,6 +49,7 @@ import org.junit.Test;
public class OverflowProcessorTest extends TsFileProcessorTest {
@Before
public void setUp() throws Exception {
+ IoTDBDescriptor.getInstance().getConfig().setEnableWal(true);
super.setUp();
processor.close();
processor = new OverflowProcessor("root.test", doNothingAction, doNothingAction, doNothingAction,
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessorTest.java
index 6399f55..ac90e75 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessorTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessorTest.java
@@ -80,7 +80,7 @@ public class TsFileProcessorTest {
public void setUp() throws Exception {
EnvironmentUtils.envSetUp();
// now we do not support wal because it need to modify the wal module.
-// IoTDBDescriptor.getInstance().getConfig().setEnableWal(true);
+ IoTDBDescriptor.getInstance().getConfig().setEnableWal(true);
IoTDBDescriptor.getInstance().getConfig().setBufferwriteFileSizeThreshold(2*1024*1024);
mManager = MManager.getInstance();
queryManager = new EngineQueryRouter();