Skip to content
Merged
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
4 changes: 2 additions & 2 deletions be/src/storage/segment/encoding_info.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -386,8 +386,8 @@ EncodingInfoResolver::EncodingInfoResolver() {
_set_v3_default<FieldType::OLAP_FIELD_TYPE_LARGEINT, PLAIN_ENCODING>();
_set_v3_default<FieldType::OLAP_FIELD_TYPE_UNSIGNED_BIGINT, BIT_SHUFFLE>();
_set_v3_default<FieldType::OLAP_FIELD_TYPE_UNSIGNED_INT, BIT_SHUFFLE>();
_set_v3_default<FieldType::OLAP_FIELD_TYPE_FLOAT, BIT_SHUFFLE>();
_set_v3_default<FieldType::OLAP_FIELD_TYPE_DOUBLE, BIT_SHUFFLE>();
_set_v3_default<FieldType::OLAP_FIELD_TYPE_FLOAT, PLAIN_ENCODING>();

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please regenerate the affected V3 SegmentFlusher goldens with this default change. Normal SegmentFlusherFormatTest execution byte-compares generated segments with the checked-in files, and this PR updates none of them. Besides the two all_scalar_values_v3_* cases, four complex_v3_* cases materialize nested.y:3.5 as a DOUBLE subcolumn, so six case directories fail and ten .dat blobs differ. Those fixtures were generated while V3 FLOAT/DOUBLE used BIT_SHUFFLE; this line changes their stored ColumnMetaPB.encoding and page bytes to PLAIN. Please regenerate all six affected case directories and run the full SegmentFlusherFormatTest suite.

_set_v3_default<FieldType::OLAP_FIELD_TYPE_DOUBLE, PLAIN_ENCODING>();
_set_v3_default<FieldType::OLAP_FIELD_TYPE_CHAR, DICT_ENCODING>();
_set_v3_default<FieldType::OLAP_FIELD_TYPE_VARCHAR, DICT_ENCODING>();
_set_v3_default<FieldType::OLAP_FIELD_TYPE_STRING, DICT_ENCODING>();
Expand Down
20 changes: 13 additions & 7 deletions be/test/storage/segment/encoding_info_test.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,10 +91,15 @@ TEST_F(EncodingInfoTest, v2_vs_v3_defaults) {
check_split(FieldType::OLAP_FIELD_TYPE_QUANTILE_STATE, "QUANTILE_STATE");
check_split(FieldType::OLAP_FIELD_TYPE_AGG_STATE, "AGG_STATE");

// Signed integers: V2=BIT_SHUFFLE, V3=PLAIN.
// Signed integers and floating-point types: V2=BIT_SHUFFLE, V3=PLAIN.
auto check_plain_v3 = [](FieldType type, const std::string& name) {
EXPECT_EQ(BIT_SHUFFLE, get_v2_default_encoding(type)) << name << " v2 default";
EXPECT_EQ(PLAIN_ENCODING, get_v3_default_encoding(type)) << name << " v3 default";
};
constexpr FieldType bigint_type = FieldType::OLAP_FIELD_TYPE_BIGINT;
EXPECT_EQ(BIT_SHUFFLE, get_v2_default_encoding(bigint_type));
EXPECT_EQ(PLAIN_ENCODING, get_v3_default_encoding(bigint_type));
check_plain_v3(bigint_type, "BIGINT");
check_plain_v3(FieldType::OLAP_FIELD_TYPE_FLOAT, "FLOAT");
check_plain_v3(FieldType::OLAP_FIELD_TYPE_DOUBLE, "DOUBLE");

// Value-seek default is only registered for VARCHAR (the only production caller).
EXPECT_EQ(PREFIX_ENCODING,
Expand DownExpand Up@@ -345,9 +350,10 @@ struct EncodingMapEntry {
const char* name;
};

// Expected V3 default per type. Differs from V2 default in two type families:
// - binary blobs (HLL/BITMAP/QUANTILE_STATE/AGG_STATE): PLAIN_ENCODING_V2 (vs V2's PLAIN)
// Expected V3 default per type. Differs from V2 default in three type families:
// - binary blobs (HLL/BITMAP/QUANTILE_STATE/AGG_STATE): PLAIN_ENCODING_V3 (vs V2's PLAIN)
// - signed integers (TINYINT..LARGEINT): PLAIN_ENCODING (vs V2's BIT_SHUFFLE)
// - floating-point types (FLOAT/DOUBLE): PLAIN_ENCODING (vs V2's BIT_SHUFFLE)
const std::vector<DefaultExpectation> kV3DefaultExpect = {
{FieldType::OLAP_FIELD_TYPE_TINYINT, PLAIN_ENCODING, "TINYINT"},
{FieldType::OLAP_FIELD_TYPE_SMALLINT, PLAIN_ENCODING, "SMALLINT"},
Expand All@@ -356,8 +362,8 @@ const std::vector<DefaultExpectation> kV3DefaultExpect = {
{FieldType::OLAP_FIELD_TYPE_LARGEINT, PLAIN_ENCODING, "LARGEINT"},
{FieldType::OLAP_FIELD_TYPE_UNSIGNED_BIGINT, BIT_SHUFFLE, "UNSIGNED_BIGINT"},
{FieldType::OLAP_FIELD_TYPE_UNSIGNED_INT, BIT_SHUFFLE, "UNSIGNED_INT"},
{FieldType::OLAP_FIELD_TYPE_FLOAT, BIT_SHUFFLE, "FLOAT"},
{FieldType::OLAP_FIELD_TYPE_DOUBLE, BIT_SHUFFLE, "DOUBLE"},
{FieldType::OLAP_FIELD_TYPE_FLOAT, PLAIN_ENCODING, "FLOAT"},
{FieldType::OLAP_FIELD_TYPE_DOUBLE, PLAIN_ENCODING, "DOUBLE"},
{FieldType::OLAP_FIELD_TYPE_CHAR, DICT_ENCODING, "CHAR"},
{FieldType::OLAP_FIELD_TYPE_VARCHAR, DICT_ENCODING, "VARCHAR"},
{FieldType::OLAP_FIELD_TYPE_STRING, DICT_ENCODING, "STRING"},
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading