This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch refactor_query_resource_count
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/refactor_query_resource_count
by this push:
new 2594e8a format code
2594e8a is described below
commit 2594e8a72799da3b57bea5a92013081ea50df825
Author: lta <[email protected]>
AuthorDate: Thu Apr 25 19:31:26 2019 +0800
format code
---
.../org/apache/iotdb/db/engine/filenode/FileNodeManager.java | 11 +++++------
.../apache/iotdb/db/engine/filenode/FileNodeProcessor.java | 6 +++---
2 files changed, 8 insertions(+), 9 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 2d65721..dbee398 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
@@ -190,10 +190,7 @@ public class FileNodeManager implements IStatistic,
IService {
}
/**
- *
* @param filenodeName storage name, e.g., root.a.b
- * @return
- * @throws FileNodeManagerException
*/
private FileNodeProcessor constructNewProcessor(String filenodeName)
throws FileNodeManagerException {
@@ -427,7 +424,7 @@ public class FileNodeManager implements IStatistic,
IService {
fileNodeProcessor.setIntervalFileNodeStartTime(deviceId);
fileNodeProcessor.setLastUpdateTime(deviceId, timestamp);
try {
- if(!bufferWriteProcessor.write(tsRecord)) {
+ if (!bufferWriteProcessor.write(tsRecord)) {
// undo time update
fileNodeProcessor.setIntervalFileNodeStartTime(deviceId,
prevStartTime);
fileNodeProcessor.setLastUpdateTime(deviceId, prevUpdateTime);
@@ -635,7 +632,8 @@ public class FileNodeManager implements IStatistic,
IService {
/**
* begin query.
- * @param deviceId queried deviceId
+ *
+ * @param deviceId queried deviceId
* @return a query token for the device.
*/
public int beginQuery(String deviceId) throws FileNodeManagerException {
@@ -957,7 +955,8 @@ public class FileNodeManager implements IStatistic,
IService {
/**
* add time series.
*/
- public void addTimeSeries(Path path, TSDataType dataType, TSEncoding
encoding, CompressionType compressor,
+ public void addTimeSeries(Path path, TSDataType dataType, TSEncoding
encoding,
+ CompressionType compressor,
Map<String, String> props) throws FileNodeManagerException {
FileNodeProcessor fileNodeProcessor = getProcessor(path.getFullPath(),
true);
try {
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 b4920fa..2bfc687 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
@@ -552,9 +552,9 @@ public class FileNodeProcessor extends Processor implements
IStatistic {
} catch (BufferWriteProcessorException e) {
throw new FileNodeProcessorException(String
.format("The filenode processor %s failed to get the bufferwrite
processor.",
- processorName),e);
+ processorName), e);
}
- } else if (bufferWriteProcessor.isClosed()){
+ } else if (bufferWriteProcessor.isClosed()) {
try {
bufferWriteProcessor.reopen(insertTime +
FileNodeConstants.BUFFERWRITE_FILE_SEPARATOR
+ System.currentTimeMillis());
@@ -577,7 +577,7 @@ public class FileNodeProcessor extends Processor implements
IStatistic {
.put(FileNodeConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
flushFileNodeProcessorAction);
overflowProcessor = new OverflowProcessor(processorName, params,
fileSchema,
versionController);
- } else if (overflowProcessor.isClosed()){
+ } else if (overflowProcessor.isClosed()) {
overflowProcessor.reopen();
}
return overflowProcessor;