This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/fix_sonar in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7391f2b8f225fd9046c5bee6d90a52fab8e24180 Author: Beyyes <[email protected]> AuthorDate: Tue Jun 20 18:14:06 2023 +0800 fix code smells in tsfile/file --- .../db/metadata/utils/ResourceByPathUtils.java | 10 +++++----- .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 2 +- .../plan/node/source/AlignedLastQueryScanNode.java | 1 + .../apache/iotdb/db/tools/TsFileSketchTool.java | 4 ++-- .../iotdb/db/tools/TsFileSelfCheckToolTest.java | 2 +- .../org/apache/iotdb/tsfile/file/MetaMarker.java | 8 ++++++-- .../iotdb/tsfile/file/header/ChunkGroupHeader.java | 10 ++++++---- .../iotdb/tsfile/file/header/ChunkHeader.java | 23 +++++++++++++--------- .../iotdb/tsfile/file/header/PageHeader.java | 4 ++-- .../iotdb/tsfile/file/metadata/ChunkMetadata.java | 2 +- .../tsfile/file/metadata/ITimeSeriesMetadata.java | 8 +++++++- .../file/metadata/MetadataIndexConstructor.java | 4 +++- .../tsfile/file/metadata/MetadataIndexNode.java | 2 +- .../tsfile/file/metadata/TimeseriesMetadata.java | 15 +++++++------- .../iotdb/tsfile/file/metadata/TsFileMetadata.java | 4 +++- .../iotdb/tsfile/read/TsFileSequenceReader.java | 6 +++--- .../v2/file/metadata/TimeseriesMetadataV2.java | 4 ++-- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 2 +- .../tsfile/file/metadata/utils/TestHelper.java | 2 +- .../tsfile/write/TsFileIntegrityCheckingTool.java | 2 +- .../writer/TsFileIOWriterMemoryControlTest.java | 6 +++--- 21 files changed, 72 insertions(+), 49 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/utils/ResourceByPathUtils.java b/server/src/main/java/org/apache/iotdb/db/metadata/utils/ResourceByPathUtils.java index cd32e6715a1..5a6c07748af 100644 --- a/server/src/main/java/org/apache/iotdb/db/metadata/utils/ResourceByPathUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/utils/ResourceByPathUtils.java @@ -122,10 +122,10 @@ class AlignedResourceByPathUtils extends ResourceByPathUtils { timeTimeSeriesMetadata.setOffsetOfChunkMetaDataList(-1); timeTimeSeriesMetadata.setDataSizeOfChunkMetaDataList(-1); timeTimeSeriesMetadata.setMeasurementId(""); - timeTimeSeriesMetadata.setTSDataType(TSDataType.VECTOR); + timeTimeSeriesMetadata.setTsDataType(TSDataType.VECTOR); Statistics<? extends Serializable> timeStatistics = - Statistics.getStatsByType(timeTimeSeriesMetadata.getTSDataType()); + Statistics.getStatsByType(timeTimeSeriesMetadata.getTsDataType()); // init each value time series meta List<TimeseriesMetadata> valueTimeSeriesMetadataList = new ArrayList<>(); @@ -134,7 +134,7 @@ class AlignedResourceByPathUtils extends ResourceByPathUtils { valueMetadata.setOffsetOfChunkMetaDataList(-1); valueMetadata.setDataSizeOfChunkMetaDataList(-1); valueMetadata.setMeasurementId(valueChunkMetadata.getMeasurementId()); - valueMetadata.setTSDataType(valueChunkMetadata.getType()); + valueMetadata.setTsDataType(valueChunkMetadata.getType()); valueMetadata.setStatistics(Statistics.getStatsByType(valueChunkMetadata.getType())); valueTimeSeriesMetadataList.add(valueMetadata); } @@ -316,12 +316,12 @@ class MeasurementResourceByPathUtils extends ResourceByPathUtils { throws IOException { TimeseriesMetadata timeSeriesMetadata = new TimeseriesMetadata(); timeSeriesMetadata.setMeasurementId(partialPath.getMeasurementSchema().getMeasurementId()); - timeSeriesMetadata.setTSDataType(partialPath.getMeasurementSchema().getType()); + timeSeriesMetadata.setTsDataType(partialPath.getMeasurementSchema().getType()); timeSeriesMetadata.setOffsetOfChunkMetaDataList(-1); timeSeriesMetadata.setDataSizeOfChunkMetaDataList(-1); Statistics<? extends Serializable> seriesStatistics = - Statistics.getStatsByType(timeSeriesMetadata.getTSDataType()); + Statistics.getStatsByType(timeSeriesMetadata.getTsDataType()); // flush chunkMetadataList one by one for (IChunkMetadata chunkMetadata : chunkMetadataList) { seriesStatistics.mergeStatistics(chunkMetadata.getStatistics()); diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java index 1077f471912..33ae562110f 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java @@ -2417,7 +2417,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext> List<TimeseriesMetadata> timeseriesMetadataList = entry.getValue(); boolean isAligned = false; for (TimeseriesMetadata timeseriesMetadata : timeseriesMetadataList) { - TSDataType dataType = timeseriesMetadata.getTSDataType(); + TSDataType dataType = timeseriesMetadata.getTsDataType(); if (!dataType.equals(TSDataType.VECTOR)) { Pair<CompressionType, TSEncoding> pair = reader.readTimeseriesCompressionTypeAndEncoding(timeseriesMetadata); diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedLastQueryScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedLastQueryScanNode.java index aba8eb426ed..7b10bb1925b 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedLastQueryScanNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedLastQueryScanNode.java @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.iotdb.db.mpp.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; diff --git a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java index a55d23af414..0a9d5bf4e5d 100644 --- a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java +++ b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java @@ -388,7 +388,7 @@ public class TsFileSketchTool { + "|\t[TimeseriesIndex] of " + entry.getValue().left + ", tsDataType:" - + entry.getValue().right.getTSDataType() + + entry.getValue().right.getTsDataType() + ", " + entry.getValue().right.getStatistics()); for (IChunkMetadata chunkMetadata : reader.getChunkMetadataList(entry.getValue().left)) { @@ -415,7 +415,7 @@ public class TsFileSketchTool { + "|\t[TimeseriesIndex] of " + timeseriesMetadata.left + ", tsDataType:" - + timeseriesMetadata.right.getTSDataType() + + timeseriesMetadata.right.getTsDataType() + ", " + timeseriesMetadata.right.getStatistics()); for (IChunkMetadata chunkMetadata : reader.getChunkMetadataList(timeseriesMetadata.left)) { diff --git a/server/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java b/server/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java index a8cbfcef5ec..e05db910bb0 100644 --- a/server/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java +++ b/server/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java @@ -165,7 +165,7 @@ public class TsFileSelfCheckToolTest { ByteArrayOutputStream bo = new ByteArrayOutputStream(); int serialLength = ReadWriteIOUtils.write(timeseriesMetadata.getTimeSeriesMetadataType(), bo); serialLength += ReadWriteIOUtils.writeVar(timeseriesMetadata.getMeasurementId(), bo); - serialLength += ReadWriteIOUtils.write(timeseriesMetadata.getTSDataType(), bo); + serialLength += ReadWriteIOUtils.write(timeseriesMetadata.getTsDataType(), bo); serialLength += ReadWriteForEncodingUtils.writeUnsignedVarInt( timeseriesMetadata.getDataSizeOfChunkMetaDataList(), bo); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java index 35d2fe0661d..265717cb991 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/MetaMarker.java @@ -28,13 +28,17 @@ import java.io.IOException; public class MetaMarker { public static final byte CHUNK_GROUP_HEADER = 0; + /** Chunk header marker and this chunk has more than one page. */ public static final byte CHUNK_HEADER = 1; public static final byte SEPARATOR = 2; + /** - * @deprecated (Since TsFile version 3, the marker VERSION is no longer used in TsFile. It should - * be removed when TsFile upgrade to version 4) + * Since TsFile version 3, the marker VERSION is no longer used in TsFile. It should be removed + * when TsFile upgrade to version 4. + * + * @deprecated variable */ @Deprecated public static final byte VERSION = 3; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkGroupHeader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkGroupHeader.java index dc57d1c1213..2ccc1e2f717 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkGroupHeader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkGroupHeader.java @@ -48,6 +48,10 @@ public class ChunkGroupHeader { this.serializedSize = getSerializedSize(deviceID); } + public int getSerializedSize() { + return serializedSize; + } + private int getSerializedSize(String deviceID) { int length = deviceID.getBytes(TSFileConfig.STRING_CHARSET).length; return Byte.BYTES + ReadWriteForEncodingUtils.varIntSize(length) + length; @@ -57,6 +61,7 @@ public class ChunkGroupHeader { * deserialize from inputStream. * * @param markerRead Whether the marker of the CHUNK_GROUP_HEADER is read ahead. + * @throws IOException exception in the process of reading file. */ public static ChunkGroupHeader deserializeFrom(InputStream inputStream, boolean markerRead) throws IOException { @@ -75,6 +80,7 @@ public class ChunkGroupHeader { * deserialize from TsFileInput. * * @param markerRead Whether the marker of the CHUNK_GROUP_HEADER is read ahead. + * @throws IOException exception in the process of reading file. */ public static ChunkGroupHeader deserializeFrom(TsFileInput input, long offset, boolean markerRead) throws IOException { @@ -86,10 +92,6 @@ public class ChunkGroupHeader { return new ChunkGroupHeader(deviceID); } - public int getSerializedSize() { - return serializedSize; - } - public String getDeviceID() { return deviceID; } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java index 02763f38cdd..b6ffc7b85c6 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java @@ -122,7 +122,7 @@ public class ChunkHeader { this.serializedSize = headerSize; } - /** the exact serialized size of chunk header */ + /** the exact serialized size of chunk header. */ public static int getSerializedSize(String measurementID, int dataSize) { int measurementIdLength = measurementID == null ? 0 : measurementID.getBytes(TSFileConfig.STRING_CHARSET).length; @@ -152,7 +152,16 @@ public class ChunkHeader { + TSEncoding.getSerializedSize(); // encodingType } - /** deserialize from inputStream, the marker has already been read. */ + public int getSerializedSize() { + return serializedSize; + } + + /** + * deserialize from inputStream, the marker has already been read. + * + * @return ChunkHeader the ChunkHeader read from inputStream + * @throws IOException exception when reading stream + */ public static ChunkHeader deserializeFrom(InputStream inputStream, byte chunkType) throws IOException { // read measurementID @@ -199,9 +208,9 @@ public class ChunkHeader { * TsFileSequenceReader#readTimeseriesCompressionTypeAndEncoding(TimeseriesMetadata)} to only * decode data size, {@link CompressionType} and {@link TSEncoding}. * - * @param inputStream - * @return - * @throws IOException + * @param inputStream input stream + * @return Pair<CompressionType, TSEncoding> compression type and encoding + * @throws IOException exception when reading stream */ public static Pair<CompressionType, TSEncoding> deserializeCompressionTypeAndEncoding( InputStream inputStream) throws IOException { @@ -212,10 +221,6 @@ public class ChunkHeader { return new Pair<>(type, encoding); } - public int getSerializedSize() { - return serializedSize; - } - public String getMeasurementID() { return measurementID; } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java index 9ab5ea6f997..bc8b142d2c7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/PageHeader.java @@ -43,7 +43,7 @@ public class PageHeader { this.statistics = statistics; } - /** max page header size without statistics */ + /** max page header size without statistics. */ public static int estimateMaxPageHeaderSizeWithoutStatistics() { // uncompressedSize, compressedSize // because we use unsigned varInt to encode these two integer, @@ -145,7 +145,7 @@ public class PageHeader { this.modified = modified; } - /** max page header size without statistics */ + /** max page header size without statistics. */ public int getSerializedPageSize() { if (uncompressedSize == 0) { // Empty page return ReadWriteForEncodingUtils.uVarIntSize(uncompressedSize); 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 00b67b57a4c..312f83a84fa 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 @@ -190,7 +190,7 @@ public class ChunkMetadata implements IChunkMetadata { ChunkMetadata chunkMetaData = new ChunkMetadata(); chunkMetaData.measurementUid = timeseriesMetadata.getMeasurementId(); - chunkMetaData.tsDataType = timeseriesMetadata.getTSDataType(); + chunkMetaData.tsDataType = timeseriesMetadata.getTsDataType(); chunkMetaData.offsetOfChunkHeader = ReadWriteIOUtils.readLong(buffer); // if the TimeSeriesMetadataType is not 0, it means it has more than one chunk // and each chunk's metadata has its own statistics diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ITimeSeriesMetadata.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ITimeSeriesMetadata.java index e7b85489460..7a6fb975fd7 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ITimeSeriesMetadata.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ITimeSeriesMetadata.java @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.iotdb.tsfile.file.metadata; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; @@ -36,7 +37,12 @@ public interface ITimeSeriesMetadata { void setSeq(boolean seq); - /** @return the result has already been filtered by modification files */ + /** + * Return the result has already been filtered by modification files. + * + * @return List<IChunkMetadata> list of ChunkMetadata + * @throws IOException exception when reading files + */ List<IChunkMetadata> loadChunkMetadataList() throws IOException; void setChunkMetadataLoader(IChunkMetadataLoader chunkMetadataLoader); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java index 44cdc8b0bf4..22b10264987 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java @@ -41,10 +41,11 @@ public class MetadataIndexConstructor { } /** - * Construct metadata index tree + * Construct metadata index tree. * * @param deviceTimeseriesMetadataMap device => TimeseriesMetadata list * @param out tsfile output + * @throws IOException exception when operating stream */ @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning public static MetadataIndexNode constructMetadataIndex( @@ -127,6 +128,7 @@ public class MetadataIndexConstructor { * @param metadataIndexNodeQueue queue of metadataIndexNode * @param out tsfile output * @param type MetadataIndexNode type + * @throws IOException exception when operating stream */ public static MetadataIndexNode generateRootNode( Queue<MetadataIndexNode> metadataIndexNodeQueue, TsFileOutput out, MetadataIndexNodeType type) diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java index 1d3972cafe4..78fa93c7230 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java @@ -38,7 +38,7 @@ public class MetadataIndexNode { private final List<MetadataIndexEntry> children; private long endOffset; - /** type of the child node at offset */ + /** type of the child node at offset. */ private final MetadataIndexNodeType nodeType; public MetadataIndexNode(MetadataIndexNodeType nodeType) { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java index 2b010e25f6e..dd50671921d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java @@ -37,11 +37,12 @@ import java.util.stream.Collectors; public class TimeseriesMetadata implements ITimeSeriesMetadata { - /** used for old version tsfile */ + /** used for old version tsfile. */ private long startOffsetOfChunkMetaDataList; + /** * 0 means this time series has only one chunk, no need to save the statistic again in chunk - * metadata; + * metadata. * * <p>1 means this time series has more than one chunk, should save the statistic again in chunk * metadata; @@ -103,7 +104,7 @@ public class TimeseriesMetadata implements ITimeSeriesMetadata { TimeseriesMetadata timeseriesMetaData = new TimeseriesMetadata(); timeseriesMetaData.setTimeSeriesMetadataType(ReadWriteIOUtils.readByte(buffer)); timeseriesMetaData.setMeasurementId(ReadWriteIOUtils.readVarIntString(buffer)); - timeseriesMetaData.setTSDataType(ReadWriteIOUtils.readDataType(buffer)); + timeseriesMetaData.setTsDataType(ReadWriteIOUtils.readDataType(buffer)); int chunkMetaDataListDataSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer); timeseriesMetaData.setDataSizeOfChunkMetaDataList(chunkMetaDataListDataSize); timeseriesMetaData.setStatistics(Statistics.deserialize(buffer, timeseriesMetaData.dataType)); @@ -137,7 +138,7 @@ public class TimeseriesMetadata implements ITimeSeriesMetadata { TimeseriesMetadata timeseriesMetaData = new TimeseriesMetadata(); timeseriesMetaData.setMeasurementId(measurementID); timeseriesMetaData.setTimeSeriesMetadataType(timeseriesType); - timeseriesMetaData.setTSDataType(tsDataType); + timeseriesMetaData.setTsDataType(tsDataType); timeseriesMetaData.setDataSizeOfChunkMetaDataList(chunkMetaDataListDataSize); timeseriesMetaData.setStatistics(statistics); @@ -209,11 +210,11 @@ public class TimeseriesMetadata implements ITimeSeriesMetadata { this.chunkMetaDataListDataSize = size; } - public TSDataType getTSDataType() { + public TSDataType getTsDataType() { return dataType; } - public void setTSDataType(TSDataType tsDataType) { + public void setTsDataType(TSDataType tsDataType) { this.dataType = tsDataType; } @@ -275,7 +276,7 @@ public class TimeseriesMetadata implements ITimeSeriesMetadata { } // For reading version-2 only - public void setChunkMetadataList(ArrayList<ChunkMetadata> chunkMetadataList) { + public void setChunkMetadataList(List<ChunkMetadata> chunkMetadataList) { this.chunkMetadataList = new ArrayList<>(chunkMetadataList); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadata.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadata.java index f6f974fc1ad..e34caf38b96 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadata.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadata.java @@ -82,6 +82,7 @@ public class TsFileMetadata { * * @param outputStream -output stream to determine byte length * @return -byte length + * @throws IOException error when operating outputStream */ public int serializeTo(OutputStream outputStream) throws IOException { int byteLen = 0; @@ -104,6 +105,7 @@ public class TsFileMetadata { * * @param outputStream -output stream to determine byte length * @return -byte length + * @throws IOException error when operating outputStream */ public int buildAndSerializeBloomFilter(OutputStream outputStream, Set<Path> paths) throws IOException { @@ -125,7 +127,7 @@ public class TsFileMetadata { } /** - * build bloom filter + * build bloom filter. * * @return bloom filter */ diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java index 8e760edaef4..15a46a4748d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java @@ -1808,7 +1808,7 @@ public class TsFileSequenceReader implements AutoCloseable { } for (Map.Entry<Long, Pair<Path, TimeseriesMetadata>> entry : timeseriesMetadataMap.entrySet()) { TimeseriesMetadata timeseriesMetadata = entry.getValue().right; - TSDataType dataType = timeseriesMetadata.getTSDataType(); + TSDataType dataType = timeseriesMetadata.getTsDataType(); Statistics<? extends Serializable> timeseriesMetadataSta = timeseriesMetadata.getStatistics(); Statistics<? extends Serializable> chunkMetadatasSta = Statistics.getStatsByType(dataType); for (IChunkMetadata chunkMetadata : getChunkMetadataList(entry.getValue().left)) { @@ -2043,7 +2043,7 @@ public class TsFileSequenceReader implements AutoCloseable { for (String device : getAllDevices()) { Map<String, TimeseriesMetadata> timeseriesMetadataMap = readDeviceMetadata(device); for (TimeseriesMetadata timeseriesMetadata : timeseriesMetadataMap.values()) { - result.put(timeseriesMetadata.getMeasurementId(), timeseriesMetadata.getTSDataType()); + result.put(timeseriesMetadata.getMeasurementId(), timeseriesMetadata.getTsDataType()); } } return result; @@ -2061,7 +2061,7 @@ public class TsFileSequenceReader implements AutoCloseable { for (TimeseriesMetadata timeseriesMetadata : timeseriesMetadataMap.values()) { result.put( device + TsFileConstant.PATH_SEPARATOR + timeseriesMetadata.getMeasurementId(), - timeseriesMetadata.getTSDataType()); + timeseriesMetadata.getTsDataType()); } } return result; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/TimeseriesMetadataV2.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/TimeseriesMetadataV2.java index 9791e332ffd..accb4833500 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/TimeseriesMetadataV2.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/file/metadata/TimeseriesMetadataV2.java @@ -32,12 +32,12 @@ public class TimeseriesMetadataV2 { public static TimeseriesMetadata deserializeFrom(ByteBuffer buffer) { TimeseriesMetadata timeseriesMetaData = new TimeseriesMetadata(); timeseriesMetaData.setMeasurementId(ReadWriteIOUtils.readString(buffer)); - timeseriesMetaData.setTSDataType( + timeseriesMetaData.setTsDataType( TSDataType.deserialize((byte) ReadWriteIOUtils.readShort(buffer))); timeseriesMetaData.setOffsetOfChunkMetaDataList(ReadWriteIOUtils.readLong(buffer)); timeseriesMetaData.setDataSizeOfChunkMetaDataList(ReadWriteIOUtils.readInt(buffer)); timeseriesMetaData.setStatistics( - StatisticsV2.deserialize(buffer, timeseriesMetaData.getTSDataType())); + StatisticsV2.deserialize(buffer, timeseriesMetaData.getTsDataType())); return timeseriesMetaData; } } 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 e62aeb40c7e..237a76a10a9 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 @@ -414,7 +414,7 @@ public class TsFileIOWriter implements AutoCloseable { addCurrentIndexNodeToQueue(currentIndexNode, measurementMetadataIndexQueue, out); currentIndexNode = new MetadataIndexNode(MetadataIndexNodeType.LEAF_MEASUREMENT); } - if (timeseriesMetadata.getTSDataType() != TSDataType.VECTOR) { + if (timeseriesMetadata.getTsDataType() != TSDataType.VECTOR) { currentIndexNode.addEntry( new MetadataIndexEntry(currentPath.getMeasurement(), out.getPosition())); } else { diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java index 657d73b5ea2..b2d4732ea5d 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java @@ -59,7 +59,7 @@ public class TestHelper { statistics.setEmpty(false); TimeseriesMetadata timeseriesMetaData = new TimeseriesMetadata(); timeseriesMetaData.setMeasurementId(measurementuid); - timeseriesMetaData.setTSDataType(PageHeaderTest.DATA_TYPE); + timeseriesMetaData.setTsDataType(PageHeaderTest.DATA_TYPE); timeseriesMetaData.setOffsetOfChunkMetaDataList(1000L); timeseriesMetaData.setDataSizeOfChunkMetaDataList(0); timeseriesMetaData.setChunkMetadataListBuffer(new PublicBAOS()); diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIntegrityCheckingTool.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIntegrityCheckingTool.java index c97a9a07742..be55f4a0449 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIntegrityCheckingTool.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIntegrityCheckingTool.java @@ -170,7 +170,7 @@ public class TsFileIntegrityCheckingTool { List<TimeseriesMetadata> timeseriesMetadataList = entry.getValue(); boolean vectorMode = false; if (timeseriesMetadataList.size() > 0 - && timeseriesMetadataList.get(0).getTSDataType() != TSDataType.VECTOR) { + && timeseriesMetadataList.get(0).getTsDataType() != TSDataType.VECTOR) { Assert.assertEquals(originData.get(deviceId).size(), timeseriesMetadataList.size()); } else { vectorMode = true; diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java index 2152318cc89..835dd86aa11 100644 --- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java +++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriterMemoryControlTest.java @@ -137,7 +137,7 @@ public class TsFileIOWriterMemoryControlTest { TimeseriesMetadata timeseriesMetadata = timeseriesMetadataPair.right; Assert.assertEquals(sortedSeriesId.get(i % 5), timeseriesMetadata.getMeasurementId()); Assert.assertEquals( - originChunkMetadataList.get(i).getDataType(), timeseriesMetadata.getTSDataType()); + originChunkMetadataList.get(i).getDataType(), timeseriesMetadata.getTsDataType()); Assert.assertEquals( originChunkMetadataList.get(i).getStatistics(), timeseriesMetadata.getStatistics()); } @@ -175,7 +175,7 @@ public class TsFileIOWriterMemoryControlTest { TimeseriesMetadata timeseriesMetadata = timeseriesMetadataPair.right; Assert.assertEquals(measurementIds.get(i), fullPath); Assert.assertEquals( - originChunkMetadataList.get(i).getDataType(), timeseriesMetadata.getTSDataType()); + originChunkMetadataList.get(i).getDataType(), timeseriesMetadata.getTsDataType()); Assert.assertEquals( originChunkMetadataList.get(i).getStatistics(), timeseriesMetadata.getStatistics()); } @@ -238,7 +238,7 @@ public class TsFileIOWriterMemoryControlTest { Assert.assertEquals(seriesIds.get(i), timeseriesMetadataPair.left.getFullPath()); Assert.assertEquals( originChunkMetadataList.get(i).getDataType(), - timeseriesMetadataPair.right.getTSDataType()); + timeseriesMetadataPair.right.getTsDataType()); Assert.assertEquals( originChunkMetadataList.get(i).getStatistics(), timeseriesMetadataPair.right.getStatistics());
