Skip to content

[core] Use write null for uncompact decimal and timestamp in InternalRowSerialize #5483

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
JingsongLi merged 1 commit into from
Apr 18, 2025
Merged

[core] Use write null for uncompact decimal and timestamp in InternalRowSerialize #5483

Show file tree
Hide file tree
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
16 changes: 15 additions & 1 deletion paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalRowSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,20 @@
import org.apache.paimon.data.BinaryRowWriter;
import org.apache.paimon.data.BinaryWriter;
import org.apache.paimon.data.BinaryWriter.ValueSetter;
import org.apache.paimon.data.Decimal;
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.InternalRow.FieldGetter;
import org.apache.paimon.data.NestedRow;
import org.apache.paimon.data.Timestamp;
import org.apache.paimon.io.DataInputView;
import org.apache.paimon.io.DataOutputView;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.DataTypeChecks;
import org.apache.paimon.types.DecimalType;
import org.apache.paimon.types.LocalZonedTimestampType;
import org.apache.paimon.types.RowType;
import org.apache.paimon.types.TimestampType;

import java.io.IOException;
import java.util.Arrays;
Expand All @@ -46,6 +52,7 @@ public class InternalRowSerializer extends AbstractRowDataSerializer<InternalRow
private final Serializer[] fieldSerializers;
private final FieldGetter[] fieldGetters;
private final ValueSetter[] valueSetters;
private final boolean[] writeNulls;

private transient BinaryRow reuseRow;
private transient BinaryRowWriter reuseWriter;
Expand All @@ -70,11 +77,18 @@ public InternalRowSerializer(DataType[] types, Serializer<?>[] fieldSerializers)
this.binarySerializer = new BinaryRowSerializer(types.length);
this.fieldGetters = new FieldGetter[types.length];
this.valueSetters = new ValueSetter[types.length];
this.writeNulls = new boolean[types.length];
for (int i = 0; i < types.length; i++) {
DataType type = types[i];
fieldGetters[i] = InternalRow.createFieldGetter(type, i);
// pass serializer to avoid infinite loop
valueSetters[i] = BinaryWriter.createValueSetter(type, fieldSerializers[i]);
// see reference: org.apache.paimon.codegen.GenerateUtils.binaryWriterWriteNull
if (type instanceof DecimalType) {
writeNulls[i] = !Decimal.isCompact(DataTypeChecks.getPrecision(type));
} else if (type instanceof TimestampType || type instanceof LocalZonedTimestampType) {
writeNulls[i] = !Timestamp.isCompact(DataTypeChecks.getPrecision(type));
}
}
}

Expand Down Expand Up @@ -157,7 +171,7 @@ public BinaryRow toBinaryRow(InternalRow row) {
reuseWriter.writeRowKind(row.getRowKind());
for (int i = 0; i < types.length; i++) {
Object field = fieldGetters[i].getFieldOrNull(row);
if (field == null) {
if (field == null && !writeNulls[i]) {
reuseWriter.setNullAt(i);
} else {
valueSetters[i].setValue(reuseWriter, i, field);
Expand Down
36 changes: 36 additions & 0 deletions paimon-core/src/test/java/org/apache/paimon/table/sink/FixedBucketRowKeyExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@

package org.apache.paimon.table.sink;

import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.apache.paimon.schema.TableSchema;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DecimalType;
import org.apache.paimon.types.IntType;
import org.apache.paimon.types.LocalZonedTimestampType;
import org.apache.paimon.types.RowType;
import org.apache.paimon.types.TimestampType;

import org.junit.jupiter.api.Test;

Expand All @@ -32,9 +37,11 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;

import static org.apache.paimon.CoreOptions.BUCKET;
import static org.apache.paimon.CoreOptions.BUCKET_KEY;
import static org.apache.paimon.table.sink.KeyAndBucketExtractor.bucketKeyHashCode;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

Expand Down Expand Up @@ -70,6 +77,30 @@ public void testIllegalBucket() {
assertThatThrownBy(() -> bucket(extractor("", "", "a", -1), row));
}

@Test
public void testUnCompactDecimalAndTimestampNullValueBucketNumber() {
GenericRow row = GenericRow.of(null, null, null, 1);
int bucketNum = ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE);

RowType rowType =
new RowType(
Arrays.asList(
new DataField(0, "d", new DecimalType(38, 18)),
new DataField(1, "ltz", new LocalZonedTimestampType()),
new DataField(2, "ntz", new TimestampType()),
new DataField(3, "k", new IntType())));

String[] bucketColsToTest = {"d", "ltz", "ntz"};
for (String bucketCol : bucketColsToTest) {
FixedBucketRowKeyExtractor extractor = extractor(rowType, "", bucketCol, "", bucketNum);
BinaryRow binaryRow =
new InternalRowSerializer(rowType.project(bucketCol)).toBinaryRow(row);
assertThat(bucket(extractor, row))
.isEqualTo(
KeyAndBucketExtractor.bucket(bucketKeyHashCode(binaryRow), bucketNum));
}
}

private int bucket(FixedBucketRowKeyExtractor extractor, InternalRow row) {
extractor.setRecord(row);
return extractor.bucket();
Expand All @@ -91,6 +122,11 @@ private FixedBucketRowKeyExtractor extractor(
new DataField(0, "a", new IntType()),
new DataField(1, "b", new IntType()),
new DataField(2, "c", new IntType())));
return extractor(rowType, partK, bk, pk, numBucket);
}

private FixedBucketRowKeyExtractor extractor(
RowType rowType, String partK, String bk, String pk, int numBucket) {
List<DataField> fields = TableSchema.newFields(rowType);
Map<String, String> options = new HashMap<>();
options.put(BUCKET_KEY.key(), bk);
Expand Down
Loading