You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/02/21 01:33:52 UTC
[incubator-iotdb] branch delete_main updated: fix indent and
equals() in Modification
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch delete_main
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/delete_main by this push:
new 2ab178b fix indent and equals() in Modification
2ab178b is described below
commit 2ab178bcc0d1a4585b8e4795ded075e4c4905360
Author: 江天 <jt...@163.com>
AuthorDate: Thu Feb 21 09:32:58 2019 +0800
fix indent and equals() in Modification
---
.../iotdb/db/engine/filenode/FileNodeManager.java | 34 +++++++++-------------
.../db/engine/filenode/FileNodeProcessor.java | 21 +++++--------
.../iotdb/db/engine/modification/Modification.java | 6 +++-
.../db/engine/overflow/io/OverflowProcessor.java | 16 ++++------
.../io/LocalTextModificationAccessorTest.java | 5 ++--
5 files changed, 33 insertions(+), 49 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeManager.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeManager.java
index 41cc5db..7f6de86 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeManager.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeManager.java
@@ -140,9 +140,8 @@ public class FileNodeManager implements IStatistic, IService {
List<String> list = new ArrayList<>();
for (MonitorConstants.FileNodeManagerStatConstants statConstant :
MonitorConstants.FileNodeManagerStatConstants.values()) {
- list.add(
- MonitorConstants.STAT_STORAGE_DELTA_NAME + MonitorConstants.MONITOR_PATH_SEPERATOR
- + statConstant.name());
+ list.add(MonitorConstants.STAT_STORAGE_DELTA_NAME + MonitorConstants.MONITOR_PATH_SEPERATOR
+ + statConstant.name());
}
return list;
}
@@ -237,8 +236,7 @@ public class FileNodeManager implements IStatistic, IService {
FileNodeProcessor fileNodeProcessor = getProcessor(filenodeName, true);
if (fileNodeProcessor.shouldRecovery()) {
LOGGER.info("Recovery the filenode processor, the filenode is {}, the status is {}",
- filenodeName,
- fileNodeProcessor.getFileNodeProcessorStatus());
+ filenodeName, fileNodeProcessor.getFileNodeProcessorStatus());
fileNodeProcessor.fileNodeRecovery();
} else {
fileNodeProcessor.writeUnlock();
@@ -311,9 +309,8 @@ public class FileNodeManager implements IStatistic, IService {
measurementList.add(dp.getMeasurementId());
insertValues.add(dp.getValue().toString());
}
- logNode.write(
- new InsertPlan(2, tsRecord.deviceId, tsRecord.time, measurementList,
- insertValues));
+ logNode.write(new InsertPlan(2, tsRecord.deviceId, tsRecord.time, measurementList,
+ insertValues));
}
} catch (IOException e) {
if (!isMonitor) {
@@ -378,9 +375,8 @@ public class FileNodeManager implements IStatistic, IService {
try {
bufferWriteProcessor = fileNodeProcessor.getBufferWriteProcessor(filenodeName, timestamp);
} catch (FileNodeProcessorException e) {
- LOGGER
- .error("Get the bufferwrite processor failed, the filenode is {}, insert time is {}",
- filenodeName, timestamp);
+ LOGGER.error("Get the bufferwrite processor failed, the filenode is {}, insert time is {}",
+ filenodeName, timestamp);
if (!isMonitor) {
updateStatHashMapWhenFail(tsRecord);
}
@@ -392,8 +388,7 @@ public class FileNodeManager implements IStatistic, IService {
String bufferwriteBaseDir = bufferWriteProcessor.getBaseDir();
String bufferwriteRelativePath = bufferWriteProcessor.getFileRelativePath();
try {
- fileNodeProcessor
- .addIntervalFileNode(bufferwriteBaseDir, bufferwriteRelativePath);
+ fileNodeProcessor.addIntervalFileNode(bufferwriteBaseDir, bufferwriteRelativePath);
} catch (Exception e) {
if (!isMonitor) {
updateStatHashMapWhenFail(tsRecord);
@@ -471,8 +466,8 @@ public class FileNodeManager implements IStatistic, IService {
try {
if (IoTDBDescriptor.getInstance().getConfig().enableWal) {
overflowProcessor.getLogNode().write(
- new UpdatePlan(startTime, finalEndTime, v, new Path(deviceId
- + "." + measurementId)));
+ new UpdatePlan(startTime, finalEndTime, v, new Path(deviceId
+ + "." + measurementId)));
}
} catch (IOException e) {
throw new FileNodeManagerException(e);
@@ -512,11 +507,9 @@ public class FileNodeManager implements IStatistic, IService {
throw new FileNodeManagerException(e);
}
try {
- overflowProcessor.getLogNode()
- .write(new DeletePlan(timestamp,
+ overflowProcessor.getLogNode().write(new DeletePlan(timestamp,
new Path(deviceId + "." + measurementId)));
- bufferWriteProcessor.getLogNode()
- .write(new DeletePlan(timestamp,
+ bufferWriteProcessor.getLogNode().write(new DeletePlan(timestamp,
new Path(deviceId + "." + measurementId)));
} catch (IOException e) {
throw new FileNodeManagerException(e);
@@ -645,8 +638,7 @@ public class FileNodeManager implements IStatistic, IService {
}
}
try {
- queryDataSource = fileNodeProcessor
- .query(deviceId, measurementId, context);
+ queryDataSource = fileNodeProcessor.query(deviceId, measurementId, context);
} catch (FileNodeProcessorException e) {
LOGGER.error("Query error: the deviceId {}, the measurementId {}", deviceId, measurementId,
e);
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
index 224d519..a4fe3ee 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
@@ -349,8 +349,7 @@ public class FileNodeProcessor extends Processor implements IStatistic {
/**
* add interval FileNode.
*/
- void addIntervalFileNode(String baseDir, String fileName)
- throws ActionException {
+ void addIntervalFileNode(String baseDir, String fileName) throws ActionException {
IntervalFileNode intervalFileNode = new IntervalFileNode(OverflowChangeType.NO_CHANGE, baseDir,
fileName);
@@ -493,14 +492,12 @@ public class FileNodeProcessor extends Processor implements IStatistic {
// re-merge all file
// if bufferwrite processor is not null, and close
LOGGER.info("The filenode processor {} is recovering, the filenode status is {}.",
- getProcessorName(),
- isMerging);
+ getProcessorName(), isMerging);
merge();
} else if (isMerging == FileNodeProcessorStatus.WAITING) {
// unlock
LOGGER.info("The filenode processor {} is recovering, the filenode status is {}.",
- getProcessorName(),
- isMerging);
+ getProcessorName(), isMerging);
writeUnlock();
switchWaitingToWorking();
} else {
@@ -735,8 +732,7 @@ public class FileNodeProcessor extends Processor implements IStatistic {
if (newMultiPassTokenSet.contains(token)) {
newMultiPassLock.readLock().unlock();
newMultiPassTokenSet.remove(token);
- LOGGER
- .debug("Remove multi token:{}, nspath:{}, new set:{}, lock:{}", token,
+ LOGGER.debug("Remove multi token:{}, nspath:{}, new set:{}, lock:{}", token,
getProcessorName(),
newMultiPassTokenSet, newMultiPassLock);
return true;
@@ -783,8 +779,7 @@ public class FileNodeProcessor extends Processor implements IStatistic {
bufferwriteDataInFiles.add(intervalFileNode.backUp());
}
}
- Pair<ReadOnlyMemChunk, List<ChunkMetaData>> bufferwritedata
- = new Pair<>(null, null);
+ Pair<ReadOnlyMemChunk, List<ChunkMetaData>> bufferwritedata = new Pair<>(null, null);
// bufferwrite data
UnsealedTsFile unsealedTsFile = null;
@@ -1570,10 +1565,8 @@ public class FileNodeProcessor extends Processor implements IStatistic {
private void writeOneSeries(String deviceId, ChunkWriterImpl seriesWriterImpl,
- TSDataType dataType, IReader seriesReader,
- Map<String, Long> startTimeMap,
- Map<String, Long> endTimeMap,
- TimeValuePair firstTVPair) throws IOException {
+ TSDataType dataType, IReader seriesReader, Map<String, Long> startTimeMap,
+ Map<String, Long> endTimeMap, TimeValuePair firstTVPair) throws IOException {
long startTime;
long endTime;
TimeValuePair localTV = firstTVPair;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java
index 81186a1..fbdf790 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java
@@ -66,8 +66,12 @@ public abstract class Modification {
@Override
public boolean equals(Object obj) {
- if (!(obj instanceof Modification))
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof Modification)) {
return false;
+ }
Modification mod = (Modification) obj;
return mod.type.equals(this.type) && mod.path.equals(this.path)
&& mod.versionNum == this.versionNum;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessor.java
index e4cae5b..01801d9 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessor.java
@@ -85,8 +85,8 @@ public class OverflowProcessor extends Processor {
private AtomicLong dataPathCount = new AtomicLong();
private ReentrantLock queryFlushLock = new ReentrantLock();
- private Action overflowFlushAction = null;
- private Action filenodeFlushAction = null;
+ private Action overflowFlushAction;
+ private Action filenodeFlushAction;
private FileSchema fileSchema;
private long memThreshold = TSFileConfig.groupSizeInByte;
@@ -321,9 +321,7 @@ public class OverflowProcessor extends Processor {
* time-series.
*/
private Pair<String, List<ChunkMetaData>> queryWorkDataInOverflowInsert(String deviceId,
- String measurementId,
- TSDataType dataType,
- QueryContext context) {
+ String measurementId, TSDataType dataType, QueryContext context) {
return new Pair<>(
workResource.getInsertFilePath(),
workResource.getInsertMetadatas(deviceId, measurementId, dataType, context));
@@ -343,9 +341,7 @@ public class OverflowProcessor extends Processor {
}
public OverflowSeriesDataSource queryMerge(String deviceId, String measurementId,
- TSDataType dataType,
- boolean isMerge,
- QueryContext context) {
+ TSDataType dataType, boolean isMerge, QueryContext context) {
Pair<String, List<ChunkMetaData>> mergeInsert = queryMergeDataInOverflowInsert(deviceId,
measurementId,
dataType, context);
@@ -365,9 +361,7 @@ public class OverflowProcessor extends Processor {
* time-series.
**/
private Pair<String, List<ChunkMetaData>> queryMergeDataInOverflowInsert(String deviceId,
- String measurementId,
- TSDataType dataType,
- QueryContext context) {
+ String measurementId, TSDataType dataType, QueryContext context) {
if (!isMerge) {
return new Pair<>(null, null);
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
index d0059de..7121fa3 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.iotdb.db.engine.modification.Deletion;
@@ -70,10 +71,10 @@ public class LocalTextModificationAccessorTest {
@Test
public void readNull() throws IOException {
String tempFileName = "mod.temp";
- LocalTextModificationAccessor accessor = null;
+ LocalTextModificationAccessor accessor;
accessor = new LocalTextModificationAccessor(tempFileName);
new File(tempFileName).delete();
Collection<Modification> modifications = accessor.read();
- assertNull(modifications);
+ assertEquals(new ArrayList<>(), modifications);
}
}
\ No newline at end of file