You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2020/04/13 13:54:23 UTC
[incubator-iotdb] branch force_append created (now 7c5a966)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch force_append
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 7c5a966 fix ForceAppendTsFileWriter
This branch includes the following new commits:
new 7c5a966 fix ForceAppendTsFileWriter
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: fix ForceAppendTsFileWriter
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch force_append
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 7c5a966ee1294e42bcaa66068c719e1a181fcee3
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Apr 13 21:53:33 2020 +0800
fix ForceAppendTsFileWriter
---
.../write/writer/ForceAppendTsFileWriter.java | 14 +++--
.../write/writer/ForceAppendTsFileWriterTest.java | 61 ++++++++++++++++++++++
2 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java
index d1b0114..a8627d6 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Map;
import org.apache.iotdb.tsfile.exception.write.TsFileNotCompleteException;
+import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata;
import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata;
import org.apache.iotdb.tsfile.read.TsFileSequenceReader;
import org.apache.iotdb.tsfile.utils.Pair;
@@ -60,13 +61,16 @@ public class ForceAppendTsFileWriter extends TsFileIOWriter {
}
TsFileMetadata tsFileMetadata = reader.readFileMetadata();
Map<String, Pair<Long, Integer>> deviceMap = tsFileMetadata.getDeviceMetadataIndex();
- long firstDeviceMetaPos = Long.MAX_VALUE;
- for (Pair<Long, Integer> deviceMetadataIndex : deviceMap.values()) {
- firstDeviceMetaPos = firstDeviceMetaPos > deviceMetadataIndex.left ?
- deviceMetadataIndex.left : firstDeviceMetaPos;
+ long firstChunkMetaPos = Long.MAX_VALUE;
+ for (String deviceId : deviceMap.keySet()) {
+ Map<String, TimeseriesMetadata> deviceMetadata = reader.readDeviceMetadata(deviceId);
+ for (TimeseriesMetadata timeseriesMetadata : deviceMetadata.values()) {
+ firstChunkMetaPos = firstChunkMetaPos > timeseriesMetadata.getOffsetOfChunkMetaDataList() ?
+ timeseriesMetadata.getOffsetOfChunkMetaDataList() : firstChunkMetaPos;
+ }
}
// truncate metadata and marker
- truncatePosition = firstDeviceMetaPos - 1;
+ truncatePosition = firstChunkMetaPos - 1;
}
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java
new file mode 100644
index 0000000..5d13906
--- /dev/null
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.tsfile.write.writer;
+
+import static org.junit.Assert.assertEquals;
+import java.io.File;
+
+import org.apache.iotdb.tsfile.constant.TestConstant;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
+import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
+import org.apache.iotdb.tsfile.fileSystem.fsFactory.FSFactory;
+import org.apache.iotdb.tsfile.read.common.Path;
+import org.apache.iotdb.tsfile.write.TsFileWriter;
+import org.apache.iotdb.tsfile.write.record.TSRecord;
+import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+import org.junit.Test;
+
+public class ForceAppendTsFileWriterTest {
+ private static final String FILE_NAME = TestConstant.BASE_OUTPUT_PATH.concat("test.ts");
+ private static FSFactory fsFactory = FSFactoryProducer.getFSFactory();
+
+ @Test
+ public void test() throws Exception {
+ File file = fsFactory.getFile(FILE_NAME);
+ TsFileWriter writer = new TsFileWriter(file);
+ writer.registerTimeseries(new Path("d1.s1"),
+ new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ writer.registerTimeseries(new Path("d1.s2"),
+ new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ writer.write(new TSRecord(1, "d1").addTuple(new FloatDataPoint("s1", 5))
+ .addTuple(new FloatDataPoint("s2", 4)));
+ writer.write(new TSRecord(2, "d1").addTuple(new FloatDataPoint("s1", 5))
+ .addTuple(new FloatDataPoint("s2", 4)));
+ writer.flushAllChunkGroups();
+
+ long firstMetadataPosition = writer.getIOWriter().getPos();
+ writer.close();
+ ForceAppendTsFileWriter fwriter = new ForceAppendTsFileWriter(file);
+ assertEquals(firstMetadataPosition, fwriter.getTruncatePosition());
+
+ }
+
+}