Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.tsfile.block.column;

import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.utils.PooledBinary;
import org.apache.tsfile.utils.TsPrimitiveType;

import java.util.Arrays;
Expand Down Expand Up @@ -59,7 +59,7 @@ default double getDouble(int position) {
}

/** Gets a Binary at {@code position}. */
default Binary getBinary(int position) {
default PooledBinary getBinary(int position) {
throw new UnsupportedOperationException(getClass().getName());
}

Expand Down Expand Up @@ -94,7 +94,7 @@ default double[] getDoubles() {
}

/** Gets the Binary list. */
default Binary[] getBinaries() {
default PooledBinary[] getBinaries() {
throw new UnsupportedOperationException(getClass().getName());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.tsfile.block.column;

import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.utils.PooledBinary;
import org.apache.tsfile.utils.TsPrimitiveType;

public interface ColumnBuilder {
Expand Down Expand Up @@ -51,7 +51,7 @@ default ColumnBuilder writeDouble(double value) {
}

/** Write a Binary to the current entry; */
default ColumnBuilder writeBinary(Binary value) {
default ColumnBuilder writeBinary(PooledBinary value) {
throw new UnsupportedOperationException(getClass().getName());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public static TsPrimitiveType getByType(TSDataType dataType, Object v) {
case TEXT:
case BLOB:
case STRING:
return new TsPrimitiveType.TsBinary((Binary) v);
return new TsPrimitiveType.TsBinary((PooledBinary) v);
case VECTOR:
return new TsPrimitiveType.TsVector((TsPrimitiveType[]) v);
default:
Expand Down Expand Up @@ -107,7 +107,7 @@ public double getDouble() {
throw new UnsupportedOperationException("getDouble() is not supported for current sub-class");
}

public Binary getBinary() {
public PooledBinary getBinary() {
throw new UnsupportedOperationException("getBinary() is not supported for current sub-class");
}

Expand Down Expand Up @@ -135,7 +135,7 @@ public void setDouble(double val) {
throw new UnsupportedOperationException("setDouble() is not supported for current sub-class");
}

public void setBinary(Binary val) {
public void setBinary(PooledBinary val) {
throw new UnsupportedOperationException("setBinary() is not supported for current sub-class");
}

Expand Down Expand Up @@ -538,28 +538,28 @@ public boolean equals(Object anObject) {

public static class TsBinary extends TsPrimitiveType {

private Binary value;
private PooledBinary value;

public TsBinary() {}

public TsBinary(Binary value) {
public TsBinary(PooledBinary value) {
this.value = value;
}

@Override
public Binary getBinary() {
public PooledBinary getBinary() {
return value;
}

@Override
public void setBinary(Binary val) {
public void setBinary(PooledBinary val) {
this.value = val;
}

@Override
public void setObject(Object val) {
if (val instanceof Binary) {
setBinary((Binary) val);
if (val instanceof PooledBinary) {
setBinary((PooledBinary) val);
return;
}
throw new UnSupportedDataTypeException("TsBinary can only be set Binary value");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.tsfile.file.metadata.TableSchema;
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.utils.PooledBinary;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
Expand Down Expand Up @@ -270,7 +270,7 @@ public static Object getValue(
return Boolean.valueOf(i);
case TEXT:
if (columnCategory.equals(Tablet.ColumnCategory.MEASUREMENT)) {
return new Binary(String.valueOf(i), StandardCharsets.UTF_8);
return new PooledBinary(String.valueOf(i), StandardCharsets.UTF_8);
} else {
return String.valueOf(i);
}
Expand Down
7 changes: 7 additions & 0 deletions java/tsfile/src/main/codegen/dataModel/AllFilter.tdd
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,43 @@
"filters": [
{
"dataType": "boolean",
"valueType": "boolean",
"javaBoxName": "Boolean",
"classSerializeName": "BOOLEAN"
},
{
"dataType": "int",
"valueType": "int",
"javaBoxName": "Integer",
"classSerializeName": "INTEGER"
},
{
"dataType": "long",
"valueType": "long",
"javaBoxName": "Long",
"classSerializeName": "LONG"
},
{
"dataType": "double",
"valueType": "double",
"javaBoxName": "Double",
"classSerializeName": "DOUBLE"
},
{
"dataType": "float",
"valueType": "float",
"javaBoxName": "Float",
"classSerializeName": "FLOAT"
},
{
"dataType": "Binary",
"valueType": "PooledBinary",
"javaBoxName": "Binary",
"classSerializeName": "BINARY"
},
{
"dataType": "Binary",
"valueType": "PooledBinary",
"javaBoxName": "String",
"classSerializeName": "STRING"
}
Expand Down
Loading
Loading