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/01/24 14:00:29 UTC
[incubator-iotdb] branch delete_dev3 updated: Fix by PR comments.
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 99c5cc1 Fix by PR comments.
99c5cc1 is described below
commit 99c5cc1c2eed5d0c9babff2ab28fbf29209d0c02
Author: jt <jt...@163.com>
AuthorDate: Thu Jan 24 22:00:16 2019 +0800
Fix by PR comments.
---
.../engine/modification/DeletionFileNodeTest.java | 4 ++--
.../db/engine/modification/DeletionQueryTest.java | 8 ++++----
.../version/SimpleFileVersionControllerTest.java | 6 +++---
...IoTDBDeletionTest.java => IoTDBDeletionIT.java} | 22 +++++++++++-----------
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 6 ++++--
.../tsfile/read/reader/chunk/ChunkReader.java | 4 ++++
.../read/reader/series/FileSeriesReader.java | 2 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 4 ++++
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 6 +++---
9 files changed, 36 insertions(+), 26 deletions(-)
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 8b833d0..21e0880 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
@@ -104,7 +104,7 @@ public class DeletionFileNodeTest {
timeValuePairs.next();
count++;
}
- assertEquals(count, 50);
+ assertEquals(50, count);
}
@Test
@@ -181,7 +181,7 @@ public class DeletionFileNodeTest {
timeValuePairs.next();
count++;
}
- assertEquals(count, 50);
+ assertEquals(50, count);
}
@Test
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 0efa2d7..2e06969 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
@@ -102,7 +102,7 @@ public class DeletionQueryTest {
dataSet.next();
count++;
}
- assertEquals(count, 50);
+ assertEquals(50, count);
}
@Test
@@ -133,7 +133,7 @@ public class DeletionQueryTest {
dataSet.next();
count++;
}
- assertEquals(count, 70);
+ assertEquals(70, count);
}
@Test
@@ -175,7 +175,7 @@ public class DeletionQueryTest {
dataSet.next();
count++;
}
- assertEquals(count, 150);
+ assertEquals(150, count);
}
@Test
@@ -217,6 +217,6 @@ public class DeletionQueryTest {
dataSet.next();
count++;
}
- assertEquals(count, 170);
+ assertEquals(170, count);
}
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java
index b33b506..b206356 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java
@@ -33,13 +33,13 @@ public class SimpleFileVersionControllerTest {
try {
new File(tempFilePath).mkdir();
VersionController versionController = new SimpleFileVersionController(tempFilePath);
- assertEquals(versionController.currVersion(), SAVE_INTERVAL);
+ assertEquals(SAVE_INTERVAL, versionController.currVersion());
for (int i = 0; i < 150; i++) {
versionController.nextVersion();
}
- assertEquals(versionController.currVersion(), SAVE_INTERVAL + 150);
+ assertEquals(SAVE_INTERVAL + 150, versionController.currVersion());
versionController = new SimpleFileVersionController(tempFilePath);
- assertEquals(versionController.currVersion(), SAVE_INTERVAL + 200);
+ assertEquals(SAVE_INTERVAL + 200, versionController.currVersion());
} finally {
FileUtils.deleteDirectory(new File(tempFilePath));
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
similarity index 89%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionTest.java
rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
index 7687747..4135cfb 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class IoTDBDeletionTest {
+public class IoTDBDeletionIT {
private static IoTDB daemon;
private static String[] creationSqls = new String[]{
@@ -50,9 +50,9 @@ public class IoTDBDeletionTest {
"CREATE TIMESERIES root.vehicle.d0.s4 WITH DATATYPE=BOOLEAN, ENCODING=PLAIN",
};
- private static String intertTemplate = "INSERT INTO root.vehicle.d0(timestamp,s0,s1,s2,s3,s4"
+ private String insertTemplate = "INSERT INTO root.vehicle.d0(timestamp,s0,s1,s2,s3,s4"
+ ") VALUES(%d,%d,%d,%f,%s,%b)";
- private static String deleteAllTemplate = "DELETE FROM root.vehicle.d0 WHERE time <= 10000";
+ private String deleteAllTemplate = "DELETE FROM root.vehicle.d0 WHERE time <= 10000";
@BeforeClass
public static void setUp() throws Exception {
@@ -128,7 +128,7 @@ public class IoTDBDeletionTest {
}
}
- public static void prepareSeries() throws SQLException {
+ private static void prepareSeries() throws SQLException {
Connection connection = null;
try {
connection = DriverManager
@@ -148,7 +148,7 @@ public class IoTDBDeletionTest {
}
}
- public void prepareData() throws SQLException {
+ private void prepareData() throws SQLException {
Connection connection = null;
try {
connection = DriverManager
@@ -157,24 +157,24 @@ public class IoTDBDeletionTest {
Statement statement = connection.createStatement();
// prepare BufferWrite file
for (int i = 201; i <= 300; i++) {
- statement.execute(String.format(intertTemplate, i, i, i, (double) i, "\'" + i + "\'",
+ statement.execute(String.format(insertTemplate, i, i, i, (double) i, "\'" + i + "\'",
i % 2 == 0));
}
statement.execute("merge");
- // prepare Overflow file
+ // prepare Unseq-File
for (int i = 1; i <= 100; i++) {
- statement.execute(String.format(intertTemplate, i, i, i, (double) i, "\'" + i + "\'",
+ statement.execute(String.format(insertTemplate, i, i, i, (double) i, "\'" + i + "\'",
i % 2 == 0));
}
statement.execute("merge");
// prepare BufferWrite cache
for (int i = 301; i <= 400; i++) {
- statement.execute(String.format(intertTemplate, i, i, i, (double) i, "\'" + i + "\'",
+ statement.execute(String.format(insertTemplate, i, i, i, (double) i, "\'" + i + "\'",
i % 2 == 0));
}
// prepare Overflow cache
for (int i = 101; i <= 200; i++) {
- statement.execute(String.format(intertTemplate, i, i, i, (double) i, "\'" + i + "\'",
+ statement.execute(String.format(insertTemplate, i, i, i, (double) i, "\'" + i + "\'",
i % 2 == 0));
}
@@ -186,7 +186,7 @@ public class IoTDBDeletionTest {
}
}
- public void cleanData() throws SQLException {
+ private void cleanData() throws SQLException {
Connection connection = null;
try {
connection = DriverManager
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaData.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaData.java
index afe14d8..e1c2eee 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaData.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetaData.java
@@ -49,8 +49,10 @@ public class ChunkMetaData {
private TSDataType tsDataType;
- /** version is set according to its belonging ChunkGroup only when being queried, so it is not
- persisted.
+ /**
+ * version is used to define the order of operations(insertion, deletion, update).
+ * version is set according to its belonging ChunkGroup only when being queried, so it is not
+ * persisted.
*/
private long version;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java
index d531645..588b311 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReader.java
@@ -47,6 +47,10 @@ public abstract class ChunkReader {
private Filter filter;
private BatchData data;
+
+ /**
+ * Data whose timestamp <= deletedAt should be considered deleted(not be returned).
+ */
protected long deletedAt;
public ChunkReader(Chunk chunk) {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java
index 65fc63d..f42c8ae 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReader.java
@@ -107,7 +107,7 @@ public abstract class FileSeriesReader {
chunkLoader.close();
}
- protected ChunkMetaData nextChunkMeta() {
+ private ChunkMetaData nextChunkMeta() {
return chunkMetaDataList.get(chunkToRead++);
}
}
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 ee9a83a..8756329 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
@@ -73,6 +73,10 @@ public class TsFileWriter {
**/
private long recordCountForNextMemCheck = 100;
private long chunkGroupSizeThreshold;
+ /**
+ * In an individual TsFile, version number is not meaningful, added
+ * only for tests.
+ */
private long version = 0;
/**
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 f01a8c6..0287b82 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
@@ -138,21 +138,21 @@ public class TsFileIOWriter {
* @param statistics - statistic of the whole series
* @param maxTime - maximum timestamp of the whole series in this stage
* @param minTime - minimum timestamp of the whole series in this stage
- * @param datasize - the serialized size of all pages
+ * @param dataSize - the serialized size of all pages
* @return the serialized size of CHunkHeader
* @throws IOException if I/O error occurs
*/
public int startFlushChunk(MeasurementSchema descriptor, CompressionType compressionCodecName,
TSDataType tsDataType, TSEncoding encodingType, Statistics<?> statistics, long maxTime,
long minTime,
- int datasize, int numOfPages) throws IOException {
+ int dataSize, int numOfPages) throws IOException {
LOG.debug("start series chunk:{}, file position {}", descriptor, out.getPosition());
currentChunkMetaData = new ChunkMetaData(descriptor.getMeasurementId(), tsDataType,
out.getPosition(), minTime,
maxTime);
- ChunkHeader header = new ChunkHeader(descriptor.getMeasurementId(), datasize, tsDataType,
+ ChunkHeader header = new ChunkHeader(descriptor.getMeasurementId(), dataSize, tsDataType,
compressionCodecName,
encodingType, numOfPages);
header.serializeTo(out.wrapAsStream());