Skip to content

Fix bug for NestedCommonFormatColumnPartSerde #18850

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
kgyrtkirk merged 4 commits into from
Dec 17, 2025
Merged

Fix bug for NestedCommonFormatColumnPartSerde #18850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bac00d6
test-parser
cecemei Dec 16, 2025
512ef7c
type
cecemei Dec 17, 2025
6fac75b
Revert "test-parser"
cecemei Dec 17, 2025
cab111c
test
cecemei Dec 17, 2025
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
4 changes: 2 additions & 2 deletions ...ssing/src/main/java/org/apache/druid/segment/serde/NestedCommonFormatColumnPartSerde.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,8 @@ public FormatSpec(
@JsonProperty("longColumnCompression")@Nullable CompressionStrategy longColumnCompression,
@JsonProperty("doubleColumnCompression")@Nullable CompressionStrategy doubleColumnCompression,
@JsonProperty("bitmapEncoding") @Nullable BitmapSerdeFactory bitmapEncoding,
@JsonProperty("longFieldBitmapIndex")@Nullable BitmapIndexType longFieldBitmapIndex,
@JsonProperty("doubleFieldBitmapIndex")@Nullable BitmapIndexType doubleFieldBitmapIndex
@JsonProperty("longFieldBitmapIndexType")@Nullable BitmapIndexType longFieldBitmapIndex,
@JsonProperty("doubleFieldBitmapIndexType")@Nullable BitmapIndexType doubleFieldBitmapIndex
Comment on lines +485 to +486
Copy link
Contributor

@abhishekrb19 abhishekrb19 Dec 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Should we also rename these arguments to align with the json property names and stuff that's defined in the underlying spec NestedCommonFormatColumnFormatSpec:

  • longFieldBitmapIndex -> longFieldBitmapIndexType
  • doubleFieldBitmapIndex -> doubleFieldBitmapIndexType

)
{
super(
Expand Down
128 changes: 61 additions & 67 deletions ...src/test/java/org/apache/druid/segment/nested/NestedCommonFormatColumnFormatSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.apache.druid.segment.data.ConciseBitmapSerdeFactory;
import org.apache.druid.segment.data.FrontCodedIndexed;
import org.apache.druid.segment.data.RoaringBitmapSerdeFactory;
import org.apache.druid.segment.serde.NestedCommonFormatColumnPartSerde;
import org.junit.Assert;
import org.junit.jupiter.api.Test;

Expand All @@ -39,26 +40,44 @@ public class NestedCommonFormatColumnFormatSpecTest
public void testSerde() throws JsonProcessingException
{
NestedCommonFormatColumnFormatSpec spec =
NestedCommonFormatColumnFormatSpec.builder()
.setObjectFieldsDictionaryEncoding(
new StringEncodingStrategy.FrontCoded(4, FrontCodedIndexed.V1)
)
.setObjectStorageCompression(CompressionStrategy.ZSTD)
.setStringDictionaryEncoding(
new StringEncodingStrategy.FrontCoded(16, FrontCodedIndexed.V1)
)
.setLongFieldBitmapIndexType(BitmapIndexType.NullValueIndex.INSTANCE)
.setDoubleFieldBitmapIndexType(BitmapIndexType.NullValueIndex.INSTANCE)
.build();
Assert.assertEquals(
spec,
NestedCommonFormatColumnFormatSpec
.builder()
.setBitmapEncoding(new ConciseBitmapSerdeFactory())
.setObjectFieldsDictionaryEncoding(new StringEncodingStrategy.FrontCoded(4, FrontCodedIndexed.V1))
.setObjectStorageCompression(CompressionStrategy.ZSTD)
.setStringDictionaryEncoding(new StringEncodingStrategy.FrontCoded(16, FrontCodedIndexed.V1))
.setLongFieldBitmapIndexType(BitmapIndexType.NullValueIndex.INSTANCE)
.setDoubleFieldBitmapIndexType(BitmapIndexType.NullValueIndex.INSTANCE)
.build();
// NestedCommonFormatColumnFormatSpec does not support serde for BitmapEncoding, value would be ignored
Assert.assertEquals(
NestedCommonFormatColumnFormatSpec.builder(spec).setBitmapEncoding(null).build(),
TestHelper.JSON_MAPPER.readValue(
TestHelper.JSON_MAPPER.writeValueAsString(spec),
NestedCommonFormatColumnFormatSpec.class
)
);
}

@Test
public void testSerdeFormatSpec() throws JsonProcessingException
{
NestedCommonFormatColumnFormatSpec spec =
NestedCommonFormatColumnFormatSpec
.builder()
.setObjectFieldsDictionaryEncoding(new StringEncodingStrategy.FrontCoded(4, FrontCodedIndexed.V1))
.setObjectStorageCompression(CompressionStrategy.ZSTD)
.setStringDictionaryEncoding(new StringEncodingStrategy.FrontCoded(16, FrontCodedIndexed.V1))
.setLongFieldBitmapIndexType(BitmapIndexType.NullValueIndex.INSTANCE)
.setDoubleFieldBitmapIndexType(BitmapIndexType.DictionaryEncodedValueIndex.INSTANCE)
.build();
NestedCommonFormatColumnPartSerde.FormatSpec formatSpec = TestHelper.JSON_MAPPER.readValue(
TestHelper.JSON_MAPPER.writeValueAsString(spec),
NestedCommonFormatColumnPartSerde.FormatSpec.class
);
Assert.assertEquals(spec.toString(), formatSpec.toString());
}

@Test
public void testGetEffectiveSpecDefaults()
{
Expand All @@ -67,18 +86,9 @@ public void testGetEffectiveSpecDefaults()
IndexSpec.getDefault().getEffectiveSpec()
);

Assert.assertEquals(
StringEncodingStrategy.UTF8_STRATEGY,
defaults.getObjectFieldsDictionaryEncoding()
);
Assert.assertEquals(
ObjectStorageEncoding.SMILE,
defaults.getObjectStorageEncoding()
);
Assert.assertEquals(
CompressionStrategy.LZ4,
defaults.getObjectStorageCompression()
);
Assert.assertEquals(StringEncodingStrategy.UTF8_STRATEGY, defaults.getObjectFieldsDictionaryEncoding());
Assert.assertEquals(ObjectStorageEncoding.SMILE, defaults.getObjectStorageEncoding());
Assert.assertEquals(CompressionStrategy.LZ4, defaults.getObjectStorageCompression());
Assert.assertEquals(
IndexSpec.getDefault().getEffectiveSpec().getDimensionCompression(),
defaults.getDictionaryEncodedColumnCompression()
Expand All @@ -95,6 +105,8 @@ public void testGetEffectiveSpecDefaults()
IndexSpec.getDefault().getEffectiveSpec().getMetricCompression(),
defaults.getDoubleColumnCompression()
);
Assert.assertEquals(BitmapIndexType.DictionaryEncodedValueIndex.INSTANCE, defaults.getLongFieldBitmapIndexType());
Assert.assertEquals(BitmapIndexType.DictionaryEncodedValueIndex.INSTANCE, defaults.getLongFieldBitmapIndexType());
}

@Test
Expand All @@ -108,25 +120,18 @@ public void testEffectiveSpecIndexSpecOverrides()
NestedCommonFormatColumnFormatSpec.builder()
.setObjectFieldsDictionaryEncoding(frontcoded)
.setObjectStorageEncoding(ObjectStorageEncoding.NONE)
.setLongFieldBitmapIndexType(BitmapIndexType.NullValueIndex.INSTANCE)
.setDoubleFieldBitmapIndexType(BitmapIndexType.NullValueIndex.INSTANCE)
.build()
)
.withMetricCompression(CompressionStrategy.LZF)
.build()
.getEffectiveSpec()
);

