Skip to content

Add TsFileLastReader for retrieving last points in a TsFile #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jt2594838 merged 8 commits into from
May 23, 2025
Merged

Add TsFileLastReader for retrieving last points in a TsFile #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3b389a7
Add TsFileLastReader for retrieving last points in a TsFile
jt2594838 May 20, 2025
c29178f
Fix query last of blob series
jt2594838 May 21, 2025
cf421a5
spotless
jt2594838 May 21, 2025
a8af4b5
fix series with empty chunk
jt2594838 May 22, 2025
14b2085
fix test name
jt2594838 May 22, 2025
ba0e578
reduce test scale
jt2594838 May 22, 2025
2de89a0
fix last empty page
jt2594838 May 22, 2025
487688d
add ignore blob
jt2594838 May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>tsfile-cpp</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion java/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
<name>TsFile: Java: Common</name>
Expand Down
4 changes: 2 additions & 2 deletions java/examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>examples</artifactId>
<name>TsFile: Java: Examples</name>
Expand All @@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>tsfile-java</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TsFile: Java</name>
<modules>
Expand Down
6 changes: 3 additions & 3 deletions java/tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>tools</artifactId>
<name>TsFile: Java: Tools</name>
<dependencies>
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>common</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand All @@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down
4 changes: 2 additions & 2 deletions java/tsfile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>tsfile</artifactId>
<name>TsFile: Java: TsFile</name>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>common</artifactId>
<version>2.1.0-250325-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
Expand Down
31 changes: 28 additions & 3 deletions java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TimeseriesMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,20 @@ public TimeseriesMetadata(TimeseriesMetadata timeseriesMetadata) {
}

public static TimeseriesMetadata deserializeFrom(ByteBuffer buffer, boolean needChunkMetadata) {
return deserializeFrom(buffer, needChunkMetadata, needChunkMetadata);
}

public static TimeseriesMetadata deserializeFrom(
ByteBuffer buffer, boolean needChunkMetadataForNonBlob, boolean needChunkMetadataForBlob) {
TimeseriesMetadata timeseriesMetaData = new TimeseriesMetadata();
timeseriesMetaData.setTimeSeriesMetadataType(ReadWriteIOUtils.readByte(buffer));
timeseriesMetaData.setMeasurementId(ReadWriteIOUtils.readVarIntString(buffer));
timeseriesMetaData.setTsDataType(ReadWriteIOUtils.readDataType(buffer));
int chunkMetaDataListDataSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer);
timeseriesMetaData.setDataSizeOfChunkMetaDataList(chunkMetaDataListDataSize);
timeseriesMetaData.setStatistics(Statistics.deserialize(buffer, timeseriesMetaData.dataType));
if (needChunkMetadata) {
if ((timeseriesMetaData.getTsDataType() != TSDataType.BLOB && needChunkMetadataForNonBlob)
|| (timeseriesMetaData.getTsDataType() == TSDataType.BLOB && needChunkMetadataForBlob)) {
ByteBuffer byteBuffer = buffer.slice();
byteBuffer.limit(chunkMetaDataListDataSize);
timeseriesMetaData.chunkMetadataList = new ArrayList<>();
Expand All @@ -145,6 +151,14 @@ public static TimeseriesMetadata deserializeFrom(ByteBuffer buffer, boolean need

public static TimeseriesMetadata deserializeFrom(
TsFileInput tsFileInput, boolean needChunkMetadata) throws IOException {
return deserializeFrom(tsFileInput, needChunkMetadata, needChunkMetadata);
}

public static TimeseriesMetadata deserializeFrom(
TsFileInput tsFileInput,
boolean needChunkMetadataForNonBlob,
boolean needChunkMetadataForBlob)
throws IOException {
InputStream inputStream = tsFileInput.wrapAsInputStream();
TimeseriesMetadata timeseriesMetaData = new TimeseriesMetadata();
timeseriesMetaData.setTimeSeriesMetadataType(ReadWriteIOUtils.readByte(inputStream));
Expand All @@ -155,7 +169,8 @@ public static TimeseriesMetadata deserializeFrom(
timeseriesMetaData.setStatistics(
Statistics.deserialize(inputStream, timeseriesMetaData.dataType));
long startOffset = tsFileInput.position();
if (needChunkMetadata) {
if ((timeseriesMetaData.getTsDataType() != TSDataType.BLOB && needChunkMetadataForNonBlob)
|| (timeseriesMetaData.getTsDataType() == TSDataType.BLOB && needChunkMetadataForBlob)) {
timeseriesMetaData.chunkMetadataList = new ArrayList<>();
while (tsFileInput.position() < startOffset + chunkMetaDataListDataSize) {
timeseriesMetaData.chunkMetadataList.add(
Expand All @@ -175,6 +190,14 @@ public static TimeseriesMetadata deserializeFrom(
*/
public static TimeseriesMetadata deserializeFrom(
ByteBuffer buffer, Set<String> excludedMeasurements, boolean needChunkMetadata) {
return deserializeFrom(buffer, excludedMeasurements, needChunkMetadata, needChunkMetadata);
}

public static TimeseriesMetadata deserializeFrom(
ByteBuffer buffer,
Set<String> excludedMeasurements,
boolean needChunkMetadataForNonBlob,
boolean needChunkMetadataForBlob) {
byte timeseriesType = ReadWriteIOUtils.readByte(buffer);
String measurementID = ReadWriteIOUtils.readVarIntString(buffer);
TSDataType tsDataType = ReadWriteIOUtils.readDataType(buffer);
Expand All @@ -188,7 +211,9 @@ public static TimeseriesMetadata deserializeFrom(
timeseriesMetaData.setDataSizeOfChunkMetaDataList(chunkMetaDataListDataSize);
timeseriesMetaData.setStatistics(statistics);

if (!excludedMeasurements.contains(measurementID) && needChunkMetadata) {
if (!excludedMeasurements.contains(measurementID)
&& ((tsDataType != TSDataType.BLOB && needChunkMetadataForNonBlob)
|| (tsDataType == TSDataType.BLOB && needChunkMetadataForBlob))) {
// measurement is not in the excluded set and need chunk metadata
ByteBuffer byteBuffer = buffer.slice();
byteBuffer.limit(chunkMetaDataListDataSize);
Expand Down
8 changes: 4 additions & 4 deletions java/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/TimeStatistics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,22 @@ public void update(long[] time, int batchSize, int arrayOffset) {

@Override
public Long getMinValue() {
throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, TIME, "min value"));
return getStartTime();
}

@Override
public Long getMaxValue() {
throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, TIME, "max value"));
return getEndTime();
}

@Override
public Long getFirstValue() {
throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, TIME, "first value"));
return getStartTime();
}

@Override
public Long getLastValue() {
throw new StatisticsClassException(String.format(STATS_UNSUPPORTED_MSG, TIME, "last value"));
return getEndTime();
}

@Override
Expand Down
Loading