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/16 14:11:35 UTC
[incubator-iotdb] branch delete_dev3 updated: secure some file
streams fix some uts with incorrect answers
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch delete_dev3
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/delete_dev3 by this push:
new 74a1456 secure some file streams fix some uts with incorrect answers
74a1456 is described below
commit 74a14561a399b0ee65ed06f14addc9d144e92e36
Author: jt <jt...@163.com>
AuthorDate: Sat Feb 16 22:11:26 2019 +0800
secure some file streams
fix some uts with incorrect answers
---
.../iotdb/db/engine/filenode/FileNodeProcessor.java | 9 +++++++++
.../modification/io/LocalTextModificationAccessor.java | 3 ++-
.../db/engine/modification/DeletionFileNodeTest.java | 16 ++++++++++------
.../iotdb/db/engine/modification/DeletionQueryTest.java | 2 +-
.../org/apache/iotdb/db/integration/IoTDBCompleteIT.java | 4 ++--
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 2 +-
6 files changed, 25 insertions(+), 11 deletions(-)
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 51a7468..5ca65c5 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
@@ -1902,6 +1902,15 @@ public class FileNodeProcessor extends Processor implements IStatistic {
}
closeBufferWrite();
closeOverflow();
+ for (IntervalFileNode fileNode : newFileNodes) {
+ if (fileNode.getModFile() != null) {
+ try {
+ fileNode.getModFile().close();
+ } catch (IOException e) {
+ throw new FileNodeProcessorException(e);
+ }
+ }
+ }
}
@Override
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
index 3372540..ee9abaf 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
@@ -70,9 +70,10 @@ public class LocalTextModificationAccessor implements ModificationReader, Modifi
modificationList.add(decodeModification(line));
}
} catch (IOException e) {
- reader.close();
logger.error("An error occurred when reading modifications, and the remaining modifications "
+ "were ignored.", e);
+ } finally {
+ reader.close();
}
return modificationList;
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
index 8311f3e..54fa267 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
@@ -71,7 +71,7 @@ public class DeletionFileNodeTest {
MManager.getInstance().addPathToMTree(processorName + "." + measurements[i], dataType,
encoding, args);
FileNodeManager.getInstance().addTimeSeries(new Path(processorName, measurements[i]), dataType,
- encoding, args);
+ encoding);
}
}
@@ -140,11 +140,15 @@ public class DeletionFileNodeTest {
LocalTextModificationAccessor accessor =
new LocalTextModificationAccessor(modFiles[0].getPath());
- Collection<Modification> modifications = accessor.read();
- assertEquals(modifications.size(), 3);
- int i = 0;
- for (Modification modification : modifications) {
- assertTrue(modification.equals(realModifications[i++]));
+ try {
+ Collection<Modification> modifications = accessor.read();
+ assertEquals(modifications.size(), 3);
+ int i = 0;
+ for (Modification modification : modifications) {
+ assertTrue(modification.equals(realModifications[i++]));
+ }
+ } finally {
+ accessor.close();
}
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
index 2e06969..666b8df 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
@@ -63,7 +63,7 @@ public class DeletionQueryTest {
MManager.getInstance().addPathToMTree(processorName + "." + measurements[i], dataType,
encoding, args);
FileNodeManager.getInstance().addTimeSeries(new Path(processorName, measurements[i]), dataType,
- encoding, args);
+ encoding);
}
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
index 3b5423a..5f61c4b 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
@@ -105,11 +105,11 @@ public class IoTDBCompleteIT {
+ " StorageGroup: root.vehicle \n" + " }\n" + " },\n"
+ " d5:{\n" + " s9:{\n" + " DataType: FLOAT,\n"
+ " Encoding: PLAIN,\n"
- + " args: {compressor=SNAPPY, MAX_POINT_NUMBER=10},\n"
+ + " args: {MAX_POINT_NUMBER=10, compressor=SNAPPY},\n"
+ " StorageGroup: root.vehicle \n" + " }\n" + " },\n"
+ " d6:{\n" + " s10:{\n" + " DataType: DOUBLE,\n"
+ " Encoding: RLE,\n"
- + " args: {compressor=UNCOMPRESSOR, MAX_POINT_NUMBER=10},\n"
+ + " args: {MAX_POINT_NUMBER=10, compressor=UNCOMPRESSOR},\n"
+ " StorageGroup: root.vehicle \n" + " }\n" + " }\n"
+ " }\n" + "}",
"DELETE TIMESERIES root.vehicle.*", "SHOW TIMESERIES",
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
index 04a4c1b..69fc3c6 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
@@ -366,7 +366,7 @@ public class IoTDBMetadataFetchIT {
+ " StorageGroup: root.ln.wf01.wt01 \n" + " },\n"
+ " temperature:{\n" + " DataType: FLOAT,\n"
+ " Encoding: RLE,\n"
- + " args: {compressor=SNAPPY, MAX_POINT_NUMBER=3},\n"
+ + " args: {MAX_POINT_NUMBER=3, compressor=SNAPPY},\n"
+ " StorageGroup: root.ln.wf01.wt01 \n" + " }\n"
+ " }\n"
+ " }\n" + " }\n" + "}";