Skip to content

primitive type compatible #437

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 2 commits into from
Mar 11, 2025
Merged

primitive type compatible #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9f6e40
TsPrimitiveType Compatible get function
zhujt20 Mar 10, 2025
36bdf80
encoding follow data type
zhujt20 Mar 11, 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
25 changes: 25 additions & 0 deletions java/common/src/main/java/org/apache/tsfile/utils/TsPrimitiveType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,21 @@ public int getInt() {
return value;
}

@Override
public double getDouble() {
return (double) value;
}

@Override
public long getLong() {
return (long) value;
}

@Override
public float getFloat() {
return (float) value;
}

@Override
public void setInt(int val) {
this.value = val;
Expand Down Expand Up @@ -335,6 +350,11 @@ public long getLong() {
return value;
}

@Override
public double getDouble() {
return (double) value;
}

@Override
public void setLong(long val) {
this.value = val;
Expand Down Expand Up @@ -407,6 +427,11 @@ public float getFloat() {
return value;
}

@Override
public double getDouble() {
return (double) value;
}

@Override
public void setFloat(float val) {
this.value = val;
Expand Down
22 changes: 11 additions & 11 deletions java/tsfile/src/main/java/org/apache/tsfile/read/common/Chunk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@

package org.apache.tsfile.read.common;

import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.encrypt.EncryptParameter;
import org.apache.tsfile.encrypt.EncryptUtils;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.MetaMarker;
import org.apache.tsfile.file.header.ChunkHeader;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.file.metadata.statistics.Statistics;
import org.apache.tsfile.read.TimeValuePair;
import org.apache.tsfile.read.reader.IPageReader;
Expand Down Expand Up @@ -217,19 +219,18 @@ public Chunk rewrite(TSDataType newType, Chunk timeChunk) throws IOException {
if (newType == null || newType == chunkHeader.getDataType()) {
return this;
}
TSEncoding encoding =
TSEncoding.valueOf(TSFileDescriptor.getInstance().getConfig().getValueEncoder(newType));
IMeasurementSchema schema =
new MeasurementSchema(
chunkHeader.getMeasurementID(),
newType,
chunkHeader.getEncodingType(),
chunkHeader.getCompressionType());
chunkHeader.getMeasurementID(), newType, encoding, chunkHeader.getCompressionType());

ValueChunkWriter chunkWriter =
new ValueChunkWriter(
chunkHeader.getMeasurementID(),
chunkHeader.getCompressionType(),
newType,
chunkHeader.getEncodingType(),
encoding,
schema.getValueEncoder(),
encryptParam);
List<Chunk> valueChunks = new ArrayList<>();
Expand Down Expand Up @@ -302,7 +303,7 @@ public Chunk rewrite(TSDataType newType, Chunk timeChunk) throws IOException {
newChunkData.capacity(),
newType,
chunkHeader.getCompressionType(),
chunkHeader.getEncodingType());
encoding);
chunkData.flip();
timeChunk.chunkData.flip();
return new Chunk(
Expand All @@ -317,12 +318,11 @@ public Chunk rewrite(TSDataType newType) throws IOException {
if (newType == null || newType == chunkHeader.getDataType()) {
return this;
}
TSEncoding encoding =
TSEncoding.valueOf(TSFileDescriptor.getInstance().getConfig().getValueEncoder(newType));
IMeasurementSchema schema =
new MeasurementSchema(
chunkHeader.getMeasurementID(),
newType,
chunkHeader.getEncodingType(),
chunkHeader.getCompressionType());
chunkHeader.getMeasurementID(), newType, encoding, chunkHeader.getCompressionType());
ChunkWriterImpl chunkWriter = new ChunkWriterImpl(schema, encryptParam);
ChunkReader chunkReader = new ChunkReader(this);
List<IPageReader> pages = chunkReader.loadPageReaderList();
Expand Down Expand Up @@ -374,7 +374,7 @@ public Chunk rewrite(TSDataType newType) throws IOException {
newChunkData.capacity(),
newType,
chunkHeader.getCompressionType(),
chunkHeader.getEncodingType());
encoding);
chunkData.flip();
return new Chunk(
newChunkHeader,
Expand Down