This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch TYQuery in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e086a997803d63fa23d2fb43979d57c76ea68ae7 Author: JackieTien97 <[email protected]> AuthorDate: Fri Mar 12 09:03:17 2021 +0800 add license --- .../MeasurementChunkMetadataListMapIteratorTest.java | 20 ++++++++++---------- .../tsfile/read/controller/ChunkLoaderTest.java | 7 ++++--- .../apache/iotdb/tsfile/read/reader/ReaderTest.java | 6 +++--- .../iotdb/tsfile/write/writer/TestTsFileOutput.java | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java index 3083544..e2d27aa 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/MeasurementChunkMetadataListMapIteratorTest.java @@ -21,7 +21,7 @@ package org.apache.iotdb.tsfile.read; import org.apache.iotdb.tsfile.common.conf.TSFileConfig; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; +import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.utils.FileGenerator; @@ -105,7 +105,7 @@ public class MeasurementChunkMetadataListMapIteratorTest { List<String> devices = fileReader.getAllDevices(); - Map<String, Map<String, List<ChunkMetadata>>> expectedDeviceMeasurementChunkMetadataListMap = + Map<String, Map<String, List<IChunkMetadata>>> expectedDeviceMeasurementChunkMetadataListMap = new HashMap<>(); for (String device : devices) { for (String measurement : deviceMeasurementListMap.get(device)) { @@ -117,15 +117,15 @@ public class MeasurementChunkMetadataListMapIteratorTest { } for (String device : devices) { - Map<String, List<ChunkMetadata>> expected = + Map<String, List<IChunkMetadata>> expected = expectedDeviceMeasurementChunkMetadataListMap.get(device); - Map<String, List<ChunkMetadata>> actual = new HashMap<>(); - Iterator<Map<String, List<ChunkMetadata>>> iterator = + Map<String, List<IChunkMetadata>> actual = new HashMap<>(); + Iterator<Map<String, List<IChunkMetadata>>> iterator = fileReader.getMeasurementChunkMetadataListMapIterator(device); while (iterator.hasNext()) { - Map<String, List<ChunkMetadata>> next = iterator.next(); - for (Entry<String, List<ChunkMetadata>> entry : next.entrySet()) { + Map<String, List<IChunkMetadata>> next = iterator.next(); + for (Entry<String, List<IChunkMetadata>> entry : next.entrySet()) { actual.computeIfAbsent(entry.getKey(), m -> new ArrayList<>()).addAll(entry.getValue()); } } @@ -138,11 +138,11 @@ public class MeasurementChunkMetadataListMapIteratorTest { } private void check( - Map<String, List<ChunkMetadata>> expected, Map<String, List<ChunkMetadata>> actual) { + Map<String, List<IChunkMetadata>> expected, Map<String, List<IChunkMetadata>> actual) { Assert.assertEquals(expected.keySet(), actual.keySet()); for (String measurement : expected.keySet()) { - List<ChunkMetadata> expectedChunkMetadataList = expected.get(measurement); - List<ChunkMetadata> actualChunkMetadataList = actual.get(measurement); + List<IChunkMetadata> expectedChunkMetadataList = expected.get(measurement); + List<IChunkMetadata> actualChunkMetadataList = actual.get(measurement); Assert.assertEquals(expectedChunkMetadataList.size(), actualChunkMetadataList.size()); final int size = expectedChunkMetadataList.size(); for (int i = 0; i < size; ++i) { diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java index 6d4f2ce..a510101 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/ChunkLoaderTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.tsfile.read.controller; import org.apache.iotdb.tsfile.file.header.ChunkHeader; import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; +import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; import org.apache.iotdb.tsfile.read.TsFileSequenceReader; import org.apache.iotdb.tsfile.read.common.Chunk; import org.apache.iotdb.tsfile.read.common.Path; @@ -53,12 +54,12 @@ public class ChunkLoaderTest { public void test() throws IOException { fileReader = new TsFileSequenceReader(FILE_PATH); MetadataQuerierByFileImpl metadataQuerierByFile = new MetadataQuerierByFileImpl(fileReader); - List<ChunkMetadata> chunkMetadataList = + List<IChunkMetadata> chunkMetadataList = metadataQuerierByFile.getChunkMetaDataList(new Path("d2", "s1")); CachedChunkLoaderImpl seriesChunkLoader = new CachedChunkLoaderImpl(fileReader); - for (ChunkMetadata chunkMetaData : chunkMetadataList) { - Chunk chunk = seriesChunkLoader.loadChunk(chunkMetaData); + for (IChunkMetadata chunkMetaData : chunkMetadataList) { + Chunk chunk = seriesChunkLoader.loadChunk((ChunkMetadata) chunkMetaData); ChunkHeader chunkHeader = chunk.getHeader(); Assert.assertEquals(chunkHeader.getDataSize(), chunk.getData().remaining()); } diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java index 4d17b2b..c4abefd 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/ReaderTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.tsfile.read.reader; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; +import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; import org.apache.iotdb.tsfile.read.TsFileSequenceReader; import org.apache.iotdb.tsfile.read.common.BatchData; import org.apache.iotdb.tsfile.read.common.Path; @@ -71,7 +71,7 @@ public class ReaderTest { public void readTest() throws IOException { int count = 0; CachedChunkLoaderImpl seriesChunkLoader = new CachedChunkLoaderImpl(fileReader); - List<ChunkMetadata> chunkMetadataList = + List<IChunkMetadata> chunkMetadataList = metadataQuerierByFile.getChunkMetaDataList(new Path("d1", "s1")); AbstractFileSeriesReader seriesReader = @@ -107,7 +107,7 @@ public class ReaderTest { @Test public void readWithFilterTest() throws IOException { CachedChunkLoaderImpl seriesChunkLoader = new CachedChunkLoaderImpl(fileReader); - List<ChunkMetadata> chunkMetadataList = + List<IChunkMetadata> chunkMetadataList = metadataQuerierByFile.getChunkMetaDataList(new Path("d1", "s1")); Filter filter = diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java index df46b6f..f61541e 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java @@ -1,3 +1,21 @@ +/* + * 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 org.apache.iotdb.tsfile.utils.PublicBAOS;
