Skip to content

[IOTDB-31] failed to set float precision when creating timeseries #80

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

Closed
MyXOF wants to merge 1 commit into from
Closed

[IOTDB-31] failed to set float precision when creating timeseries #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 32 additions & 14 deletions tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/TSEncodingBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,18 @@ public static TSEncodingBuilder getConverter(TSEncoding type) {
}
}

protected boolean isKeyContainedInMap(Map<String, String> map, String key) {
if(map == null || key == null) {
return false;
}
for(String keyInMap : map.keySet()) {
if(key.equalsIgnoreCase(keyInMap)) {
return true;
}
}
return false;
}

/**
* return a series's encoder with different types and parameters according to its measurement id
* and data type.
Expand Down Expand Up @@ -149,15 +161,18 @@ public Encoder getEncoder(TSDataType type) {
@Override
public void initFromProps(Map<String, String> props) {
// set max error from initialized map or default value if not set
if (props == null || !props.containsKey(Encoder.MAX_POINT_NUMBER)) {
if (!isKeyContainedInMap(props, Encoder.MAX_POINT_NUMBER)) {
maxPointNumber = TSFileConfig.floatPrecision;
} else {
maxPointNumber = Integer.valueOf(props.get(Encoder.MAX_POINT_NUMBER));
if (maxPointNumber < 0) {
maxPointNumber = TSFileConfig.floatPrecision;
LOGGER
.warn("cannot set max point number to negative value, replaced with default value:{}",
maxPointNumber);
for(Map.Entry<String, String> entry : props.entrySet()) {
if(Encoder.MAX_POINT_NUMBER.equalsIgnoreCase(entry.getKey())) {
maxPointNumber = Integer.valueOf(entry.getValue());
if (maxPointNumber < 0) {
maxPointNumber = TSFileConfig.floatPrecision;
LOGGER.warn("cannot set max point number to negative value, replaced with default value:{}",
maxPointNumber);
}
}
Copy link
Contributor

@jt2594838 jt2594838 Mar 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that the else block is just enough and the if block is redundant.
You may set maxPointNumber = TSFileConfig.floatPrecision first and then go through the loop for(Map.Entry<String, String> entry : props.entrySet()) .

}
}
}
Expand Down Expand Up @@ -197,15 +212,18 @@ public Encoder getEncoder(TSDataType type) {
*/
public void initFromProps(Map<String, String> props) {
// set max error from initialized map or default value if not set
if (props == null || !props.containsKey(Encoder.MAX_POINT_NUMBER)) {
if (!isKeyContainedInMap(props, Encoder.MAX_POINT_NUMBER)) {
maxPointNumber = TSFileConfig.floatPrecision;
} else {
maxPointNumber = Integer.valueOf(props.get(Encoder.MAX_POINT_NUMBER));
if (maxPointNumber < 0) {
maxPointNumber = TSFileConfig.floatPrecision;
LOGGER
.warn("cannot set max point number to negative value, replaced with default value:{}",
maxPointNumber);
for(Map.Entry<String, String> entry : props.entrySet()) {
if(Encoder.MAX_POINT_NUMBER.equalsIgnoreCase(entry.getKey())) {
maxPointNumber = Integer.valueOf(entry.getValue());
if (maxPointNumber < 0) {
maxPointNumber = TSFileConfig.floatPrecision;
LOGGER.warn("cannot set max point number to negative value, replaced with default value:{}",
maxPointNumber);
}
}
}
}
}
Expand Down