Skip to content

[IOTDB-840] Encode the three enum fields in MeasurementSchema to save memory #1724

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
qiaojialin merged 2 commits into from
Sep 15, 2020
Merged

[IOTDB-840] Encode the three enum fields in MeasurementSchema to save memory #1724

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98ae5b8
[IOTDB-840] Encode the three enum fields in MeasurementSchema to save…
yanhongwangg Sep 10, 2020
874877a
[IOTDB-840] Encode the three enum fields in MeasurementSchema to save…
yanhongwangg Sep 10, 2020
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
49 changes: 27 additions & 22 deletions tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
public class MeasurementSchema implements Comparable<MeasurementSchema>, Serializable {

private String measurementId;
private TSDataType type;
private TSEncoding encoding;
private byte type;
private byte encoding;
private TSEncodingBuilder encodingConverter;
private CompressionType compressor;
private byte compressor;
private Map<String, String> props = null;

public MeasurementSchema() {
Expand Down Expand Up @@ -83,11 +83,11 @@ public MeasurementSchema(String measurementId, TSDataType type, TSEncoding encod
*/
public MeasurementSchema(String measurementId, TSDataType type, TSEncoding encoding,
CompressionType compressionType, Map<String, String> props) {
this.type = type;
this.type = (byte) type.serialize();
this.measurementId = measurementId;
this.encoding = encoding;
this.encoding = (byte) encoding.serialize();
this.props = props;
this.compressor = compressionType;
this.compressor = (byte) compressionType.serialize();
}

/**
Expand All @@ -98,11 +98,12 @@ public static MeasurementSchema deserializeFrom(InputStream inputStream) throws

measurementSchema.measurementId = ReadWriteIOUtils.readString(inputStream);

measurementSchema.type = ReadWriteIOUtils.readDataType(inputStream);
measurementSchema.type = (byte) ReadWriteIOUtils.readDataType(inputStream).serialize();

measurementSchema.encoding = ReadWriteIOUtils.readEncoding(inputStream);
measurementSchema.encoding = (byte) ReadWriteIOUtils.readEncoding(inputStream).serialize();

measurementSchema.compressor = ReadWriteIOUtils.readCompressionType(inputStream);
measurementSchema.compressor = (byte) ReadWriteIOUtils.readCompressionType(inputStream)
.serialize();

int size = ReadWriteIOUtils.readInt(inputStream);
if (size > 0) {
Expand All @@ -127,11 +128,11 @@ public static MeasurementSchema deserializeFrom(ByteBuffer buffer) {

measurementSchema.measurementId = ReadWriteIOUtils.readString(buffer);

measurementSchema.type = ReadWriteIOUtils.readDataType(buffer);
measurementSchema.type = (byte) ReadWriteIOUtils.readDataType(buffer).serialize();

measurementSchema.encoding = ReadWriteIOUtils.readEncoding(buffer);
measurementSchema.encoding = (byte) ReadWriteIOUtils.readEncoding(buffer).serialize();

measurementSchema.compressor = ReadWriteIOUtils.readCompressionType(buffer);
measurementSchema.compressor = (byte) ReadWriteIOUtils.readCompressionType(buffer).serialize();

int size = ReadWriteIOUtils.readInt(buffer);
if (size > 0) {
Expand Down Expand Up @@ -161,11 +162,11 @@ public Map<String, String> getProps() {
}

public TSEncoding getEncodingType() {
return encoding;
return TSEncoding.deserialize(encoding);
}

public TSDataType getType() {
return type;
return TSDataType.deserialize(type);
}

public void setProps(Map<String, String> props) {
Expand All @@ -176,27 +177,30 @@ public void setProps(Map<String, String> props) {
* function for getting time encoder.
*/
public Encoder getTimeEncoder() {
TSEncoding timeEncoding = TSEncoding.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeEncoder());
TSDataType timeType = TSDataType.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeSeriesDataType());
TSEncoding timeEncoding = TSEncoding
.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeEncoder());
TSDataType timeType = TSDataType
.valueOf(TSFileDescriptor.getInstance().getConfig().getTimeSeriesDataType());
return TSEncodingBuilder.getEncodingBuilder(timeEncoding).getEncoder(timeType);
}

/**
* get Encoder of value from encodingConverter by measurementID and data type.
*
* @return Encoder for value
*/
public Encoder getValueEncoder() {
//it is ok even if encodingConverter is constructed two instances for concurrent scenario
if (encodingConverter == null) {
// initialize TSEncoding. e.g. set max error for PLA and SDT
encodingConverter = TSEncodingBuilder.getEncodingBuilder(encoding);
encodingConverter = TSEncodingBuilder.getEncodingBuilder(TSEncoding.deserialize(encoding));
encodingConverter.initFromProps(props);
}
return encodingConverter.getEncoder(type);
return encodingConverter.getEncoder(TSDataType.deserialize(type));
}

public CompressionType getCompressor() {
return compressor;
return CompressionType.deserialize(compressor);
}

/**
Expand Down Expand Up @@ -287,14 +291,15 @@ public int compareTo(MeasurementSchema o) {
@Override
public String toString() {
StringContainer sc = new StringContainer("");
sc.addTail("[", measurementId, ",", type.toString(), ",", encoding.toString(), ",",
sc.addTail("[", measurementId, ",", TSDataType.deserialize(type).toString(), ",",
TSEncoding.deserialize(encoding).toString(), ",",
props == null ? "" : props.toString(), ",",
compressor.toString());
CompressionType.deserialize(compressor).toString());
sc.addTail("]");
return sc.toString();
}

public void setType(TSDataType type) {
this.type = type;
this.type = (byte) type.serialize();
}
}