This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new ce17ef9 Move a util class to test dir.
new 0facdf2 Merge pull request #380 from Genius-pig/master
ce17ef9 is described below
commit ce17ef91171cbf848bad26ce3f4a9a23cf4c34b3
Author: zhutianci <[email protected]>
AuthorDate: Sat Sep 7 00:27:27 2019 +0800
Move a util class to test dir.
---
.../tsfile/file/metadata/ChunkGroupMetaData.java | 2 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 4 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 8 +++
.../tsfile/read/TsFileRestorableReaderTest.java | 2 +-
.../iotdb/tsfile/read/common/TimeRangeTest.java | 58 +++++++++++-----------
.../tsfile/utils}/IncompleteFileTestUtil.java | 4 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 1 +
7 files changed, 45 insertions(+), 34 deletions(-)
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
index 53d3fa3..a717eba 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
@@ -72,7 +72,7 @@ public class ChunkGroupMetaData {
*
* @param deviceID name of device
* @param chunkMetaDataList all time series chunks in this chunk group. Can
not be Null. notice:
- * after constructing a ChunkGroupMetadata instance. Donot use list.add() to
modify
+ * after constructing a ChunkGroupMetadata instance. Don't use list.add() to
modify
* `chunkMetaDataList`. Instead, use addTimeSeriesChunkMetaData() to make
sure getSerializedSize()
* is correct.
* @param startOffsetOfChunkGroup the start Byte position in file of this
chunk group.
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
index 0129eab..1796d5f 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
@@ -333,7 +333,7 @@ public class TsFileWriter implements AutoCloseable{
/**
* this function is only for Test.
- * @return
+ * @return TsFileIOWriter
*/
public TsFileIOWriter getIOWriter() {
return this.fileWriter;
@@ -341,7 +341,7 @@ public class TsFileWriter implements AutoCloseable{
/**
* this function is only for Test
- * @throws IOException
+ * @throws IOException exception in IO
*/
public void flushForTest() throws IOException {
flushAllChunkGroups();
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
index 26ff64b..14253ba 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
@@ -447,4 +447,12 @@ public class TsFileIOWriter {
}
}
}
+
+ /**
+ * this function is only for Test.
+ * @return TsFileOutput
+ */
+ public TsFileOutput getIOWriterOut() {
+ return this.out;
+ }
}
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileRestorableReaderTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileRestorableReaderTest.java
index 14b6ca3..df3d03b 100644
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileRestorableReaderTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileRestorableReaderTest.java
@@ -26,7 +26,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest;
-import org.apache.iotdb.tsfile.write.writer.IncompleteFileTestUtil;
+import org.apache.iotdb.tsfile.utils.IncompleteFileTestUtil;
import org.junit.Test;
public class TsFileRestorableReaderTest {
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/TimeRangeTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/TimeRangeTest.java
index 514f8e2..c1f7867 100644
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/TimeRangeTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/TimeRangeTest.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.tsfile.read.common;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import org.junit.Assert;
@@ -57,8 +59,8 @@ public class TimeRangeTest {
assertEquals(1, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 1);
assertEquals(remainRanges.get(0).getMax(), 10);
- assertEquals(remainRanges.get(0).getLeftClose(), true);
- assertEquals(remainRanges.get(0).getRightClose(), true);
+ assertTrue(remainRanges.get(0).getLeftClose());
+ assertTrue(remainRanges.get(0).getRightClose());
}
@Test
@@ -90,8 +92,8 @@ public class TimeRangeTest {
assertEquals(1, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 3);
assertEquals(remainRanges.get(0).getMax(), 10);
- assertEquals(remainRanges.get(0).getLeftClose(), false);
- assertEquals(remainRanges.get(0).getRightClose(), true);
+ assertFalse(remainRanges.get(0).getLeftClose());
+ assertTrue(remainRanges.get(0).getRightClose());
}
@Test
@@ -109,8 +111,8 @@ public class TimeRangeTest {
assertEquals(1, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 1);
assertEquals(remainRanges.get(0).getMax(), 5);
- assertEquals(remainRanges.get(0).getLeftClose(), true);
- assertEquals(remainRanges.get(0).getRightClose(), false);
+ assertTrue(remainRanges.get(0).getLeftClose());
+ assertFalse(remainRanges.get(0).getRightClose());
}
@Test
@@ -128,12 +130,12 @@ public class TimeRangeTest {
assertEquals(2, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 1);
assertEquals(remainRanges.get(0).getMax(), 3);
- assertEquals(remainRanges.get(0).getLeftClose(), true);
- assertEquals(remainRanges.get(0).getRightClose(), false);
+ assertTrue(remainRanges.get(0).getLeftClose());
+ assertFalse(remainRanges.get(0).getRightClose());
assertEquals(remainRanges.get(1).getMin(), 8);
assertEquals(remainRanges.get(1).getMax(), 10);
- assertEquals(remainRanges.get(1).getLeftClose(), false);
- assertEquals(remainRanges.get(1).getRightClose(), true);
+ assertFalse(remainRanges.get(1).getLeftClose());
+ assertTrue(remainRanges.get(1).getRightClose());
}
@@ -152,8 +154,8 @@ public class TimeRangeTest {
assertEquals(1, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 5);
assertEquals(remainRanges.get(0).getMax(), 10);
- assertEquals(remainRanges.get(0).getLeftClose(), false);
- assertEquals(remainRanges.get(0).getRightClose(), true);
+ assertFalse(remainRanges.get(0).getLeftClose());
+ assertTrue(remainRanges.get(0).getRightClose());
}
@Test
@@ -171,8 +173,8 @@ public class TimeRangeTest {
assertEquals(1, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 2);
assertEquals(remainRanges.get(0).getMax(), 10);
- assertEquals(remainRanges.get(0).getLeftClose(), false);
- assertEquals(remainRanges.get(0).getRightClose(), true);
+ assertFalse(remainRanges.get(0).getLeftClose());
+ assertTrue(remainRanges.get(0).getRightClose());
}
@Test
@@ -190,8 +192,8 @@ public class TimeRangeTest {
assertEquals(1, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 1);
assertEquals(remainRanges.get(0).getMax(), 6);
- assertEquals(remainRanges.get(0).getLeftClose(), true);
- assertEquals(remainRanges.get(0).getRightClose(), false);
+ assertTrue(remainRanges.get(0).getLeftClose());
+ assertFalse(remainRanges.get(0).getRightClose());
}
@Test
@@ -209,8 +211,8 @@ public class TimeRangeTest {
assertEquals(1, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 1);
assertEquals(remainRanges.get(0).getMax(), 11);
- assertEquals(remainRanges.get(0).getLeftClose(), true);
- assertEquals(remainRanges.get(0).getRightClose(), false);
+ assertTrue(remainRanges.get(0).getLeftClose());
+ assertFalse(remainRanges.get(0).getRightClose());
}
@Test
@@ -228,16 +230,16 @@ public class TimeRangeTest {
assertEquals(3, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 1);
assertEquals(remainRanges.get(0).getMax(), 3);
- assertEquals(remainRanges.get(0).getLeftClose(), true);
- assertEquals(remainRanges.get(0).getRightClose(), false);
+ assertTrue(remainRanges.get(0).getLeftClose());
+ assertFalse(remainRanges.get(0).getRightClose());
assertEquals(remainRanges.get(1).getMin(), 4);
assertEquals(remainRanges.get(1).getMax(), 6);
- assertEquals(remainRanges.get(1).getLeftClose(), false);
- assertEquals(remainRanges.get(1).getRightClose(), false);
+ assertFalse(remainRanges.get(1).getLeftClose());
+ assertFalse(remainRanges.get(1).getRightClose());
assertEquals(remainRanges.get(2).getMin(), 8);
assertEquals(remainRanges.get(2).getMax(), 10);
- assertEquals(remainRanges.get(2).getLeftClose(), false);
- assertEquals(remainRanges.get(2).getRightClose(), true);
+ assertFalse(remainRanges.get(2).getLeftClose());
+ assertTrue(remainRanges.get(2).getRightClose());
}
@Test
@@ -255,11 +257,11 @@ public class TimeRangeTest {
assertEquals(2, remainRanges.size());
assertEquals(remainRanges.get(0).getMin(), 1);
assertEquals(remainRanges.get(0).getMax(), 3);
- assertEquals(remainRanges.get(0).getLeftClose(), true);
- assertEquals(remainRanges.get(0).getRightClose(), false);
+ assertTrue(remainRanges.get(0).getLeftClose());
+ assertFalse(remainRanges.get(0).getRightClose());
assertEquals(remainRanges.get(1).getMin(), 4);
assertEquals(remainRanges.get(1).getMax(), 11); // NOTE here is the
technical detail.
- assertEquals(remainRanges.get(1).getLeftClose(), false);
- assertEquals(remainRanges.get(1).getRightClose(), false);
+ assertFalse(remainRanges.get(1).getLeftClose());
+ assertFalse(remainRanges.get(1).getRightClose());
}
}
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IncompleteFileTestUtil.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/IncompleteFileTestUtil.java
similarity index 95%
rename from
tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IncompleteFileTestUtil.java
rename to
tsfile/src/test/java/org/apache/iotdb/tsfile/utils/IncompleteFileTestUtil.java
index d9aaa3f..00c923f 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IncompleteFileTestUtil.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/IncompleteFileTestUtil.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.tsfile.write.writer;
+package org.apache.iotdb.tsfile.utils;
import org.apache.iotdb.tsfile.file.header.ChunkHeader;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
@@ -55,7 +55,7 @@ public class IncompleteFileTestUtil {
buffer.flip();
byte[] data = new byte[3];
buffer.get(data, 0, 3);
- writer.getIOWriter().out.write(data);
+ writer.getIOWriter().getIOWriterOut().write(data);
writer.getIOWriter().close();
}
}
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
index 9cbdb58..f6a5231 100644
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
@@ -42,6 +42,7 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.iotdb.tsfile.read.expression.QueryExpression;
import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
+import org.apache.iotdb.tsfile.utils.IncompleteFileTestUtil;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint;