Assert.assertEquals(
frontcoded,
defaults.getObjectFieldsDictionaryEncoding()
);
Assert.assertEquals(
ObjectStorageEncoding.NONE,
defaults.getObjectStorageEncoding()
);
Assert.assertEquals(
CompressionStrategy.LZ4,
defaults.getObjectStorageCompression()
);
Assert.assertEquals(frontcoded, defaults.getObjectFieldsDictionaryEncoding());
Assert.assertEquals(ObjectStorageEncoding.NONE, defaults.getObjectStorageEncoding());
Assert.assertEquals(CompressionStrategy.LZ4, defaults.getObjectStorageCompression());
Assert.assertEquals(
IndexSpec.getDefault().getEffectiveSpec().getDimensionCompression(),
defaults.getDictionaryEncodedColumnCompression()
Expand All @@ -135,30 +140,26 @@ public void testEffectiveSpecIndexSpecOverrides()
IndexSpec.getDefault().getEffectiveSpec().getStringDictionaryEncoding(),
defaults.getStringDictionaryEncoding()
);
Assert.assertEquals(
CompressionStrategy.LZF,
defaults.getLongColumnCompression()
);
Assert.assertEquals(
CompressionStrategy.LZF,
defaults.getDoubleColumnCompression()
);
Assert.assertEquals(CompressionStrategy.LZF, defaults.getLongColumnCompression());
Assert.assertEquals(CompressionStrategy.LZF, defaults.getDoubleColumnCompression());
Assert.assertEquals(BitmapIndexType.NullValueIndex.INSTANCE, defaults.getLongFieldBitmapIndexType());
Assert.assertEquals(BitmapIndexType.NullValueIndex.INSTANCE, defaults.getDoubleFieldBitmapIndexType());
}

