Skip to content

Support dictionary encoding for STRING data type. #238

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
Sep 11, 2024
Merged

Support dictionary encoding for STRING data type. #238

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
fdc362e
Support dictionary encoding for STRING data type.
jt2594838 Sep 11, 2024
c9389e9
update method
jt2594838 Sep 11, 2024
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 java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/TSEncodingBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ public static class Dictionary extends TSEncodingBuilder {

@Override
public Encoder getEncoder(TSDataType type) {
if (type == TSDataType.TEXT) {
if (type == TSDataType.TEXT || type == TSDataType.STRING) {
return new DictionaryEncoder();
}
throw new UnSupportedDataTypeException("DICTIONARY doesn't support data type: " + type);
Expand Down
64 changes: 64 additions & 0 deletions java/tsfile/src/main/java/org/apache/tsfile/file/metadata/enums/TSEncoding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@

package org.apache.tsfile.file.metadata.enums;

import org.apache.tsfile.enums.TSDataType;

import java.util.EnumMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

public enum TSEncoding {
PLAIN((byte) 0),
DICTIONARY((byte) 1),
Expand All @@ -37,6 +44,55 @@ public enum TSEncoding {
RLBE((byte) 13);
private final byte type;

@SuppressWarnings("java:S2386") // used by other projects
public static final Map<TSDataType, Set<TSEncoding>> TYPE_SUPPORTED_ENCODINGS =
new EnumMap<>(TSDataType.class);

static {
Set<TSEncoding> booleanSet = new HashSet<>();
booleanSet.add(TSEncoding.PLAIN);
booleanSet.add(TSEncoding.RLE);
TYPE_SUPPORTED_ENCODINGS.put(TSDataType.BOOLEAN, booleanSet);

Set<TSEncoding> intSet = new HashSet<>();
intSet.add(TSEncoding.PLAIN);
intSet.add(TSEncoding.RLE);
intSet.add(TSEncoding.TS_2DIFF);
intSet.add(TSEncoding.GORILLA);
intSet.add(TSEncoding.ZIGZAG);
intSet.add(TSEncoding.CHIMP);
intSet.add(TSEncoding.SPRINTZ);
intSet.add(TSEncoding.RLBE);

TYPE_SUPPORTED_ENCODINGS.put(TSDataType.INT32, intSet);
TYPE_SUPPORTED_ENCODINGS.put(TSDataType.INT64, intSet);
TYPE_SUPPORTED_ENCODINGS.put(TSDataType.TIMESTAMP, intSet);
TYPE_SUPPORTED_ENCODINGS.put(TSDataType.DATE, intSet);

Set<TSEncoding> floatSet = new HashSet<>();
floatSet.add(TSEncoding.PLAIN);
floatSet.add(TSEncoding.RLE);
floatSet.add(TSEncoding.TS_2DIFF);
floatSet.add(TSEncoding.GORILLA_V1);
floatSet.add(TSEncoding.GORILLA);
floatSet.add(TSEncoding.CHIMP);
floatSet.add(TSEncoding.SPRINTZ);
floatSet.add(TSEncoding.RLBE);

TYPE_SUPPORTED_ENCODINGS.put(TSDataType.FLOAT, floatSet);
TYPE_SUPPORTED_ENCODINGS.put(TSDataType.DOUBLE, floatSet);

Set<TSEncoding> textSet = new HashSet<>();
textSet.add(TSEncoding.PLAIN);
textSet.add(TSEncoding.DICTIONARY);
TYPE_SUPPORTED_ENCODINGS.put(TSDataType.TEXT, textSet);
TYPE_SUPPORTED_ENCODINGS.put(TSDataType.STRING, textSet);

Set<TSEncoding> blobSet = new HashSet<>();
blobSet.add(TSEncoding.PLAIN);
TYPE_SUPPORTED_ENCODINGS.put(TSDataType.BLOB, blobSet);
}

TSEncoding(byte type) {
this.type = type;
}
Expand Down Expand Up @@ -84,6 +140,14 @@ private static TSEncoding getTsEncoding(byte encoding) {
}
}

public static boolean isSupported(TSDataType type, TSEncoding encoding) {
return TYPE_SUPPORTED_ENCODINGS.get(type).contains(encoding);
}

public boolean isSupported(TSDataType type) {
return TYPE_SUPPORTED_ENCODINGS.get(type).contains(this);
}

public static int getSerializedSize() {
return Byte.BYTES;
}
Expand Down