This is an automated email from the ASF dual-hosted git repository.
HappenLee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new ef1d741df4e [fix](be) Use serialized hash keys for complex types
(#66777)
ef1d741df4e is described below
commit ef1d741df4ed40f081321100c08cc4c41a701d32
Author: Mryange <[email protected]>
AuthorDate: Mon Aug 17 12:17:55 2026 +0800
[fix](be) Use serialized hash keys for complex types (#66777)
### What problem does this PR solve?
Problem Summary: Multi-column hash keys could incorrectly classify
fixed-width complex types such as `STRUCT` as fixed keys. Because
`ColumnStruct` stores its fields in separate child columns, it cannot be
packed from a contiguous raw buffer. This change routes multi-column
keys containing complex types through the serialized-key path, fixing
`GROUP BY` and distinct aggregate failures involving fixed-width
`STRUCT` columns.
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
be/src/exec/common/hash_table/hash_key_type.h | 3 +-
.../exec/common/hash_table/hash_key_type_test.cpp | 60 +++++++++++++++++
.../test_group_by_fixed_width_struct.out | 23 +++++++
.../test_group_by_fixed_width_struct.groovy | 76 ++++++++++++++++++++++
4 files changed, 161 insertions(+), 1 deletion(-)
diff --git a/be/src/exec/common/hash_table/hash_key_type.h
b/be/src/exec/common/hash_table/hash_key_type.h
index 4ce690596d8..8ce7882f3a6 100644
--- a/be/src/exec/common/hash_table/hash_key_type.h
+++ b/be/src/exec/common/hash_table/hash_key_type.h
@@ -87,7 +87,8 @@ inline HashKeyType get_hash_key_type_fixed(const
std::vector<DataTypePtr>& data_
size_t key_byte_size = 0;
for (const auto& data_type : data_types) {
- if (!data_type->have_maximum_size_of_value()) {
+ if (is_complex_type(data_type->get_primitive_type()) ||
+ !data_type->have_maximum_size_of_value()) {
return HashKeyType::serialized;
}
key_byte_size += data_type->get_size_of_value_in_memory();
diff --git a/be/test/exec/common/hash_table/hash_key_type_test.cpp
b/be/test/exec/common/hash_table/hash_key_type_test.cpp
new file mode 100644
index 00000000000..4d68ff70801
--- /dev/null
+++ b/be/test/exec/common/hash_table/hash_key_type_test.cpp
@@ -0,0 +1,60 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "exec/common/hash_table/hash_key_type.h"
+
+#include <gtest/gtest.h>
+
+#include <memory>
+
+#include "core/data_type/data_type_nullable.h"
+#include "core/data_type/data_type_number.h"
+#include "core/data_type/data_type_struct.h"
+
+namespace doris {
+
+TEST(HashKeyTypeTest, FixedWidthStructUsesSerializedKey) {
+ const auto group_key = make_nullable(std::make_shared<DataTypeInt32>());
+
+ for (const auto& field_type : DataTypes
{make_nullable(std::make_shared<DataTypeInt8>()),
+
make_nullable(std::make_shared<DataTypeInt32>())}) {
+ SCOPED_TRACE(field_type->get_name());
+ const auto struct_type =
+ make_nullable(std::make_shared<DataTypeStruct>(DataTypes
{field_type}));
+
+ ASSERT_TRUE(struct_type->have_maximum_size_of_value());
+ EXPECT_EQ(HashKeyType::serialized, get_hash_key_type({group_key,
struct_type}));
+ EXPECT_EQ(HashKeyType::serialized, get_hash_key_type_fixed({group_key,
struct_type}));
+ }
+}
+
+TEST(HashKeyTypeTest, SingleStructUsesSerializedKey) {
+ const auto struct_type = make_nullable(std::make_shared<DataTypeStruct>(
+ DataTypes {make_nullable(std::make_shared<DataTypeInt32>())}));
+
+ EXPECT_EQ(HashKeyType::serialized, get_hash_key_type({struct_type}));
+}
+
+TEST(HashKeyTypeTest, NumericKeysUseFixedKey) {
+ const DataTypes data_types {std::make_shared<DataTypeInt32>(),
+ std::make_shared<DataTypeInt32>()};
+
+ EXPECT_EQ(HashKeyType::fixed64, get_hash_key_type(data_types));
+ EXPECT_EQ(HashKeyType::fixed64, get_hash_key_type_fixed(data_types));
+}
+
+} // namespace doris
diff --git
a/regression-test/data/datatype_p0/complex_types/test_group_by_fixed_width_struct.out
b/regression-test/data/datatype_p0/complex_types/test_group_by_fixed_width_struct.out
new file mode 100644
index 00000000000..5b8edf516fe
--- /dev/null
+++
b/regression-test/data/datatype_p0/complex_types/test_group_by_fixed_width_struct.out
@@ -0,0 +1,23 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !group_by_tiny_struct --
+1 {"v":1} 2
+1 {"v":2} 1
+2 {"v":1} 2
+
+-- !group_by_int_struct --
+1 {"v":10} 2
+1 {"v":20} 1
+2 {"v":10} 2
+
+-- !array_agg_distinct_struct --
+1 2
+2 1
+
+-- !collect_list_distinct_struct --
+1 2
+2 1
+
+-- !group_array_distinct_struct --
+1 2
+2 1
+
diff --git
a/regression-test/suites/datatype_p0/complex_types/test_group_by_fixed_width_struct.groovy
b/regression-test/suites/datatype_p0/complex_types/test_group_by_fixed_width_struct.groovy
new file mode 100644
index 00000000000..36be8f79c03
--- /dev/null
+++
b/regression-test/suites/datatype_p0/complex_types/test_group_by_fixed_width_struct.groovy
@@ -0,0 +1,76 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_group_by_fixed_width_struct") {
+ sql "DROP TABLE IF EXISTS test_group_by_fixed_width_struct"
+
+ sql """
+ CREATE TABLE test_group_by_fixed_width_struct (
+ id INT,
+ grp INT,
+ st_tiny STRUCT<v:TINYINT>,
+ st_int STRUCT<v:INT>
+ )
+ DUPLICATE KEY(id)
+ DISTRIBUTED BY HASH(id) BUCKETS 1
+ PROPERTIES ("replication_num" = "1")
+ """
+
+ sql """
+ INSERT INTO test_group_by_fixed_width_struct VALUES
+ (1, 1, NAMED_STRUCT('v', 1), NAMED_STRUCT('v', 10)),
+ (2, 1, NAMED_STRUCT('v', 1), NAMED_STRUCT('v', 10)),
+ (3, 1, NAMED_STRUCT('v', 2), NAMED_STRUCT('v', 20)),
+ (4, 2, NAMED_STRUCT('v', 1), NAMED_STRUCT('v', 10)),
+ (5, 2, NAMED_STRUCT('v', 1), NAMED_STRUCT('v', 10))
+ """
+
+ order_qt_group_by_tiny_struct """
+ SELECT grp, st_tiny, COUNT(*)
+ FROM test_group_by_fixed_width_struct
+ GROUP BY grp, st_tiny
+ ORDER BY grp, st_tiny
+ """
+
+ order_qt_group_by_int_struct """
+ SELECT grp, st_int, COUNT(*)
+ FROM test_group_by_fixed_width_struct
+ GROUP BY grp, st_int
+ ORDER BY grp, st_int
+ """
+
+ order_qt_array_agg_distinct_struct """
+ SELECT grp, SIZE(array_agg(DISTINCT st_int))
+ FROM test_group_by_fixed_width_struct
+ GROUP BY grp
+ ORDER BY grp
+ """
+
+ order_qt_collect_list_distinct_struct """
+ SELECT grp, SIZE(collect_list(DISTINCT st_int))
+ FROM test_group_by_fixed_width_struct
+ GROUP BY grp
+ ORDER BY grp
+ """
+
+ order_qt_group_array_distinct_struct """
+ SELECT grp, SIZE(group_array(DISTINCT st_int))
+ FROM test_group_by_fixed_width_struct
+ GROUP BY grp
+ ORDER BY grp
+ """
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