@Test
public void testGetEffectiveSpecMerge()
{
NestedCommonFormatColumnFormatSpec merged = NestedCommonFormatColumnFormatSpec.getEffectiveFormatSpec(
NestedCommonFormatColumnFormatSpec.builder()
.setObjectFieldsDictionaryEncoding(
new StringEncodingStrategy.FrontCoded(4, FrontCodedIndexed.V1)
)
.setObjectStorageCompression(CompressionStrategy.ZSTD)
.setStringDictionaryEncoding(
new StringEncodingStrategy.FrontCoded(4, FrontCodedIndexed.V1)
)
.setDoubleColumnCompression(CompressionStrategy.ZSTD)
.build(),
NestedCommonFormatColumnFormatSpec
.builder()
.setObjectFieldsDictionaryEncoding(new StringEncodingStrategy.FrontCoded(4, FrontCodedIndexed.V1))
.setObjectStorageCompression(CompressionStrategy.ZSTD)
.setObjectStorageEncoding(ObjectStorageEncoding.NONE)
.setStringDictionaryEncoding(new StringEncodingStrategy.FrontCoded(4, FrontCodedIndexed.V1))
.setDoubleColumnCompression(CompressionStrategy.ZSTD)
.setDoubleFieldBitmapIndexType(BitmapIndexType.NullValueIndex.INSTANCE)
.setLongFieldBitmapIndexType(BitmapIndexType.NullValueIndex.INSTANCE)
.build(),
IndexSpec.getDefault().getEffectiveSpec()
);

Expand All @@ -170,26 +171,19 @@ public void testGetEffectiveSpecMerge()
new StringEncodingStrategy.FrontCoded(4, FrontCodedIndexed.V1),
merged.getStringDictionaryEncoding()
);
Assert.assertEquals(
ObjectStorageEncoding.SMILE,
merged.getObjectStorageEncoding()
);
Assert.assertEquals(ObjectStorageEncoding.NONE, merged.getObjectStorageEncoding());
Assert.assertEquals(
IndexSpec.getDefault().getEffectiveSpec().getDimensionCompression(),
merged.getDictionaryEncodedColumnCompression()
);
Assert.assertEquals(
CompressionStrategy.ZSTD,
merged.getObjectStorageCompression()
);
Assert.assertEquals(CompressionStrategy.ZSTD, merged.getObjectStorageCompression());
Assert.assertEquals(
IndexSpec.getDefault().getEffectiveSpec().getMetricCompression(),
merged.getLongColumnCompression()
);
Assert.assertEquals(
CompressionStrategy.ZSTD,
merged.getDoubleColumnCompression()
);
Assert.assertEquals(CompressionStrategy.ZSTD, merged.getDoubleColumnCompression());
Assert.assertEquals(BitmapIndexType.NullValueIndex.INSTANCE, merged.getLongFieldBitmapIndexType());
Assert.assertEquals(BitmapIndexType.NullValueIndex.INSTANCE, merged.getDoubleFieldBitmapIndexType());
}

@Test
Expand Down
Loading