diff --git a/be/src/runtime/primitive_type.h b/be/src/runtime/primitive_type.h index d89fa1a0f160d8..58af7ad7ea8933 100644 --- a/be/src/runtime/primitive_type.h +++ b/be/src/runtime/primitive_type.h @@ -709,15 +709,15 @@ struct PrimitiveTypeTraits { }; template <> struct PrimitiveTypeTraits { - using CppType = vectorized::Tuple; + using CppType = vectorized::Struct; using StorageFieldType = CppType; using CppNativeType = CppType; using ColumnItemType = CppType; using DataType = vectorized::DataTypeStruct; using ColumnType = vectorized::ColumnStruct; - using NearestFieldType = vectorized::Tuple; - using AvgNearestFieldType = vectorized::Tuple; - using AvgNearestFieldType256 = vectorized::Tuple; + using NearestFieldType = vectorized::Struct; + using AvgNearestFieldType = vectorized::Struct; + using AvgNearestFieldType256 = vectorized::Struct; static constexpr PrimitiveType NearestPrimitiveType = TYPE_STRUCT; static constexpr PrimitiveType AvgNearestPrimitiveType = TYPE_STRUCT; static constexpr PrimitiveType AvgNearestPrimitiveType256 = TYPE_STRUCT; diff --git a/be/src/vec/columns/column_struct.cpp b/be/src/vec/columns/column_struct.cpp index 3621857dee9df4..b3aa0fc9aab31c 100644 --- a/be/src/vec/columns/column_struct.cpp +++ b/be/src/vec/columns/column_struct.cpp @@ -108,8 +108,8 @@ Field ColumnStruct::operator[](size_t n) const { void ColumnStruct::get(size_t n, Field& res) const { const size_t tuple_size = columns.size(); - res = Field::create_field(Tuple()); - Tuple& res_tuple = res.get(); + res = Field::create_field(Struct()); + Struct& res_tuple = res.get(); res_tuple.reserve(tuple_size); for (size_t i = 0; i < tuple_size; ++i) { @@ -119,7 +119,7 @@ void ColumnStruct::get(size_t n, Field& res) const { void ColumnStruct::insert(const Field& x) { DCHECK_EQ(x.get_type(), PrimitiveType::TYPE_STRUCT); - const auto& tuple = x.get(); + const auto& tuple = x.get(); const size_t tuple_size = columns.size(); if (tuple.size() != tuple_size) { throw doris::Exception(ErrorCode::INTERNAL_ERROR, diff --git a/be/src/vec/core/field.h b/be/src/vec/core/field.h index 620ad4212764d8..3c99406c8b958b 100644 --- a/be/src/vec/core/field.h +++ b/be/src/vec/core/field.h @@ -76,7 +76,7 @@ struct Array : public FieldVector { using FieldVector::FieldVector; }; -struct Tuple : public FieldVector { +struct Struct : public FieldVector { using FieldVector::FieldVector; }; @@ -445,7 +445,7 @@ class Field { f(field.template get()); return; case PrimitiveType::TYPE_STRUCT: - f(field.template get()); + f(field.template get()); return; case PrimitiveType::TYPE_MAP: f(field.template get()); @@ -488,7 +488,7 @@ class Field { private: std::aligned_union_t, DecimalField, DecimalField, DecimalField, DecimalField, BitmapValue, HyperLogLog, QuantileState, diff --git a/be/src/vec/data_types/convert_field_to_type.cpp b/be/src/vec/data_types/convert_field_to_type.cpp index 420affd91b1a68..6e700d95555541 100644 --- a/be/src/vec/data_types/convert_field_to_type.cpp +++ b/be/src/vec/data_types/convert_field_to_type.cpp @@ -100,7 +100,7 @@ class FieldVisitorToJsonb : public StaticVisitor { } void operator()(const Array& x, JsonbWriter* writer) const; - void operator()(const Tuple& x, JsonbWriter* writer) const { + void operator()(const Struct& x, JsonbWriter* writer) const { throw doris::Exception(doris::ErrorCode::NOT_IMPLEMENTED_ERROR, "Not implemeted"); } void operator()(const DecimalField& x, JsonbWriter* writer) const { diff --git a/be/src/vec/data_types/data_type_struct.cpp b/be/src/vec/data_types/data_type_struct.cpp index 650ff23e58d304..f91fc8b8831085 100644 --- a/be/src/vec/data_types/data_type_struct.cpp +++ b/be/src/vec/data_types/data_type_struct.cpp @@ -127,7 +127,7 @@ Status DataTypeStruct::check_column(const IColumn& column) const { Field DataTypeStruct::get_default() const { size_t size = elems.size(); - Tuple t; + Struct t; for (size_t i = 0; i < size; ++i) { t.push_back(elems[i]->get_default()); } diff --git a/be/src/vec/exprs/vstruct_literal.cpp b/be/src/vec/exprs/vstruct_literal.cpp index ee6f08b3002723..96d8d1237d0aa1 100644 --- a/be/src/vec/exprs/vstruct_literal.cpp +++ b/be/src/vec/exprs/vstruct_literal.cpp @@ -38,12 +38,12 @@ namespace doris::vectorized { Status VStructLiteral::prepare(RuntimeState* state, const RowDescriptor& row_desc, VExprContext* context) { RETURN_IF_ERROR_OR_PREPARED(VExpr::prepare(state, row_desc, context)); - Field struct_field = Field::create_field(Tuple()); + Field struct_field = Field::create_field(Struct()); for (const auto& child : _children) { Field item; auto child_literal = std::dynamic_pointer_cast(child); child_literal->get_column_ptr()->get(0, item); - struct_field.get().push_back(item); + struct_field.get().push_back(item); } _column_ptr = _data_type->create_column_const(1, struct_field); return Status::OK(); diff --git a/be/test/vec/columns/column_hash_func_test.cpp b/be/test/vec/columns/column_hash_func_test.cpp index b9948da248d791..f5328292c3e643 100644 --- a/be/test/vec/columns/column_hash_func_test.cpp +++ b/be/test/vec/columns/column_hash_func_test.cpp @@ -240,7 +240,7 @@ TEST(HashFuncTest, StructTypeTestWithSepcificValueCrcHash) { dataTypes.push_back(n1); dataTypes.push_back(s1); - Tuple t; + Struct t; t.push_back(vectorized::Field::create_field(Int64(1))); t.push_back(vectorized::Field::create_field("hello")); diff --git a/be/test/vec/columns/column_variant_test.cpp b/be/test/vec/columns/column_variant_test.cpp index de3d31200dc302..91c33d90f90afc 100644 --- a/be/test/vec/columns/column_variant_test.cpp +++ b/be/test/vec/columns/column_variant_test.cpp @@ -2788,7 +2788,7 @@ TEST_F(ColumnVariantTest, get_field_info_all_types) { // Test Tuple { - Tuple t1; + Struct t1; t1.push_back(Field::create_field(String("amory cute"))); t1.push_back(Field::create_field(Int64(37))); t1.push_back(Field::create_field(true)); diff --git a/be/test/vec/core/column_struct_test.cpp b/be/test/vec/core/column_struct_test.cpp index e9de416a053869..ad566f5e93bbc7 100644 --- a/be/test/vec/core/column_struct_test.cpp +++ b/be/test/vec/core/column_struct_test.cpp @@ -62,17 +62,17 @@ TEST(ColumnStructTest2, StringTest) { ->insert_indices_from(*str64_struct_column, indices.data(), indices.data() + indices.size()); EXPECT_EQ(str32_struct_column->size(), indices.size()); - auto t = get(str32_struct_column->operator[](0)); + auto t = get(str32_struct_column->operator[](0)); EXPECT_EQ(t.size(), 2); EXPECT_EQ(t[0], Field::create_field("aaa")); EXPECT_EQ(t[1], Field::create_field(111)); - t = get(str32_struct_column->operator[](1)); + t = get(str32_struct_column->operator[](1)); EXPECT_EQ(t.size(), 2); EXPECT_EQ(t[0], Field::create_field("ccc")); EXPECT_EQ(t[1], Field::create_field(333)); - t = get(str32_struct_column->operator[](2)); + t = get(str32_struct_column->operator[](2)); EXPECT_EQ(t.size(), 2); EXPECT_EQ(t[0], Field::create_field("ddd")); EXPECT_EQ(t[1], Field::create_field(444)); diff --git a/be/test/vec/data_types/data_type_ip_test.cpp b/be/test/vec/data_types/data_type_ip_test.cpp index 5ca0ff187980c3..6d87c0326706e8 100644 --- a/be/test/vec/data_types/data_type_ip_test.cpp +++ b/be/test/vec/data_types/data_type_ip_test.cpp @@ -307,7 +307,7 @@ TEST_F(DataTypeIPTest, SerdeTOJsonInComplex) { column_map_ipv6->insert(Field::create_field(ipv6_map)); // pack struct - Tuple tuple; + Struct tuple; tuple.push_back(Field::create_field(ipv4_values[0])); tuple.push_back(Field::create_field(ipv6_values[0])); tuple.push_back(Field::create_field(ipv4_array)); diff --git a/be/test/vec/data_types/data_type_map_test.cpp b/be/test/vec/data_types/data_type_map_test.cpp index 01f7906e1ccd12..2b16ae9486a1f8 100644 --- a/be/test/vec/data_types/data_type_map_test.cpp +++ b/be/test/vec/data_types/data_type_map_test.cpp @@ -439,7 +439,7 @@ TEST_F(DataTypeMapTest, SerdeNestedTypeArrowTest) { std::make_shared(std::vector {f4})); DataTypePtr ma = std::make_shared(dt1, dt2); - Tuple t1, t2, t3, t4; + Struct t1, t2, t3, t4; t1.push_back(Field::create_field("clever")); t1.push_back(Field::create_field(__int128_t(37))); t1.push_back(Field::create_field(true)); diff --git a/be/test/vec/data_types/data_type_struct_test.cpp b/be/test/vec/data_types/data_type_struct_test.cpp index 75a2081ef3f0fc..053bd67fcce82a 100644 --- a/be/test/vec/data_types/data_type_struct_test.cpp +++ b/be/test/vec/data_types/data_type_struct_test.cpp @@ -388,7 +388,7 @@ TEST_F(DataTypeStructTest, SerdeNestedTypeArrowTest) { m2.push_back(Field::create_field(v2)); // nested Struct - Tuple t1, t2; + Struct t1, t2; t1.push_back(Field::create_field("clever")); t1.push_back(Field::create_field(__int128_t(37))); t1.push_back(Field::create_field(true)); @@ -397,7 +397,7 @@ TEST_F(DataTypeStructTest, SerdeNestedTypeArrowTest) { t2.push_back(Field::create_field(false)); // Struct - Tuple tt1, tt2; + Struct tt1, tt2; tt1.push_back(Field::create_field(a1)); tt1.push_back(Field::create_field(m1)); tt1.push_back(Field::create_field(t1)); @@ -425,7 +425,7 @@ TEST_F(DataTypeStructTest, writeColumnToOrc) { DataTypePtr st = std::make_shared(std::vector {dt1, dt2}); auto serde = st->get_serde(1); - Tuple test_data; + Struct test_data; test_data.push_back(Field::create_field(100)); test_data.push_back(Field::create_field(200)); @@ -463,7 +463,7 @@ TEST_F(DataTypeStructTest, formString) { DataTypePtr dt1 = std::make_shared(); DataTypePtr dt2 = std::make_shared(); DataTypePtr st = std::make_shared(std::vector {dt1, dt2}); - Tuple tt1; + Struct tt1; tt1.push_back(Field::create_field(100)); tt1.push_back(Field::create_field("asd")); @@ -495,7 +495,7 @@ TEST_F(DataTypeStructTest, insertColumnLastValueMultipleTimes) { DataTypePtr dt1 = std::make_shared(); DataTypePtr dt2 = std::make_shared(); DataTypePtr st = std::make_shared(std::vector {dt1, dt2}); - Tuple tt1; + Struct tt1; tt1.push_back(Field::create_field(100)); tt1.push_back(Field::create_field("asd")); diff --git a/be/test/vec/data_types/serde/data_type_serde_arrow_test.cpp b/be/test/vec/data_types/serde/data_type_serde_arrow_test.cpp index 24886fab3f4d67..bdafcfeb6e3cb0 100644 --- a/be/test/vec/data_types/serde/data_type_serde_arrow_test.cpp +++ b/be/test/vec/data_types/serde/data_type_serde_arrow_test.cpp @@ -360,7 +360,7 @@ void serialize_and_deserialize_arrow_test(std::vector cols, int r DataTypePtr m = std::make_shared(std::make_shared()); DataTypePtr st = std::make_shared(std::vector {s, d, m}); type_desc = st; - Tuple t1, t2; + Struct t1, t2; t1.push_back(Field::create_field("amory cute")); t1.push_back(Field::create_field(__int128_t(37))); t1.push_back(Field::create_field(true)); diff --git a/be/test/vec/data_types/serde/data_type_serde_pb_test.cpp b/be/test/vec/data_types/serde/data_type_serde_pb_test.cpp index 0dc5bf80165311..cfb01251639300 100644 --- a/be/test/vec/data_types/serde/data_type_serde_pb_test.cpp +++ b/be/test/vec/data_types/serde/data_type_serde_pb_test.cpp @@ -565,7 +565,7 @@ TEST(DataTypeSerDePbTest, DataTypeScalaSerDeTestStruct) { DataTypePtr d = std::make_shared(std::make_shared()); DataTypePtr m = std::make_shared(std::make_shared()); DataTypePtr st = std::make_shared(std::vector {s, d, m}); - Tuple t1, t2; + Struct t1, t2; t1.push_back(Field::create_field(String("amory cute"))); t1.push_back(Field::create_field(__int128_t(37))); t1.push_back(Field::create_field(true)); @@ -596,7 +596,7 @@ TEST(DataTypeSerDePbTest, DataTypeScalaSerDeTestStruct2) { DataTypePtr d = std::make_shared(std::make_shared()); DataTypePtr m = std::make_shared(std::make_shared()); DataTypePtr st = std::make_shared(std::vector {s, d, m}); - Tuple t1, t2; + Struct t1, t2; t1.push_back(Field::create_field(String("amory cute"))); t1.push_back(Field::create_field(37)); t1.push_back(Field::create_field(true)); diff --git a/be/test/vec/data_types/serde/data_type_to_string_test.cpp b/be/test/vec/data_types/serde/data_type_to_string_test.cpp index 4bf42175c86ccb..0ac7206ca77102 100644 --- a/be/test/vec/data_types/serde/data_type_to_string_test.cpp +++ b/be/test/vec/data_types/serde/data_type_to_string_test.cpp @@ -54,7 +54,7 @@ TEST(ToStringMethodTest, DataTypeToStringTest) { m.push_back(Field::create_field(a1)); m.push_back(Field::create_field(a2)); - Tuple t; + Struct t; t.push_back(Field::create_field(Int128(12345454342))); t.push_back(Field::create_field(String("amory cute"))); t.push_back(Field::create_field(Int64(0))); diff --git a/be/test/vec/jsonb/convert_field_to_type_test.cpp b/be/test/vec/jsonb/convert_field_to_type_test.cpp index a848f7165ab99d..68e64b89c272c4 100644 --- a/be/test/vec/jsonb/convert_field_to_type_test.cpp +++ b/be/test/vec/jsonb/convert_field_to_type_test.cpp @@ -508,7 +508,7 @@ TEST_F(ConvertFieldToTypeTest, ConvertFieldToType_ErrorCases) { // Test with unsupported types (should throw exception) { - Field tuple_field = Field::create_field(Tuple()); + Field tuple_field = Field::create_field(Struct()); EXPECT_THROW( { diff --git a/be/test/vec/jsonb/serialize_test.cpp b/be/test/vec/jsonb/serialize_test.cpp index b5d5c5d41f9f0e..67079e016c3642 100644 --- a/be/test/vec/jsonb/serialize_test.cpp +++ b/be/test/vec/jsonb/serialize_test.cpp @@ -293,7 +293,7 @@ TEST(BlockSerializeTest, Struct) { DataTypePtr d = std::make_shared(std::make_shared()); DataTypePtr m = std::make_shared(std::make_shared()); DataTypePtr st = std::make_shared(std::vector {s, d, m}); - Tuple t1, t2; + Struct t1, t2; t1.push_back(Field::create_field(String("amory cute"))); t1.push_back(Field::create_field(__int128_t(37))); t1.push_back(Field::create_field(true));