From 690f1d83a8bd088346ac83546ebe9259c9d0956e Mon Sep 17 00:00:00 2001 From: Alper Yoney Date: Mon, 30 Dec 2024 11:16:45 -0800 Subject: [PATCH] Add more containers to complex-struct fixture Summary: Add more container fields to complex-struct fixture to sample the cases. Differential Revision: D67717464 fbshipit-source-id: d3224abce2a3ba61fb1af3ad52a415f5f765efc2 --- .../out/cpp2/gen-cpp2/module_constants.cpp | 4 +- .../out/cpp2/gen-cpp2/module_constants.h | 4 +- .../out/cpp2/gen-cpp2/module_data.cpp | 111 +- .../out/cpp2/gen-cpp2/module_data.h | 2 +- .../out/cpp2/gen-cpp2/module_for_each_field.h | 19 + .../out/cpp2/gen-cpp2/module_metadata.cpp | 4 +- .../out/cpp2/gen-cpp2/module_types.cpp | 336 +- .../out/cpp2/gen-cpp2/module_types.h | 1399 ++++++- .../out/cpp2/gen-cpp2/module_types.tcc | 741 ++++ .../module_visit_by_thrift_field_metadata.h | 38 + .../fixtures/complex_struct/Containers.java | 1705 +++++++- .../gen-javadeprecated/Containers.java | 3538 ++++++++++++++--- .../module/thrift_abstract_types.py | 57 + .../gen-python/module/thrift_metadata.py | 73 + .../gen-python/module/thrift_mutable_types.py | 209 + .../module/thrift_mutable_types.pyi | 158 +- .../python/gen-python/module/thrift_types.py | 209 + .../python/gen-python/module/thrift_types.pyi | 63 +- .../module/thrift_types_capi.cpp | 272 +- .../fixtures/complex-struct/src/module.thrift | 22 + 20 files changed, 8212 insertions(+), 752 deletions(-) diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_constants.cpp b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_constants.cpp index 6d194b15716..71bf91cda17 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_constants.cpp +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_constants.cpp @@ -20,10 +20,10 @@ ::cpp2::MyUnion const& constEnumUnion() { } -::std::string_view _fbthrift_schema_26752209a8354ec6() { +::std::string_view _fbthrift_schema_d1e2b182941d1fa6() { return ""; } -::folly::Range _fbthrift_schema_26752209a8354ec6_includes() { +::folly::Range _fbthrift_schema_d1e2b182941d1fa6_includes() { return {}; } diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_constants.h b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_constants.h index fa37ec3364b..997da8b8709 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_constants.h +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_constants.h @@ -24,8 +24,8 @@ namespace module_constants { /** Glean {"constant": "constEnumUnion"} */ ::cpp2::MyUnion const& constEnumUnion(); - FOLLY_EXPORT ::std::string_view _fbthrift_schema_26752209a8354ec6(); - FOLLY_EXPORT ::folly::Range _fbthrift_schema_26752209a8354ec6_includes(); + FOLLY_EXPORT ::std::string_view _fbthrift_schema_d1e2b182941d1fa6(); + FOLLY_EXPORT ::folly::Range _fbthrift_schema_d1e2b182941d1fa6_includes(); } // namespace module_constants } // namespace cpp2 diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_data.cpp b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_data.cpp index 03cda6e0577..4801a81f4e6 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_data.cpp +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_data.cpp @@ -759,7 +759,7 @@ THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::complexEx }}; THRIFT_DATA_MEMBER const std::string_view TStructDataStorage<::cpp2::Containers>::name = "Containers"; -THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::fields_names = { { +THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::fields_names = { { "struct_list"sv, "union_list"sv, "enum_list"sv, @@ -778,8 +778,27 @@ THRIFT_DATA_MEMBER const std::array TStructDataStorage<::c "set_map_2"sv, "map_map"sv, "map_map_2"sv, -}}; -THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::fields_ids = { { + "list_list_i32"sv, + "list_list_struct"sv, + "list_set_i32"sv, + "list_set_struct"sv, + "list_map_i32_i32"sv, + "list_map_i32_struct"sv, + "list_map_struct_i32"sv, + "set_list_i32"sv, + "set_list_struct"sv, + "set_set_i32"sv, + "set_set_struct"sv, + "set_map_i32_i32"sv, + "set_map_i32_struct"sv, + "set_map_struct_i32"sv, + "map_i32_map_i32_i32"sv, + "map_i32_map_struct_i32"sv, + "map_i32_map_i32_struct"sv, + "map_i32_map_list_i32_i32"sv, + "map_i32_map_list_struct_i32"sv, +}}; +THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::fields_ids = { { 1, 2, 3, @@ -798,8 +817,27 @@ THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Cont 16, 17, 18, -}}; -THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::fields_types = { { + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, +}}; +THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::fields_types = { { TType::T_LIST, TType::T_LIST, TType::T_LIST, @@ -818,8 +856,27 @@ THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cp TType::T_MAP, TType::T_MAP, TType::T_MAP, + TType::T_LIST, + TType::T_LIST, + TType::T_LIST, + TType::T_LIST, + TType::T_LIST, + TType::T_LIST, + TType::T_LIST, + TType::T_SET, + TType::T_SET, + TType::T_SET, + TType::T_SET, + TType::T_SET, + TType::T_SET, + TType::T_SET, + TType::T_MAP, + TType::T_MAP, + TType::T_MAP, + TType::T_MAP, + TType::T_MAP, }}; -THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::storage_names = { { +THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::storage_names = { { "__fbthrift_field_struct_list"sv, "__fbthrift_field_union_list"sv, "__fbthrift_field_enum_list"sv, @@ -838,8 +895,27 @@ THRIFT_DATA_MEMBER const std::array TStructDataStorage<::c "__fbthrift_field_set_map_2"sv, "__fbthrift_field_map_map"sv, "__fbthrift_field_map_map_2"sv, -}}; -THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::isset_indexes = { { + "__fbthrift_field_list_list_i32"sv, + "__fbthrift_field_list_list_struct"sv, + "__fbthrift_field_list_set_i32"sv, + "__fbthrift_field_list_set_struct"sv, + "__fbthrift_field_list_map_i32_i32"sv, + "__fbthrift_field_list_map_i32_struct"sv, + "__fbthrift_field_list_map_struct_i32"sv, + "__fbthrift_field_set_list_i32"sv, + "__fbthrift_field_set_list_struct"sv, + "__fbthrift_field_set_set_i32"sv, + "__fbthrift_field_set_set_struct"sv, + "__fbthrift_field_set_map_i32_i32"sv, + "__fbthrift_field_set_map_i32_struct"sv, + "__fbthrift_field_set_map_struct_i32"sv, + "__fbthrift_field_map_i32_map_i32_i32"sv, + "__fbthrift_field_map_i32_map_struct_i32"sv, + "__fbthrift_field_map_i32_map_i32_struct"sv, + "__fbthrift_field_map_i32_map_list_i32_i32"sv, + "__fbthrift_field_map_i32_map_list_struct_i32"sv, +}}; +THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containers>::isset_indexes = { { 0, 1, 2, @@ -858,6 +934,25 @@ THRIFT_DATA_MEMBER const std::array TStructDataStorage<::cpp2::Containe 15, 16, 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, }}; } // namespace thrift diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_data.h b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_data.h index 1d9a85d245e..8a837d79b9e 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_data.h +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_data.h @@ -310,7 +310,7 @@ template <> struct TStructDataStorage<::cpp2::complexException> { }; template <> struct TStructDataStorage<::cpp2::Containers> { - static constexpr const std::size_t fields_size = 18; + static constexpr const std::size_t fields_size = 37; static const std::string_view name; static const std::array fields_names; static const std::array fields_ids; diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_for_each_field.h b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_for_each_field.h index 60e7cb9adf2..07c615120f9 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_for_each_field.h +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_for_each_field.h @@ -249,6 +249,25 @@ struct ForEachField<::cpp2::Containers> { f(15, static_cast(t).set_map_2_ref()...); f(16, static_cast(t).map_map_ref()...); f(17, static_cast(t).map_map_2_ref()...); + f(18, static_cast(t).list_list_i32_ref()...); + f(19, static_cast(t).list_list_struct_ref()...); + f(20, static_cast(t).list_set_i32_ref()...); + f(21, static_cast(t).list_set_struct_ref()...); + f(22, static_cast(t).list_map_i32_i32_ref()...); + f(23, static_cast(t).list_map_i32_struct_ref()...); + f(24, static_cast(t).list_map_struct_i32_ref()...); + f(25, static_cast(t).set_list_i32_ref()...); + f(26, static_cast(t).set_list_struct_ref()...); + f(27, static_cast(t).set_set_i32_ref()...); + f(28, static_cast(t).set_set_struct_ref()...); + f(29, static_cast(t).set_map_i32_i32_ref()...); + f(30, static_cast(t).set_map_i32_struct_ref()...); + f(31, static_cast(t).set_map_struct_i32_ref()...); + f(32, static_cast(t).map_i32_map_i32_i32_ref()...); + f(33, static_cast(t).map_i32_map_struct_i32_ref()...); + f(34, static_cast(t).map_i32_map_i32_struct_ref()...); + f(35, static_cast(t).map_i32_map_list_i32_i32_ref()...); + f(36, static_cast(t).map_i32_map_list_struct_i32_ref()...); } }; } // namespace detail diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_metadata.cpp b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_metadata.cpp index 7e57bb38ce7..4b905aef3f7 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_metadata.cpp +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_metadata.cpp @@ -369,8 +369,8 @@ StructMetadata<::cpp2::Containers>::gen(ThriftMetadata& metadata) { module_Containers.name() = "module.Containers"; module_Containers.is_union() = false; static const auto* const - module_Containers_fields = new std::array{ { - { 1, "struct_list", false, std::make_unique(std::make_unique>("module.MyStruct")), std::vector{ }}, { 2, "union_list", false, std::make_unique(std::make_unique>("module.MyUnion")), std::vector{ }}, { 3, "enum_list", false, std::make_unique(std::make_unique>("module.MyEnum")), std::vector{ }}, { 4, "struct_set", false, std::make_unique(std::make_unique>("module.MyStruct")), std::vector{ }}, { 5, "union_set", false, std::make_unique(std::make_unique>("module.MyUnion")), std::vector{ }}, { 6, "enum_set", false, std::make_unique(std::make_unique>("module.MyEnum")), std::vector{ }}, { 7, "struct_map", false, std::make_unique(std::make_unique>("module.MyStruct"), std::make_unique(ThriftPrimitiveType::THRIFT_I64_TYPE)), std::vector{ }}, { 8, "union_map", false, std::make_unique(std::make_unique>("module.MyUnion"), std::make_unique(ThriftPrimitiveType::THRIFT_I64_TYPE)), std::vector{ }}, { 9, "enum_map", false, std::make_unique(std::make_unique>("module.MyEnum"), std::make_unique(ThriftPrimitiveType::THRIFT_I64_TYPE)), std::vector{ }}, { 10, "struct_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique>("module.MyStruct")), std::vector{ }}, { 11, "union_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique>("module.MyUnion")), std::vector{ }}, { 12, "enum_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique>("module.MyEnum")), std::vector{ }}, { 13, "list_map", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::vector{ }}, { 14, "list_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 15, "set_map", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::vector{ }}, { 16, "set_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 17, "map_map", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::vector{ }}, { 18, "map_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, }}; + module_Containers_fields = new std::array{ { + { 1, "struct_list", false, std::make_unique(std::make_unique>("module.MyStruct")), std::vector{ }}, { 2, "union_list", false, std::make_unique(std::make_unique>("module.MyUnion")), std::vector{ }}, { 3, "enum_list", false, std::make_unique(std::make_unique>("module.MyEnum")), std::vector{ }}, { 4, "struct_set", false, std::make_unique(std::make_unique>("module.MyStruct")), std::vector{ }}, { 5, "union_set", false, std::make_unique(std::make_unique>("module.MyUnion")), std::vector{ }}, { 6, "enum_set", false, std::make_unique(std::make_unique>("module.MyEnum")), std::vector{ }}, { 7, "struct_map", false, std::make_unique(std::make_unique>("module.MyStruct"), std::make_unique(ThriftPrimitiveType::THRIFT_I64_TYPE)), std::vector{ }}, { 8, "union_map", false, std::make_unique(std::make_unique>("module.MyUnion"), std::make_unique(ThriftPrimitiveType::THRIFT_I64_TYPE)), std::vector{ }}, { 9, "enum_map", false, std::make_unique(std::make_unique>("module.MyEnum"), std::make_unique(ThriftPrimitiveType::THRIFT_I64_TYPE)), std::vector{ }}, { 10, "struct_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique>("module.MyStruct")), std::vector{ }}, { 11, "union_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique>("module.MyUnion")), std::vector{ }}, { 12, "enum_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique>("module.MyEnum")), std::vector{ }}, { 13, "list_map", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::vector{ }}, { 14, "list_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 15, "set_map", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::vector{ }}, { 16, "set_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 17, "map_map", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)), std::vector{ }}, { 18, "map_map_2", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 19, "list_list_i32", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 20, "list_list_struct", false, std::make_unique(std::make_unique(std::make_unique>("module.MyStruct"))), std::vector{ }}, { 21, "list_set_i32", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 22, "list_set_struct", false, std::make_unique(std::make_unique(std::make_unique>("module.MyStruct"))), std::vector{ }}, { 23, "list_map_i32_i32", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 24, "list_map_i32_struct", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique>("module.MyStruct"))), std::vector{ }}, { 25, "list_map_struct_i32", false, std::make_unique(std::make_unique(std::make_unique>("module.MyStruct"), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 26, "set_list_i32", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 27, "set_list_struct", false, std::make_unique(std::make_unique(std::make_unique>("module.MyStruct"))), std::vector{ }}, { 28, "set_set_i32", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 29, "set_set_struct", false, std::make_unique(std::make_unique(std::make_unique>("module.MyStruct"))), std::vector{ }}, { 30, "set_map_i32_i32", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 31, "set_map_i32_struct", false, std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique>("module.MyStruct"))), std::vector{ }}, { 32, "set_map_struct_i32", false, std::make_unique(std::make_unique(std::make_unique>("module.MyStruct"), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 33, "map_i32_map_i32_i32", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 34, "map_i32_map_struct_i32", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique>("module.MyStruct"), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE))), std::vector{ }}, { 35, "map_i32_map_i32_struct", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique>("module.MyStruct"))), std::vector{ }}, { 36, "map_i32_map_list_i32_i32", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)))), std::vector{ }}, { 37, "map_i32_map_list_struct_i32", false, std::make_unique(std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE), std::make_unique(std::make_unique(std::make_unique>("module.MyStruct"), std::make_unique(ThriftPrimitiveType::THRIFT_I32_TYPE)))), std::vector{ }}, }}; for (const auto& f : *module_Containers_fields) { ::apache::thrift::metadata::ThriftField field; field.id() = f.id; diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.cpp b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.cpp index 9b0f985375d..9d110783615 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.cpp +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.cpp @@ -3075,6 +3075,25 @@ Containers::Containers([[maybe_unused]] Containers&& other) noexcept : __fbthrift_field_set_map_2(std::move(other.__fbthrift_field_set_map_2)), __fbthrift_field_map_map(std::move(other.__fbthrift_field_map_map)), __fbthrift_field_map_map_2(std::move(other.__fbthrift_field_map_map_2)), + __fbthrift_field_list_list_i32(std::move(other.__fbthrift_field_list_list_i32)), + __fbthrift_field_list_list_struct(std::move(other.__fbthrift_field_list_list_struct)), + __fbthrift_field_list_set_i32(std::move(other.__fbthrift_field_list_set_i32)), + __fbthrift_field_list_set_struct(std::move(other.__fbthrift_field_list_set_struct)), + __fbthrift_field_list_map_i32_i32(std::move(other.__fbthrift_field_list_map_i32_i32)), + __fbthrift_field_list_map_i32_struct(std::move(other.__fbthrift_field_list_map_i32_struct)), + __fbthrift_field_list_map_struct_i32(std::move(other.__fbthrift_field_list_map_struct_i32)), + __fbthrift_field_set_list_i32(std::move(other.__fbthrift_field_set_list_i32)), + __fbthrift_field_set_list_struct(std::move(other.__fbthrift_field_set_list_struct)), + __fbthrift_field_set_set_i32(std::move(other.__fbthrift_field_set_set_i32)), + __fbthrift_field_set_set_struct(std::move(other.__fbthrift_field_set_set_struct)), + __fbthrift_field_set_map_i32_i32(std::move(other.__fbthrift_field_set_map_i32_i32)), + __fbthrift_field_set_map_i32_struct(std::move(other.__fbthrift_field_set_map_i32_struct)), + __fbthrift_field_set_map_struct_i32(std::move(other.__fbthrift_field_set_map_struct_i32)), + __fbthrift_field_map_i32_map_i32_i32(std::move(other.__fbthrift_field_map_i32_map_i32_i32)), + __fbthrift_field_map_i32_map_struct_i32(std::move(other.__fbthrift_field_map_i32_map_struct_i32)), + __fbthrift_field_map_i32_map_i32_struct(std::move(other.__fbthrift_field_map_i32_map_i32_struct)), + __fbthrift_field_map_i32_map_list_i32_i32(std::move(other.__fbthrift_field_map_i32_map_list_i32_i32)), + __fbthrift_field_map_i32_map_list_struct_i32(std::move(other.__fbthrift_field_map_i32_map_list_struct_i32)), __isset(other.__isset) { } @@ -3097,12 +3116,31 @@ Containers& Containers::operator=([[maybe_unused]] Containers&& other) noexcept this->__fbthrift_field_set_map_2 = std::move(other.__fbthrift_field_set_map_2); this->__fbthrift_field_map_map = std::move(other.__fbthrift_field_map_map); this->__fbthrift_field_map_map_2 = std::move(other.__fbthrift_field_map_map_2); + this->__fbthrift_field_list_list_i32 = std::move(other.__fbthrift_field_list_list_i32); + this->__fbthrift_field_list_list_struct = std::move(other.__fbthrift_field_list_list_struct); + this->__fbthrift_field_list_set_i32 = std::move(other.__fbthrift_field_list_set_i32); + this->__fbthrift_field_list_set_struct = std::move(other.__fbthrift_field_list_set_struct); + this->__fbthrift_field_list_map_i32_i32 = std::move(other.__fbthrift_field_list_map_i32_i32); + this->__fbthrift_field_list_map_i32_struct = std::move(other.__fbthrift_field_list_map_i32_struct); + this->__fbthrift_field_list_map_struct_i32 = std::move(other.__fbthrift_field_list_map_struct_i32); + this->__fbthrift_field_set_list_i32 = std::move(other.__fbthrift_field_set_list_i32); + this->__fbthrift_field_set_list_struct = std::move(other.__fbthrift_field_set_list_struct); + this->__fbthrift_field_set_set_i32 = std::move(other.__fbthrift_field_set_set_i32); + this->__fbthrift_field_set_set_struct = std::move(other.__fbthrift_field_set_set_struct); + this->__fbthrift_field_set_map_i32_i32 = std::move(other.__fbthrift_field_set_map_i32_i32); + this->__fbthrift_field_set_map_i32_struct = std::move(other.__fbthrift_field_set_map_i32_struct); + this->__fbthrift_field_set_map_struct_i32 = std::move(other.__fbthrift_field_set_map_struct_i32); + this->__fbthrift_field_map_i32_map_i32_i32 = std::move(other.__fbthrift_field_map_i32_map_i32_i32); + this->__fbthrift_field_map_i32_map_struct_i32 = std::move(other.__fbthrift_field_map_i32_map_struct_i32); + this->__fbthrift_field_map_i32_map_i32_struct = std::move(other.__fbthrift_field_map_i32_map_i32_struct); + this->__fbthrift_field_map_i32_map_list_i32_i32 = std::move(other.__fbthrift_field_map_i32_map_list_i32_i32); + this->__fbthrift_field_map_i32_map_list_struct_i32 = std::move(other.__fbthrift_field_map_i32_map_list_struct_i32); __isset = other.__isset; return *this; } -Containers::Containers(apache::thrift::FragileConstructor, ::std::vector<::cpp2::MyStruct> struct_list__arg, ::std::vector<::cpp2::MyUnion> union_list__arg, ::std::vector<::cpp2::MyEnum> enum_list__arg, ::std::set<::cpp2::MyStruct> struct_set__arg, ::std::set<::cpp2::MyUnion> union_set__arg, ::std::set<::cpp2::MyEnum> enum_set__arg, ::std::map<::cpp2::MyStruct, ::std::int64_t> struct_map__arg, ::std::map<::cpp2::MyUnion, ::std::int64_t> union_map__arg, ::std::map<::cpp2::MyEnum, ::std::int64_t> enum_map__arg, ::std::map<::std::int32_t, ::cpp2::MyStruct> struct_map_2__arg, ::std::map<::std::int32_t, ::cpp2::MyUnion> union_map_2__arg, ::std::map<::std::int32_t, ::cpp2::MyEnum> enum_map_2__arg, ::std::map<::std::vector<::std::int32_t>, ::std::int32_t> list_map__arg, ::std::map<::std::int32_t, ::std::vector<::std::int32_t>> list_map_2__arg, ::std::map<::std::set<::std::int32_t>, ::std::int32_t> set_map__arg, ::std::map<::std::int32_t, ::std::set<::std::int32_t>> set_map_2__arg, ::std::map<::std::map<::std::int32_t, ::std::int32_t>, ::std::int32_t> map_map__arg, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> map_map_2__arg) : +Containers::Containers(apache::thrift::FragileConstructor, ::std::vector<::cpp2::MyStruct> struct_list__arg, ::std::vector<::cpp2::MyUnion> union_list__arg, ::std::vector<::cpp2::MyEnum> enum_list__arg, ::std::set<::cpp2::MyStruct> struct_set__arg, ::std::set<::cpp2::MyUnion> union_set__arg, ::std::set<::cpp2::MyEnum> enum_set__arg, ::std::map<::cpp2::MyStruct, ::std::int64_t> struct_map__arg, ::std::map<::cpp2::MyUnion, ::std::int64_t> union_map__arg, ::std::map<::cpp2::MyEnum, ::std::int64_t> enum_map__arg, ::std::map<::std::int32_t, ::cpp2::MyStruct> struct_map_2__arg, ::std::map<::std::int32_t, ::cpp2::MyUnion> union_map_2__arg, ::std::map<::std::int32_t, ::cpp2::MyEnum> enum_map_2__arg, ::std::map<::std::vector<::std::int32_t>, ::std::int32_t> list_map__arg, ::std::map<::std::int32_t, ::std::vector<::std::int32_t>> list_map_2__arg, ::std::map<::std::set<::std::int32_t>, ::std::int32_t> set_map__arg, ::std::map<::std::int32_t, ::std::set<::std::int32_t>> set_map_2__arg, ::std::map<::std::map<::std::int32_t, ::std::int32_t>, ::std::int32_t> map_map__arg, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> map_map_2__arg, ::std::vector<::std::vector<::std::int32_t>> list_list_i32__arg, ::std::vector<::std::vector<::cpp2::MyStruct>> list_list_struct__arg, ::std::vector<::std::set<::std::int32_t>> list_set_i32__arg, ::std::vector<::std::set<::cpp2::MyStruct>> list_set_struct__arg, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>> list_map_i32_i32__arg, ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>> list_map_i32_struct__arg, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>> list_map_struct_i32__arg, ::std::set<::std::vector<::std::int32_t>> set_list_i32__arg, ::std::set<::std::vector<::cpp2::MyStruct>> set_list_struct__arg, ::std::set<::std::set<::std::int32_t>> set_set_i32__arg, ::std::set<::std::set<::cpp2::MyStruct>> set_set_struct__arg, ::std::set<::std::map<::std::int32_t, ::std::int32_t>> set_map_i32_i32__arg, ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>> set_map_i32_struct__arg, ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>> set_map_struct_i32__arg, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> map_i32_map_i32_i32__arg, ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>> map_i32_map_struct_i32__arg, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>> map_i32_map_i32_struct__arg, ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>> map_i32_map_list_i32_i32__arg, ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>> map_i32_map_list_struct_i32__arg) : __fbthrift_field_struct_list(std::move(struct_list__arg)), __fbthrift_field_union_list(std::move(union_list__arg)), __fbthrift_field_enum_list(std::move(enum_list__arg)), @@ -3120,7 +3158,26 @@ Containers::Containers(apache::thrift::FragileConstructor, ::std::vector<::cpp2: __fbthrift_field_set_map(std::move(set_map__arg)), __fbthrift_field_set_map_2(std::move(set_map_2__arg)), __fbthrift_field_map_map(std::move(map_map__arg)), - __fbthrift_field_map_map_2(std::move(map_map_2__arg)) { + __fbthrift_field_map_map_2(std::move(map_map_2__arg)), + __fbthrift_field_list_list_i32(std::move(list_list_i32__arg)), + __fbthrift_field_list_list_struct(std::move(list_list_struct__arg)), + __fbthrift_field_list_set_i32(std::move(list_set_i32__arg)), + __fbthrift_field_list_set_struct(std::move(list_set_struct__arg)), + __fbthrift_field_list_map_i32_i32(std::move(list_map_i32_i32__arg)), + __fbthrift_field_list_map_i32_struct(std::move(list_map_i32_struct__arg)), + __fbthrift_field_list_map_struct_i32(std::move(list_map_struct_i32__arg)), + __fbthrift_field_set_list_i32(std::move(set_list_i32__arg)), + __fbthrift_field_set_list_struct(std::move(set_list_struct__arg)), + __fbthrift_field_set_set_i32(std::move(set_set_i32__arg)), + __fbthrift_field_set_set_struct(std::move(set_set_struct__arg)), + __fbthrift_field_set_map_i32_i32(std::move(set_map_i32_i32__arg)), + __fbthrift_field_set_map_i32_struct(std::move(set_map_i32_struct__arg)), + __fbthrift_field_set_map_struct_i32(std::move(set_map_struct_i32__arg)), + __fbthrift_field_map_i32_map_i32_i32(std::move(map_i32_map_i32_i32__arg)), + __fbthrift_field_map_i32_map_struct_i32(std::move(map_i32_map_struct_i32__arg)), + __fbthrift_field_map_i32_map_i32_struct(std::move(map_i32_map_i32_struct__arg)), + __fbthrift_field_map_i32_map_list_i32_i32(std::move(map_i32_map_list_i32_i32__arg)), + __fbthrift_field_map_i32_map_list_struct_i32(std::move(map_i32_map_list_struct_i32__arg)) { __isset.set(folly::index_constant<0>(), true); __isset.set(folly::index_constant<1>(), true); __isset.set(folly::index_constant<2>(), true); @@ -3139,6 +3196,25 @@ Containers::Containers(apache::thrift::FragileConstructor, ::std::vector<::cpp2: __isset.set(folly::index_constant<15>(), true); __isset.set(folly::index_constant<16>(), true); __isset.set(folly::index_constant<17>(), true); + __isset.set(folly::index_constant<18>(), true); + __isset.set(folly::index_constant<19>(), true); + __isset.set(folly::index_constant<20>(), true); + __isset.set(folly::index_constant<21>(), true); + __isset.set(folly::index_constant<22>(), true); + __isset.set(folly::index_constant<23>(), true); + __isset.set(folly::index_constant<24>(), true); + __isset.set(folly::index_constant<25>(), true); + __isset.set(folly::index_constant<26>(), true); + __isset.set(folly::index_constant<27>(), true); + __isset.set(folly::index_constant<28>(), true); + __isset.set(folly::index_constant<29>(), true); + __isset.set(folly::index_constant<30>(), true); + __isset.set(folly::index_constant<31>(), true); + __isset.set(folly::index_constant<32>(), true); + __isset.set(folly::index_constant<33>(), true); + __isset.set(folly::index_constant<34>(), true); + __isset.set(folly::index_constant<35>(), true); + __isset.set(folly::index_constant<36>(), true); } @@ -3162,6 +3238,25 @@ void Containers::__fbthrift_clear() { this->__fbthrift_field_set_map_2.clear(); this->__fbthrift_field_map_map.clear(); this->__fbthrift_field_map_map_2.clear(); + this->__fbthrift_field_list_list_i32.clear(); + this->__fbthrift_field_list_list_struct.clear(); + this->__fbthrift_field_list_set_i32.clear(); + this->__fbthrift_field_list_set_struct.clear(); + this->__fbthrift_field_list_map_i32_i32.clear(); + this->__fbthrift_field_list_map_i32_struct.clear(); + this->__fbthrift_field_list_map_struct_i32.clear(); + this->__fbthrift_field_set_list_i32.clear(); + this->__fbthrift_field_set_list_struct.clear(); + this->__fbthrift_field_set_set_i32.clear(); + this->__fbthrift_field_set_set_struct.clear(); + this->__fbthrift_field_set_map_i32_i32.clear(); + this->__fbthrift_field_set_map_i32_struct.clear(); + this->__fbthrift_field_set_map_struct_i32.clear(); + this->__fbthrift_field_map_i32_map_i32_i32.clear(); + this->__fbthrift_field_map_i32_map_struct_i32.clear(); + this->__fbthrift_field_map_i32_map_i32_struct.clear(); + this->__fbthrift_field_map_i32_map_list_i32_i32.clear(); + this->__fbthrift_field_map_i32_map_list_struct_i32.clear(); __isset = {}; } @@ -3325,6 +3420,158 @@ ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> Container return static_cast<::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>&&>(__fbthrift_field_map_map_2); } +const ::std::vector<::std::vector<::std::int32_t>>& Containers::get_list_list_i32() const& { + return __fbthrift_field_list_list_i32; +} + +::std::vector<::std::vector<::std::int32_t>> Containers::get_list_list_i32() && { + return static_cast<::std::vector<::std::vector<::std::int32_t>>&&>(__fbthrift_field_list_list_i32); +} + +const ::std::vector<::std::vector<::cpp2::MyStruct>>& Containers::get_list_list_struct() const& { + return __fbthrift_field_list_list_struct; +} + +::std::vector<::std::vector<::cpp2::MyStruct>> Containers::get_list_list_struct() && { + return static_cast<::std::vector<::std::vector<::cpp2::MyStruct>>&&>(__fbthrift_field_list_list_struct); +} + +const ::std::vector<::std::set<::std::int32_t>>& Containers::get_list_set_i32() const& { + return __fbthrift_field_list_set_i32; +} + +::std::vector<::std::set<::std::int32_t>> Containers::get_list_set_i32() && { + return static_cast<::std::vector<::std::set<::std::int32_t>>&&>(__fbthrift_field_list_set_i32); +} + +const ::std::vector<::std::set<::cpp2::MyStruct>>& Containers::get_list_set_struct() const& { + return __fbthrift_field_list_set_struct; +} + +::std::vector<::std::set<::cpp2::MyStruct>> Containers::get_list_set_struct() && { + return static_cast<::std::vector<::std::set<::cpp2::MyStruct>>&&>(__fbthrift_field_list_set_struct); +} + +const ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>& Containers::get_list_map_i32_i32() const& { + return __fbthrift_field_list_map_i32_i32; +} + +::std::vector<::std::map<::std::int32_t, ::std::int32_t>> Containers::get_list_map_i32_i32() && { + return static_cast<::std::vector<::std::map<::std::int32_t, ::std::int32_t>>&&>(__fbthrift_field_list_map_i32_i32); +} + +const ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>& Containers::get_list_map_i32_struct() const& { + return __fbthrift_field_list_map_i32_struct; +} + +::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>> Containers::get_list_map_i32_struct() && { + return static_cast<::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>&&>(__fbthrift_field_list_map_i32_struct); +} + +const ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>& Containers::get_list_map_struct_i32() const& { + return __fbthrift_field_list_map_struct_i32; +} + +::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>> Containers::get_list_map_struct_i32() && { + return static_cast<::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>&&>(__fbthrift_field_list_map_struct_i32); +} + +const ::std::set<::std::vector<::std::int32_t>>& Containers::get_set_list_i32() const& { + return __fbthrift_field_set_list_i32; +} + +::std::set<::std::vector<::std::int32_t>> Containers::get_set_list_i32() && { + return static_cast<::std::set<::std::vector<::std::int32_t>>&&>(__fbthrift_field_set_list_i32); +} + +const ::std::set<::std::vector<::cpp2::MyStruct>>& Containers::get_set_list_struct() const& { + return __fbthrift_field_set_list_struct; +} + +::std::set<::std::vector<::cpp2::MyStruct>> Containers::get_set_list_struct() && { + return static_cast<::std::set<::std::vector<::cpp2::MyStruct>>&&>(__fbthrift_field_set_list_struct); +} + +const ::std::set<::std::set<::std::int32_t>>& Containers::get_set_set_i32() const& { + return __fbthrift_field_set_set_i32; +} + +::std::set<::std::set<::std::int32_t>> Containers::get_set_set_i32() && { + return static_cast<::std::set<::std::set<::std::int32_t>>&&>(__fbthrift_field_set_set_i32); +} + +const ::std::set<::std::set<::cpp2::MyStruct>>& Containers::get_set_set_struct() const& { + return __fbthrift_field_set_set_struct; +} + +::std::set<::std::set<::cpp2::MyStruct>> Containers::get_set_set_struct() && { + return static_cast<::std::set<::std::set<::cpp2::MyStruct>>&&>(__fbthrift_field_set_set_struct); +} + +const ::std::set<::std::map<::std::int32_t, ::std::int32_t>>& Containers::get_set_map_i32_i32() const& { + return __fbthrift_field_set_map_i32_i32; +} + +::std::set<::std::map<::std::int32_t, ::std::int32_t>> Containers::get_set_map_i32_i32() && { + return static_cast<::std::set<::std::map<::std::int32_t, ::std::int32_t>>&&>(__fbthrift_field_set_map_i32_i32); +} + +const ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>& Containers::get_set_map_i32_struct() const& { + return __fbthrift_field_set_map_i32_struct; +} + +::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>> Containers::get_set_map_i32_struct() && { + return static_cast<::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>&&>(__fbthrift_field_set_map_i32_struct); +} + +const ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>& Containers::get_set_map_struct_i32() const& { + return __fbthrift_field_set_map_struct_i32; +} + +::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>> Containers::get_set_map_struct_i32() && { + return static_cast<::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>&&>(__fbthrift_field_set_map_struct_i32); +} + +const ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>& Containers::get_map_i32_map_i32_i32() const& { + return __fbthrift_field_map_i32_map_i32_i32; +} + +::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> Containers::get_map_i32_map_i32_i32() && { + return static_cast<::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>&&>(__fbthrift_field_map_i32_map_i32_i32); +} + +const ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>& Containers::get_map_i32_map_struct_i32() const& { + return __fbthrift_field_map_i32_map_struct_i32; +} + +::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>> Containers::get_map_i32_map_struct_i32() && { + return static_cast<::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>&&>(__fbthrift_field_map_i32_map_struct_i32); +} + +const ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>& Containers::get_map_i32_map_i32_struct() const& { + return __fbthrift_field_map_i32_map_i32_struct; +} + +::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>> Containers::get_map_i32_map_i32_struct() && { + return static_cast<::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>&&>(__fbthrift_field_map_i32_map_i32_struct); +} + +const ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>& Containers::get_map_i32_map_list_i32_i32() const& { + return __fbthrift_field_map_i32_map_list_i32_i32; +} + +::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>> Containers::get_map_i32_map_list_i32_i32() && { + return static_cast<::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>&&>(__fbthrift_field_map_i32_map_list_i32_i32); +} + +const ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>& Containers::get_map_i32_map_list_struct_i32() const& { + return __fbthrift_field_map_i32_map_list_struct_i32; +} + +::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>> Containers::get_map_i32_map_list_struct_i32() && { + return static_cast<::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>&&>(__fbthrift_field_map_i32_map_list_struct_i32); +} + void swap([[maybe_unused]] Containers& a, [[maybe_unused]] Containers& b) { using ::std::swap; swap(a.__fbthrift_field_struct_list, b.__fbthrift_field_struct_list); @@ -3345,6 +3592,25 @@ void swap([[maybe_unused]] Containers& a, [[maybe_unused]] Containers& b) { swap(a.__fbthrift_field_set_map_2, b.__fbthrift_field_set_map_2); swap(a.__fbthrift_field_map_map, b.__fbthrift_field_map_map); swap(a.__fbthrift_field_map_map_2, b.__fbthrift_field_map_map_2); + swap(a.__fbthrift_field_list_list_i32, b.__fbthrift_field_list_list_i32); + swap(a.__fbthrift_field_list_list_struct, b.__fbthrift_field_list_list_struct); + swap(a.__fbthrift_field_list_set_i32, b.__fbthrift_field_list_set_i32); + swap(a.__fbthrift_field_list_set_struct, b.__fbthrift_field_list_set_struct); + swap(a.__fbthrift_field_list_map_i32_i32, b.__fbthrift_field_list_map_i32_i32); + swap(a.__fbthrift_field_list_map_i32_struct, b.__fbthrift_field_list_map_i32_struct); + swap(a.__fbthrift_field_list_map_struct_i32, b.__fbthrift_field_list_map_struct_i32); + swap(a.__fbthrift_field_set_list_i32, b.__fbthrift_field_set_list_i32); + swap(a.__fbthrift_field_set_list_struct, b.__fbthrift_field_set_list_struct); + swap(a.__fbthrift_field_set_set_i32, b.__fbthrift_field_set_set_i32); + swap(a.__fbthrift_field_set_set_struct, b.__fbthrift_field_set_set_struct); + swap(a.__fbthrift_field_set_map_i32_i32, b.__fbthrift_field_set_map_i32_i32); + swap(a.__fbthrift_field_set_map_i32_struct, b.__fbthrift_field_set_map_i32_struct); + swap(a.__fbthrift_field_set_map_struct_i32, b.__fbthrift_field_set_map_struct_i32); + swap(a.__fbthrift_field_map_i32_map_i32_i32, b.__fbthrift_field_map_i32_map_i32_i32); + swap(a.__fbthrift_field_map_i32_map_struct_i32, b.__fbthrift_field_map_i32_map_struct_i32); + swap(a.__fbthrift_field_map_i32_map_i32_struct, b.__fbthrift_field_map_i32_map_i32_struct); + swap(a.__fbthrift_field_map_i32_map_list_i32_i32, b.__fbthrift_field_map_i32_map_list_i32_i32); + swap(a.__fbthrift_field_map_i32_map_list_struct_i32, b.__fbthrift_field_map_i32_map_list_struct_i32); swap(a.__isset, b.__isset); } @@ -3405,6 +3671,72 @@ static_assert( ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::variant>, ::std::map<::std::int32_t, ::cpp2::MyUnion>>, "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::list<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, + ::std::vector<::std::vector<::cpp2::MyStruct>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::list<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, + ::std::vector<::std::set<::cpp2::MyStruct>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, + ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, + ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::set<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, + ::std::set<::std::vector<::cpp2::MyStruct>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::set<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, + ::std::set<::std::set<::cpp2::MyStruct>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, + ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, + ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, + ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, + ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>>, + "inconsistent use of json option"); +static_assert( + ::apache::thrift::detail::st::gen_check_json< + Containers, + ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>>, + ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>>, + "inconsistent use of json option"); } // namespace cpp2 diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.h b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.h index 1a1a11f4f62..cb1e2fa9137 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.h +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.h @@ -140,6 +140,25 @@ struct set_map; struct set_map_2; struct map_map; struct map_map_2; +struct list_list_i32; +struct list_list_struct; +struct list_set_i32; +struct list_set_struct; +struct list_map_i32_i32; +struct list_map_i32_struct; +struct list_map_struct_i32; +struct set_list_i32; +struct set_list_struct; +struct set_set_i32; +struct set_set_struct; +struct set_map_i32_i32; +struct set_map_i32_struct; +struct set_map_struct_i32; +struct map_i32_map_i32_i32; +struct map_i32_map_struct_i32; +struct map_i32_map_i32_struct; +struct map_i32_map_list_i32_i32; +struct map_i32_map_list_struct_i32; } // namespace ident namespace detail { #ifndef APACHE_THRIFT_ACCESSOR_myLongField @@ -650,6 +669,82 @@ APACHE_THRIFT_DEFINE_ACCESSOR(map_map); #define APACHE_THRIFT_ACCESSOR_map_map_2 APACHE_THRIFT_DEFINE_ACCESSOR(map_map_2); #endif +#ifndef APACHE_THRIFT_ACCESSOR_list_list_i32 +#define APACHE_THRIFT_ACCESSOR_list_list_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(list_list_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_list_list_struct +#define APACHE_THRIFT_ACCESSOR_list_list_struct +APACHE_THRIFT_DEFINE_ACCESSOR(list_list_struct); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_list_set_i32 +#define APACHE_THRIFT_ACCESSOR_list_set_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(list_set_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_list_set_struct +#define APACHE_THRIFT_ACCESSOR_list_set_struct +APACHE_THRIFT_DEFINE_ACCESSOR(list_set_struct); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_list_map_i32_i32 +#define APACHE_THRIFT_ACCESSOR_list_map_i32_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(list_map_i32_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_list_map_i32_struct +#define APACHE_THRIFT_ACCESSOR_list_map_i32_struct +APACHE_THRIFT_DEFINE_ACCESSOR(list_map_i32_struct); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_list_map_struct_i32 +#define APACHE_THRIFT_ACCESSOR_list_map_struct_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(list_map_struct_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_set_list_i32 +#define APACHE_THRIFT_ACCESSOR_set_list_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(set_list_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_set_list_struct +#define APACHE_THRIFT_ACCESSOR_set_list_struct +APACHE_THRIFT_DEFINE_ACCESSOR(set_list_struct); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_set_set_i32 +#define APACHE_THRIFT_ACCESSOR_set_set_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(set_set_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_set_set_struct +#define APACHE_THRIFT_ACCESSOR_set_set_struct +APACHE_THRIFT_DEFINE_ACCESSOR(set_set_struct); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_set_map_i32_i32 +#define APACHE_THRIFT_ACCESSOR_set_map_i32_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(set_map_i32_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_set_map_i32_struct +#define APACHE_THRIFT_ACCESSOR_set_map_i32_struct +APACHE_THRIFT_DEFINE_ACCESSOR(set_map_i32_struct); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_set_map_struct_i32 +#define APACHE_THRIFT_ACCESSOR_set_map_struct_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(set_map_struct_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_map_i32_map_i32_i32 +#define APACHE_THRIFT_ACCESSOR_map_i32_map_i32_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(map_i32_map_i32_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_map_i32_map_struct_i32 +#define APACHE_THRIFT_ACCESSOR_map_i32_map_struct_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(map_i32_map_struct_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_map_i32_map_i32_struct +#define APACHE_THRIFT_ACCESSOR_map_i32_map_i32_struct +APACHE_THRIFT_DEFINE_ACCESSOR(map_i32_map_i32_struct); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_map_i32_map_list_i32_i32 +#define APACHE_THRIFT_ACCESSOR_map_i32_map_list_i32_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(map_i32_map_list_i32_i32); +#endif +#ifndef APACHE_THRIFT_ACCESSOR_map_i32_map_list_struct_i32 +#define APACHE_THRIFT_ACCESSOR_map_i32_map_list_struct_i32 +APACHE_THRIFT_DEFINE_ACCESSOR(map_i32_map_list_struct_i32); +#endif } // namespace detail } // namespace thrift } // namespace apache @@ -9796,10 +9891,29 @@ class Containers final { ::apache::thrift::ident::set_map, ::apache::thrift::ident::set_map_2, ::apache::thrift::ident::map_map, - ::apache::thrift::ident::map_map_2 + ::apache::thrift::ident::map_map_2, + ::apache::thrift::ident::list_list_i32, + ::apache::thrift::ident::list_list_struct, + ::apache::thrift::ident::list_set_i32, + ::apache::thrift::ident::list_set_struct, + ::apache::thrift::ident::list_map_i32_i32, + ::apache::thrift::ident::list_map_i32_struct, + ::apache::thrift::ident::list_map_struct_i32, + ::apache::thrift::ident::set_list_i32, + ::apache::thrift::ident::set_list_struct, + ::apache::thrift::ident::set_set_i32, + ::apache::thrift::ident::set_set_struct, + ::apache::thrift::ident::set_map_i32_i32, + ::apache::thrift::ident::set_map_i32_struct, + ::apache::thrift::ident::set_map_struct_i32, + ::apache::thrift::ident::map_i32_map_i32_i32, + ::apache::thrift::ident::map_i32_map_struct_i32, + ::apache::thrift::ident::map_i32_map_i32_struct, + ::apache::thrift::ident::map_i32_map_list_i32_i32, + ::apache::thrift::ident::map_i32_map_list_struct_i32 >; - static constexpr std::int16_t __fbthrift_reflection_field_id_list[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18}; + static constexpr std::int16_t __fbthrift_reflection_field_id_list[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37}; using __fbthrift_reflection_type_tags = folly::tag_t< ::apache::thrift::type::list<::apache::thrift::type::struct_t<::cpp2::MyStruct>>, ::apache::thrift::type::list<::apache::thrift::type::union_t<::cpp2::MyUnion>>, @@ -9818,10 +9932,29 @@ class Containers final { ::apache::thrift::type::map<::apache::thrift::type::set<::apache::thrift::type::i32_t>, ::apache::thrift::type::i32_t>, ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::set<::apache::thrift::type::i32_t>>, ::apache::thrift::type::map<::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::i32_t>, ::apache::thrift::type::i32_t>, - ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::i32_t>> + ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::i32_t>>, + ::apache::thrift::type::list<::apache::thrift::type::list<::apache::thrift::type::i32_t>>, + ::apache::thrift::type::list<::apache::thrift::type::list<::apache::thrift::type::struct_t<::cpp2::MyStruct>>>, + ::apache::thrift::type::list<::apache::thrift::type::set<::apache::thrift::type::i32_t>>, + ::apache::thrift::type::list<::apache::thrift::type::set<::apache::thrift::type::struct_t<::cpp2::MyStruct>>>, + ::apache::thrift::type::list<::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::i32_t>>, + ::apache::thrift::type::list<::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::struct_t<::cpp2::MyStruct>>>, + ::apache::thrift::type::list<::apache::thrift::type::map<::apache::thrift::type::struct_t<::cpp2::MyStruct>, ::apache::thrift::type::i32_t>>, + ::apache::thrift::type::set<::apache::thrift::type::list<::apache::thrift::type::i32_t>>, + ::apache::thrift::type::set<::apache::thrift::type::list<::apache::thrift::type::struct_t<::cpp2::MyStruct>>>, + ::apache::thrift::type::set<::apache::thrift::type::set<::apache::thrift::type::i32_t>>, + ::apache::thrift::type::set<::apache::thrift::type::set<::apache::thrift::type::struct_t<::cpp2::MyStruct>>>, + ::apache::thrift::type::set<::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::i32_t>>, + ::apache::thrift::type::set<::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::struct_t<::cpp2::MyStruct>>>, + ::apache::thrift::type::set<::apache::thrift::type::map<::apache::thrift::type::struct_t<::cpp2::MyStruct>, ::apache::thrift::type::i32_t>>, + ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::i32_t>>, + ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::map<::apache::thrift::type::struct_t<::cpp2::MyStruct>, ::apache::thrift::type::i32_t>>, + ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::struct_t<::cpp2::MyStruct>>>, + ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::list<::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::i32_t>>>, + ::apache::thrift::type::map<::apache::thrift::type::i32_t, ::apache::thrift::type::list<::apache::thrift::type::map<::apache::thrift::type::struct_t<::cpp2::MyStruct>, ::apache::thrift::type::i32_t>>> >; - static constexpr std::size_t __fbthrift_field_size_v = 18; + static constexpr std::size_t __fbthrift_field_size_v = 37; template using __fbthrift_id = ::apache::thrift::type::field_id<__fbthrift_reflection_field_id_list[folly::to_underlying(T::value)]>; @@ -9857,7 +9990,7 @@ class Containers final { // FragileConstructor for use in initialization lists only. [[deprecated("This constructor is deprecated")]] - Containers(apache::thrift::FragileConstructor, ::std::vector<::cpp2::MyStruct> struct_list__arg, ::std::vector<::cpp2::MyUnion> union_list__arg, ::std::vector<::cpp2::MyEnum> enum_list__arg, ::std::set<::cpp2::MyStruct> struct_set__arg, ::std::set<::cpp2::MyUnion> union_set__arg, ::std::set<::cpp2::MyEnum> enum_set__arg, ::std::map<::cpp2::MyStruct, ::std::int64_t> struct_map__arg, ::std::map<::cpp2::MyUnion, ::std::int64_t> union_map__arg, ::std::map<::cpp2::MyEnum, ::std::int64_t> enum_map__arg, ::std::map<::std::int32_t, ::cpp2::MyStruct> struct_map_2__arg, ::std::map<::std::int32_t, ::cpp2::MyUnion> union_map_2__arg, ::std::map<::std::int32_t, ::cpp2::MyEnum> enum_map_2__arg, ::std::map<::std::vector<::std::int32_t>, ::std::int32_t> list_map__arg, ::std::map<::std::int32_t, ::std::vector<::std::int32_t>> list_map_2__arg, ::std::map<::std::set<::std::int32_t>, ::std::int32_t> set_map__arg, ::std::map<::std::int32_t, ::std::set<::std::int32_t>> set_map_2__arg, ::std::map<::std::map<::std::int32_t, ::std::int32_t>, ::std::int32_t> map_map__arg, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> map_map_2__arg); + Containers(apache::thrift::FragileConstructor, ::std::vector<::cpp2::MyStruct> struct_list__arg, ::std::vector<::cpp2::MyUnion> union_list__arg, ::std::vector<::cpp2::MyEnum> enum_list__arg, ::std::set<::cpp2::MyStruct> struct_set__arg, ::std::set<::cpp2::MyUnion> union_set__arg, ::std::set<::cpp2::MyEnum> enum_set__arg, ::std::map<::cpp2::MyStruct, ::std::int64_t> struct_map__arg, ::std::map<::cpp2::MyUnion, ::std::int64_t> union_map__arg, ::std::map<::cpp2::MyEnum, ::std::int64_t> enum_map__arg, ::std::map<::std::int32_t, ::cpp2::MyStruct> struct_map_2__arg, ::std::map<::std::int32_t, ::cpp2::MyUnion> union_map_2__arg, ::std::map<::std::int32_t, ::cpp2::MyEnum> enum_map_2__arg, ::std::map<::std::vector<::std::int32_t>, ::std::int32_t> list_map__arg, ::std::map<::std::int32_t, ::std::vector<::std::int32_t>> list_map_2__arg, ::std::map<::std::set<::std::int32_t>, ::std::int32_t> set_map__arg, ::std::map<::std::int32_t, ::std::set<::std::int32_t>> set_map_2__arg, ::std::map<::std::map<::std::int32_t, ::std::int32_t>, ::std::int32_t> map_map__arg, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> map_map_2__arg, ::std::vector<::std::vector<::std::int32_t>> list_list_i32__arg, ::std::vector<::std::vector<::cpp2::MyStruct>> list_list_struct__arg, ::std::vector<::std::set<::std::int32_t>> list_set_i32__arg, ::std::vector<::std::set<::cpp2::MyStruct>> list_set_struct__arg, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>> list_map_i32_i32__arg, ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>> list_map_i32_struct__arg, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>> list_map_struct_i32__arg, ::std::set<::std::vector<::std::int32_t>> set_list_i32__arg, ::std::set<::std::vector<::cpp2::MyStruct>> set_list_struct__arg, ::std::set<::std::set<::std::int32_t>> set_set_i32__arg, ::std::set<::std::set<::cpp2::MyStruct>> set_set_struct__arg, ::std::set<::std::map<::std::int32_t, ::std::int32_t>> set_map_i32_i32__arg, ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>> set_map_i32_struct__arg, ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>> set_map_struct_i32__arg, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> map_i32_map_i32_i32__arg, ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>> map_i32_map_struct_i32__arg, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>> map_i32_map_i32_struct__arg, ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>> map_i32_map_list_i32_i32__arg, ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>> map_i32_map_list_struct_i32__arg); Containers(Containers&&) noexcept; @@ -9906,7 +10039,45 @@ class Containers final { private: ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> __fbthrift_field_map_map_2; private: - apache::thrift::detail::isset_bitset<18, apache::thrift::detail::IssetBitsetOption::Unpacked> __isset; + ::std::vector<::std::vector<::std::int32_t>> __fbthrift_field_list_list_i32; + private: + ::std::vector<::std::vector<::cpp2::MyStruct>> __fbthrift_field_list_list_struct; + private: + ::std::vector<::std::set<::std::int32_t>> __fbthrift_field_list_set_i32; + private: + ::std::vector<::std::set<::cpp2::MyStruct>> __fbthrift_field_list_set_struct; + private: + ::std::vector<::std::map<::std::int32_t, ::std::int32_t>> __fbthrift_field_list_map_i32_i32; + private: + ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>> __fbthrift_field_list_map_i32_struct; + private: + ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>> __fbthrift_field_list_map_struct_i32; + private: + ::std::set<::std::vector<::std::int32_t>> __fbthrift_field_set_list_i32; + private: + ::std::set<::std::vector<::cpp2::MyStruct>> __fbthrift_field_set_list_struct; + private: + ::std::set<::std::set<::std::int32_t>> __fbthrift_field_set_set_i32; + private: + ::std::set<::std::set<::cpp2::MyStruct>> __fbthrift_field_set_set_struct; + private: + ::std::set<::std::map<::std::int32_t, ::std::int32_t>> __fbthrift_field_set_map_i32_i32; + private: + ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>> __fbthrift_field_set_map_i32_struct; + private: + ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>> __fbthrift_field_set_map_struct_i32; + private: + ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> __fbthrift_field_map_i32_map_i32_i32; + private: + ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>> __fbthrift_field_map_i32_map_struct_i32; + private: + ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>> __fbthrift_field_map_i32_map_i32_struct; + private: + ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>> __fbthrift_field_map_i32_map_list_i32_i32; + private: + ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>> __fbthrift_field_map_i32_map_list_struct_i32; + private: + apache::thrift::detail::isset_bitset<37, apache::thrift::detail::IssetBitsetOption::Unpacked> __isset; public: @@ -10777,6 +10948,918 @@ class Containers final { return {static_cast(this->__fbthrift_field_map_map_2), __isset.at(17), __isset.bit(17)}; } + /** Glean { "field": "list_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_i32_ref() const& { + return {this->__fbthrift_field_list_list_i32, __isset.at(18), __isset.bit(18)}; + } + + /** Glean { "field": "list_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_list_list_i32), __isset.at(18), __isset.bit(18)}; + } + + /** Glean { "field": "list_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_i32_ref() & { + return {this->__fbthrift_field_list_list_i32, __isset.at(18), __isset.bit(18)}; + } + + /** Glean { "field": "list_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_i32_ref() && { + return {static_cast(this->__fbthrift_field_list_list_i32), __isset.at(18), __isset.bit(18)}; + } + + /** Glean { "field": "list_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_i32() const& { + return {this->__fbthrift_field_list_list_i32, __isset.at(18), __isset.bit(18)}; + } + + /** Glean { "field": "list_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_i32() const&& { + return {static_cast(this->__fbthrift_field_list_list_i32), __isset.at(18), __isset.bit(18)}; + } + + /** Glean { "field": "list_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_i32() & { + return {this->__fbthrift_field_list_list_i32, __isset.at(18), __isset.bit(18)}; + } + + /** Glean { "field": "list_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_i32() && { + return {static_cast(this->__fbthrift_field_list_list_i32), __isset.at(18), __isset.bit(18)}; + } + + /** Glean { "field": "list_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_struct_ref() const& { + return {this->__fbthrift_field_list_list_struct, __isset.at(19), __isset.bit(19)}; + } + + /** Glean { "field": "list_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_struct_ref() const&& { + return {static_cast(this->__fbthrift_field_list_list_struct), __isset.at(19), __isset.bit(19)}; + } + + /** Glean { "field": "list_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_struct_ref() & { + return {this->__fbthrift_field_list_list_struct, __isset.at(19), __isset.bit(19)}; + } + + /** Glean { "field": "list_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_struct_ref() && { + return {static_cast(this->__fbthrift_field_list_list_struct), __isset.at(19), __isset.bit(19)}; + } + + /** Glean { "field": "list_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_struct() const& { + return {this->__fbthrift_field_list_list_struct, __isset.at(19), __isset.bit(19)}; + } + + /** Glean { "field": "list_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_struct() const&& { + return {static_cast(this->__fbthrift_field_list_list_struct), __isset.at(19), __isset.bit(19)}; + } + + /** Glean { "field": "list_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_struct() & { + return {this->__fbthrift_field_list_list_struct, __isset.at(19), __isset.bit(19)}; + } + + /** Glean { "field": "list_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_list_struct() && { + return {static_cast(this->__fbthrift_field_list_list_struct), __isset.at(19), __isset.bit(19)}; + } + + /** Glean { "field": "list_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_i32_ref() const& { + return {this->__fbthrift_field_list_set_i32, __isset.at(20), __isset.bit(20)}; + } + + /** Glean { "field": "list_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_list_set_i32), __isset.at(20), __isset.bit(20)}; + } + + /** Glean { "field": "list_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_i32_ref() & { + return {this->__fbthrift_field_list_set_i32, __isset.at(20), __isset.bit(20)}; + } + + /** Glean { "field": "list_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_i32_ref() && { + return {static_cast(this->__fbthrift_field_list_set_i32), __isset.at(20), __isset.bit(20)}; + } + + /** Glean { "field": "list_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_i32() const& { + return {this->__fbthrift_field_list_set_i32, __isset.at(20), __isset.bit(20)}; + } + + /** Glean { "field": "list_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_i32() const&& { + return {static_cast(this->__fbthrift_field_list_set_i32), __isset.at(20), __isset.bit(20)}; + } + + /** Glean { "field": "list_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_i32() & { + return {this->__fbthrift_field_list_set_i32, __isset.at(20), __isset.bit(20)}; + } + + /** Glean { "field": "list_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_i32() && { + return {static_cast(this->__fbthrift_field_list_set_i32), __isset.at(20), __isset.bit(20)}; + } + + /** Glean { "field": "list_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_struct_ref() const& { + return {this->__fbthrift_field_list_set_struct, __isset.at(21), __isset.bit(21)}; + } + + /** Glean { "field": "list_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_struct_ref() const&& { + return {static_cast(this->__fbthrift_field_list_set_struct), __isset.at(21), __isset.bit(21)}; + } + + /** Glean { "field": "list_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_struct_ref() & { + return {this->__fbthrift_field_list_set_struct, __isset.at(21), __isset.bit(21)}; + } + + /** Glean { "field": "list_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_struct_ref() && { + return {static_cast(this->__fbthrift_field_list_set_struct), __isset.at(21), __isset.bit(21)}; + } + + /** Glean { "field": "list_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_struct() const& { + return {this->__fbthrift_field_list_set_struct, __isset.at(21), __isset.bit(21)}; + } + + /** Glean { "field": "list_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_struct() const&& { + return {static_cast(this->__fbthrift_field_list_set_struct), __isset.at(21), __isset.bit(21)}; + } + + /** Glean { "field": "list_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_struct() & { + return {this->__fbthrift_field_list_set_struct, __isset.at(21), __isset.bit(21)}; + } + + /** Glean { "field": "list_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_set_struct() && { + return {static_cast(this->__fbthrift_field_list_set_struct), __isset.at(21), __isset.bit(21)}; + } + + /** Glean { "field": "list_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_i32_ref() const& { + return {this->__fbthrift_field_list_map_i32_i32, __isset.at(22), __isset.bit(22)}; + } + + /** Glean { "field": "list_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_list_map_i32_i32), __isset.at(22), __isset.bit(22)}; + } + + /** Glean { "field": "list_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_i32_ref() & { + return {this->__fbthrift_field_list_map_i32_i32, __isset.at(22), __isset.bit(22)}; + } + + /** Glean { "field": "list_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_i32_ref() && { + return {static_cast(this->__fbthrift_field_list_map_i32_i32), __isset.at(22), __isset.bit(22)}; + } + + /** Glean { "field": "list_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_i32() const& { + return {this->__fbthrift_field_list_map_i32_i32, __isset.at(22), __isset.bit(22)}; + } + + /** Glean { "field": "list_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_i32() const&& { + return {static_cast(this->__fbthrift_field_list_map_i32_i32), __isset.at(22), __isset.bit(22)}; + } + + /** Glean { "field": "list_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_i32() & { + return {this->__fbthrift_field_list_map_i32_i32, __isset.at(22), __isset.bit(22)}; + } + + /** Glean { "field": "list_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_i32() && { + return {static_cast(this->__fbthrift_field_list_map_i32_i32), __isset.at(22), __isset.bit(22)}; + } + + /** Glean { "field": "list_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_struct_ref() const& { + return {this->__fbthrift_field_list_map_i32_struct, __isset.at(23), __isset.bit(23)}; + } + + /** Glean { "field": "list_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_struct_ref() const&& { + return {static_cast(this->__fbthrift_field_list_map_i32_struct), __isset.at(23), __isset.bit(23)}; + } + + /** Glean { "field": "list_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_struct_ref() & { + return {this->__fbthrift_field_list_map_i32_struct, __isset.at(23), __isset.bit(23)}; + } + + /** Glean { "field": "list_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_struct_ref() && { + return {static_cast(this->__fbthrift_field_list_map_i32_struct), __isset.at(23), __isset.bit(23)}; + } + + /** Glean { "field": "list_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_struct() const& { + return {this->__fbthrift_field_list_map_i32_struct, __isset.at(23), __isset.bit(23)}; + } + + /** Glean { "field": "list_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_struct() const&& { + return {static_cast(this->__fbthrift_field_list_map_i32_struct), __isset.at(23), __isset.bit(23)}; + } + + /** Glean { "field": "list_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_struct() & { + return {this->__fbthrift_field_list_map_i32_struct, __isset.at(23), __isset.bit(23)}; + } + + /** Glean { "field": "list_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_i32_struct() && { + return {static_cast(this->__fbthrift_field_list_map_i32_struct), __isset.at(23), __isset.bit(23)}; + } + + /** Glean { "field": "list_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_struct_i32_ref() const& { + return {this->__fbthrift_field_list_map_struct_i32, __isset.at(24), __isset.bit(24)}; + } + + /** Glean { "field": "list_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_struct_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_list_map_struct_i32), __isset.at(24), __isset.bit(24)}; + } + + /** Glean { "field": "list_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_struct_i32_ref() & { + return {this->__fbthrift_field_list_map_struct_i32, __isset.at(24), __isset.bit(24)}; + } + + /** Glean { "field": "list_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_struct_i32_ref() && { + return {static_cast(this->__fbthrift_field_list_map_struct_i32), __isset.at(24), __isset.bit(24)}; + } + + /** Glean { "field": "list_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_struct_i32() const& { + return {this->__fbthrift_field_list_map_struct_i32, __isset.at(24), __isset.bit(24)}; + } + + /** Glean { "field": "list_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_struct_i32() const&& { + return {static_cast(this->__fbthrift_field_list_map_struct_i32), __isset.at(24), __isset.bit(24)}; + } + + /** Glean { "field": "list_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_struct_i32() & { + return {this->__fbthrift_field_list_map_struct_i32, __isset.at(24), __isset.bit(24)}; + } + + /** Glean { "field": "list_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref list_map_struct_i32() && { + return {static_cast(this->__fbthrift_field_list_map_struct_i32), __isset.at(24), __isset.bit(24)}; + } + + /** Glean { "field": "set_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_i32_ref() const& { + return {this->__fbthrift_field_set_list_i32, __isset.at(25), __isset.bit(25)}; + } + + /** Glean { "field": "set_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_set_list_i32), __isset.at(25), __isset.bit(25)}; + } + + /** Glean { "field": "set_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_i32_ref() & { + return {this->__fbthrift_field_set_list_i32, __isset.at(25), __isset.bit(25)}; + } + + /** Glean { "field": "set_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_i32_ref() && { + return {static_cast(this->__fbthrift_field_set_list_i32), __isset.at(25), __isset.bit(25)}; + } + + /** Glean { "field": "set_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_i32() const& { + return {this->__fbthrift_field_set_list_i32, __isset.at(25), __isset.bit(25)}; + } + + /** Glean { "field": "set_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_i32() const&& { + return {static_cast(this->__fbthrift_field_set_list_i32), __isset.at(25), __isset.bit(25)}; + } + + /** Glean { "field": "set_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_i32() & { + return {this->__fbthrift_field_set_list_i32, __isset.at(25), __isset.bit(25)}; + } + + /** Glean { "field": "set_list_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_i32() && { + return {static_cast(this->__fbthrift_field_set_list_i32), __isset.at(25), __isset.bit(25)}; + } + + /** Glean { "field": "set_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_struct_ref() const& { + return {this->__fbthrift_field_set_list_struct, __isset.at(26), __isset.bit(26)}; + } + + /** Glean { "field": "set_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_struct_ref() const&& { + return {static_cast(this->__fbthrift_field_set_list_struct), __isset.at(26), __isset.bit(26)}; + } + + /** Glean { "field": "set_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_struct_ref() & { + return {this->__fbthrift_field_set_list_struct, __isset.at(26), __isset.bit(26)}; + } + + /** Glean { "field": "set_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_struct_ref() && { + return {static_cast(this->__fbthrift_field_set_list_struct), __isset.at(26), __isset.bit(26)}; + } + + /** Glean { "field": "set_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_struct() const& { + return {this->__fbthrift_field_set_list_struct, __isset.at(26), __isset.bit(26)}; + } + + /** Glean { "field": "set_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_struct() const&& { + return {static_cast(this->__fbthrift_field_set_list_struct), __isset.at(26), __isset.bit(26)}; + } + + /** Glean { "field": "set_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_struct() & { + return {this->__fbthrift_field_set_list_struct, __isset.at(26), __isset.bit(26)}; + } + + /** Glean { "field": "set_list_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_list_struct() && { + return {static_cast(this->__fbthrift_field_set_list_struct), __isset.at(26), __isset.bit(26)}; + } + + /** Glean { "field": "set_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_i32_ref() const& { + return {this->__fbthrift_field_set_set_i32, __isset.at(27), __isset.bit(27)}; + } + + /** Glean { "field": "set_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_set_set_i32), __isset.at(27), __isset.bit(27)}; + } + + /** Glean { "field": "set_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_i32_ref() & { + return {this->__fbthrift_field_set_set_i32, __isset.at(27), __isset.bit(27)}; + } + + /** Glean { "field": "set_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_i32_ref() && { + return {static_cast(this->__fbthrift_field_set_set_i32), __isset.at(27), __isset.bit(27)}; + } + + /** Glean { "field": "set_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_i32() const& { + return {this->__fbthrift_field_set_set_i32, __isset.at(27), __isset.bit(27)}; + } + + /** Glean { "field": "set_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_i32() const&& { + return {static_cast(this->__fbthrift_field_set_set_i32), __isset.at(27), __isset.bit(27)}; + } + + /** Glean { "field": "set_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_i32() & { + return {this->__fbthrift_field_set_set_i32, __isset.at(27), __isset.bit(27)}; + } + + /** Glean { "field": "set_set_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_i32() && { + return {static_cast(this->__fbthrift_field_set_set_i32), __isset.at(27), __isset.bit(27)}; + } + + /** Glean { "field": "set_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_struct_ref() const& { + return {this->__fbthrift_field_set_set_struct, __isset.at(28), __isset.bit(28)}; + } + + /** Glean { "field": "set_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_struct_ref() const&& { + return {static_cast(this->__fbthrift_field_set_set_struct), __isset.at(28), __isset.bit(28)}; + } + + /** Glean { "field": "set_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_struct_ref() & { + return {this->__fbthrift_field_set_set_struct, __isset.at(28), __isset.bit(28)}; + } + + /** Glean { "field": "set_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_struct_ref() && { + return {static_cast(this->__fbthrift_field_set_set_struct), __isset.at(28), __isset.bit(28)}; + } + + /** Glean { "field": "set_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_struct() const& { + return {this->__fbthrift_field_set_set_struct, __isset.at(28), __isset.bit(28)}; + } + + /** Glean { "field": "set_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_struct() const&& { + return {static_cast(this->__fbthrift_field_set_set_struct), __isset.at(28), __isset.bit(28)}; + } + + /** Glean { "field": "set_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_struct() & { + return {this->__fbthrift_field_set_set_struct, __isset.at(28), __isset.bit(28)}; + } + + /** Glean { "field": "set_set_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_set_struct() && { + return {static_cast(this->__fbthrift_field_set_set_struct), __isset.at(28), __isset.bit(28)}; + } + + /** Glean { "field": "set_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_i32_ref() const& { + return {this->__fbthrift_field_set_map_i32_i32, __isset.at(29), __isset.bit(29)}; + } + + /** Glean { "field": "set_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_set_map_i32_i32), __isset.at(29), __isset.bit(29)}; + } + + /** Glean { "field": "set_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_i32_ref() & { + return {this->__fbthrift_field_set_map_i32_i32, __isset.at(29), __isset.bit(29)}; + } + + /** Glean { "field": "set_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_i32_ref() && { + return {static_cast(this->__fbthrift_field_set_map_i32_i32), __isset.at(29), __isset.bit(29)}; + } + + /** Glean { "field": "set_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_i32() const& { + return {this->__fbthrift_field_set_map_i32_i32, __isset.at(29), __isset.bit(29)}; + } + + /** Glean { "field": "set_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_i32() const&& { + return {static_cast(this->__fbthrift_field_set_map_i32_i32), __isset.at(29), __isset.bit(29)}; + } + + /** Glean { "field": "set_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_i32() & { + return {this->__fbthrift_field_set_map_i32_i32, __isset.at(29), __isset.bit(29)}; + } + + /** Glean { "field": "set_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_i32() && { + return {static_cast(this->__fbthrift_field_set_map_i32_i32), __isset.at(29), __isset.bit(29)}; + } + + /** Glean { "field": "set_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_struct_ref() const& { + return {this->__fbthrift_field_set_map_i32_struct, __isset.at(30), __isset.bit(30)}; + } + + /** Glean { "field": "set_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_struct_ref() const&& { + return {static_cast(this->__fbthrift_field_set_map_i32_struct), __isset.at(30), __isset.bit(30)}; + } + + /** Glean { "field": "set_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_struct_ref() & { + return {this->__fbthrift_field_set_map_i32_struct, __isset.at(30), __isset.bit(30)}; + } + + /** Glean { "field": "set_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_struct_ref() && { + return {static_cast(this->__fbthrift_field_set_map_i32_struct), __isset.at(30), __isset.bit(30)}; + } + + /** Glean { "field": "set_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_struct() const& { + return {this->__fbthrift_field_set_map_i32_struct, __isset.at(30), __isset.bit(30)}; + } + + /** Glean { "field": "set_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_struct() const&& { + return {static_cast(this->__fbthrift_field_set_map_i32_struct), __isset.at(30), __isset.bit(30)}; + } + + /** Glean { "field": "set_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_struct() & { + return {this->__fbthrift_field_set_map_i32_struct, __isset.at(30), __isset.bit(30)}; + } + + /** Glean { "field": "set_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_i32_struct() && { + return {static_cast(this->__fbthrift_field_set_map_i32_struct), __isset.at(30), __isset.bit(30)}; + } + + /** Glean { "field": "set_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_struct_i32_ref() const& { + return {this->__fbthrift_field_set_map_struct_i32, __isset.at(31), __isset.bit(31)}; + } + + /** Glean { "field": "set_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_struct_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_set_map_struct_i32), __isset.at(31), __isset.bit(31)}; + } + + /** Glean { "field": "set_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_struct_i32_ref() & { + return {this->__fbthrift_field_set_map_struct_i32, __isset.at(31), __isset.bit(31)}; + } + + /** Glean { "field": "set_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_struct_i32_ref() && { + return {static_cast(this->__fbthrift_field_set_map_struct_i32), __isset.at(31), __isset.bit(31)}; + } + + /** Glean { "field": "set_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_struct_i32() const& { + return {this->__fbthrift_field_set_map_struct_i32, __isset.at(31), __isset.bit(31)}; + } + + /** Glean { "field": "set_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_struct_i32() const&& { + return {static_cast(this->__fbthrift_field_set_map_struct_i32), __isset.at(31), __isset.bit(31)}; + } + + /** Glean { "field": "set_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_struct_i32() & { + return {this->__fbthrift_field_set_map_struct_i32, __isset.at(31), __isset.bit(31)}; + } + + /** Glean { "field": "set_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref set_map_struct_i32() && { + return {static_cast(this->__fbthrift_field_set_map_struct_i32), __isset.at(31), __isset.bit(31)}; + } + + /** Glean { "field": "map_i32_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_i32_ref() const& { + return {this->__fbthrift_field_map_i32_map_i32_i32, __isset.at(32), __isset.bit(32)}; + } + + /** Glean { "field": "map_i32_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_i32_i32), __isset.at(32), __isset.bit(32)}; + } + + /** Glean { "field": "map_i32_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_i32_ref() & { + return {this->__fbthrift_field_map_i32_map_i32_i32, __isset.at(32), __isset.bit(32)}; + } + + /** Glean { "field": "map_i32_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_i32_ref() && { + return {static_cast(this->__fbthrift_field_map_i32_map_i32_i32), __isset.at(32), __isset.bit(32)}; + } + + /** Glean { "field": "map_i32_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_i32() const& { + return {this->__fbthrift_field_map_i32_map_i32_i32, __isset.at(32), __isset.bit(32)}; + } + + /** Glean { "field": "map_i32_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_i32() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_i32_i32), __isset.at(32), __isset.bit(32)}; + } + + /** Glean { "field": "map_i32_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_i32() & { + return {this->__fbthrift_field_map_i32_map_i32_i32, __isset.at(32), __isset.bit(32)}; + } + + /** Glean { "field": "map_i32_map_i32_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_i32() && { + return {static_cast(this->__fbthrift_field_map_i32_map_i32_i32), __isset.at(32), __isset.bit(32)}; + } + + /** Glean { "field": "map_i32_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_struct_i32_ref() const& { + return {this->__fbthrift_field_map_i32_map_struct_i32, __isset.at(33), __isset.bit(33)}; + } + + /** Glean { "field": "map_i32_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_struct_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_struct_i32), __isset.at(33), __isset.bit(33)}; + } + + /** Glean { "field": "map_i32_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_struct_i32_ref() & { + return {this->__fbthrift_field_map_i32_map_struct_i32, __isset.at(33), __isset.bit(33)}; + } + + /** Glean { "field": "map_i32_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_struct_i32_ref() && { + return {static_cast(this->__fbthrift_field_map_i32_map_struct_i32), __isset.at(33), __isset.bit(33)}; + } + + /** Glean { "field": "map_i32_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_struct_i32() const& { + return {this->__fbthrift_field_map_i32_map_struct_i32, __isset.at(33), __isset.bit(33)}; + } + + /** Glean { "field": "map_i32_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_struct_i32() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_struct_i32), __isset.at(33), __isset.bit(33)}; + } + + /** Glean { "field": "map_i32_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_struct_i32() & { + return {this->__fbthrift_field_map_i32_map_struct_i32, __isset.at(33), __isset.bit(33)}; + } + + /** Glean { "field": "map_i32_map_struct_i32" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_struct_i32() && { + return {static_cast(this->__fbthrift_field_map_i32_map_struct_i32), __isset.at(33), __isset.bit(33)}; + } + + /** Glean { "field": "map_i32_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_struct_ref() const& { + return {this->__fbthrift_field_map_i32_map_i32_struct, __isset.at(34), __isset.bit(34)}; + } + + /** Glean { "field": "map_i32_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_struct_ref() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_i32_struct), __isset.at(34), __isset.bit(34)}; + } + + /** Glean { "field": "map_i32_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_struct_ref() & { + return {this->__fbthrift_field_map_i32_map_i32_struct, __isset.at(34), __isset.bit(34)}; + } + + /** Glean { "field": "map_i32_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_struct_ref() && { + return {static_cast(this->__fbthrift_field_map_i32_map_i32_struct), __isset.at(34), __isset.bit(34)}; + } + + /** Glean { "field": "map_i32_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_struct() const& { + return {this->__fbthrift_field_map_i32_map_i32_struct, __isset.at(34), __isset.bit(34)}; + } + + /** Glean { "field": "map_i32_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_struct() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_i32_struct), __isset.at(34), __isset.bit(34)}; + } + + /** Glean { "field": "map_i32_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_struct() & { + return {this->__fbthrift_field_map_i32_map_i32_struct, __isset.at(34), __isset.bit(34)}; + } + + /** Glean { "field": "map_i32_map_i32_struct" } */ + template >> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_i32_struct() && { + return {static_cast(this->__fbthrift_field_map_i32_map_i32_struct), __isset.at(34), __isset.bit(34)}; + } + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_i32_i32_ref() const& { + return {this->__fbthrift_field_map_i32_map_list_i32_i32, __isset.at(35), __isset.bit(35)}; + } + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_i32_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_list_i32_i32), __isset.at(35), __isset.bit(35)}; + } + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_i32_i32_ref() & { + return {this->__fbthrift_field_map_i32_map_list_i32_i32, __isset.at(35), __isset.bit(35)}; + } + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_i32_i32_ref() && { + return {static_cast(this->__fbthrift_field_map_i32_map_list_i32_i32), __isset.at(35), __isset.bit(35)}; + } + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_i32_i32() const& { + return {this->__fbthrift_field_map_i32_map_list_i32_i32, __isset.at(35), __isset.bit(35)}; + } + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_i32_i32() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_list_i32_i32), __isset.at(35), __isset.bit(35)}; + } + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_i32_i32() & { + return {this->__fbthrift_field_map_i32_map_list_i32_i32, __isset.at(35), __isset.bit(35)}; + } + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_i32_i32() && { + return {static_cast(this->__fbthrift_field_map_i32_map_list_i32_i32), __isset.at(35), __isset.bit(35)}; + } + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_struct_i32_ref() const& { + return {this->__fbthrift_field_map_i32_map_list_struct_i32, __isset.at(36), __isset.bit(36)}; + } + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_struct_i32_ref() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_list_struct_i32), __isset.at(36), __isset.bit(36)}; + } + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_struct_i32_ref() & { + return {this->__fbthrift_field_map_i32_map_list_struct_i32, __isset.at(36), __isset.bit(36)}; + } + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_struct_i32_ref() && { + return {static_cast(this->__fbthrift_field_map_i32_map_list_struct_i32), __isset.at(36), __isset.bit(36)}; + } + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_struct_i32() const& { + return {this->__fbthrift_field_map_i32_map_list_struct_i32, __isset.at(36), __isset.bit(36)}; + } + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_struct_i32() const&& { + return {static_cast(this->__fbthrift_field_map_i32_map_list_struct_i32), __isset.at(36), __isset.bit(36)}; + } + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_struct_i32() & { + return {this->__fbthrift_field_map_i32_map_list_struct_i32, __isset.at(36), __isset.bit(36)}; + } + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + template >>> + FOLLY_ERASE ::apache::thrift::field_ref map_i32_map_list_struct_i32() && { + return {static_cast(this->__fbthrift_field_map_i32_map_list_struct_i32), __isset.at(36), __isset.bit(36)}; + } + /** Glean { "field": "struct_list" } */ [[deprecated("Use `FOO.struct_list().value();` instead of `FOO.get_struct_list();`")]] const ::std::vector<::cpp2::MyStruct>& get_struct_list() const&; @@ -11065,6 +12148,310 @@ class Containers final { return __fbthrift_field_map_map_2; } + /** Glean { "field": "list_list_i32" } */ + [[deprecated("Use `FOO.list_list_i32().value();` instead of `FOO.get_list_list_i32();`")]] + const ::std::vector<::std::vector<::std::int32_t>>& get_list_list_i32() const&; + + /** Glean { "field": "list_list_i32" } */ + [[deprecated("Use `FOO.list_list_i32().value();` instead of `FOO.get_list_list_i32();`")]] + ::std::vector<::std::vector<::std::int32_t>> get_list_list_i32() &&; + + /** Glean { "field": "list_list_i32" } */ + template >> + [[deprecated("Use `FOO.list_list_i32() = BAR;` instead of `FOO.set_list_list_i32(BAR);`")]] + ::std::vector<::std::vector<::std::int32_t>>& set_list_list_i32(T_Containers_list_list_i32_struct_setter&& list_list_i32_) { + list_list_i32_ref() = std::forward(list_list_i32_); + return __fbthrift_field_list_list_i32; + } + + /** Glean { "field": "list_list_struct" } */ + [[deprecated("Use `FOO.list_list_struct().value();` instead of `FOO.get_list_list_struct();`")]] + const ::std::vector<::std::vector<::cpp2::MyStruct>>& get_list_list_struct() const&; + + /** Glean { "field": "list_list_struct" } */ + [[deprecated("Use `FOO.list_list_struct().value();` instead of `FOO.get_list_list_struct();`")]] + ::std::vector<::std::vector<::cpp2::MyStruct>> get_list_list_struct() &&; + + /** Glean { "field": "list_list_struct" } */ + template >> + [[deprecated("Use `FOO.list_list_struct() = BAR;` instead of `FOO.set_list_list_struct(BAR);`")]] + ::std::vector<::std::vector<::cpp2::MyStruct>>& set_list_list_struct(T_Containers_list_list_struct_struct_setter&& list_list_struct_) { + list_list_struct_ref() = std::forward(list_list_struct_); + return __fbthrift_field_list_list_struct; + } + + /** Glean { "field": "list_set_i32" } */ + [[deprecated("Use `FOO.list_set_i32().value();` instead of `FOO.get_list_set_i32();`")]] + const ::std::vector<::std::set<::std::int32_t>>& get_list_set_i32() const&; + + /** Glean { "field": "list_set_i32" } */ + [[deprecated("Use `FOO.list_set_i32().value();` instead of `FOO.get_list_set_i32();`")]] + ::std::vector<::std::set<::std::int32_t>> get_list_set_i32() &&; + + /** Glean { "field": "list_set_i32" } */ + template >> + [[deprecated("Use `FOO.list_set_i32() = BAR;` instead of `FOO.set_list_set_i32(BAR);`")]] + ::std::vector<::std::set<::std::int32_t>>& set_list_set_i32(T_Containers_list_set_i32_struct_setter&& list_set_i32_) { + list_set_i32_ref() = std::forward(list_set_i32_); + return __fbthrift_field_list_set_i32; + } + + /** Glean { "field": "list_set_struct" } */ + [[deprecated("Use `FOO.list_set_struct().value();` instead of `FOO.get_list_set_struct();`")]] + const ::std::vector<::std::set<::cpp2::MyStruct>>& get_list_set_struct() const&; + + /** Glean { "field": "list_set_struct" } */ + [[deprecated("Use `FOO.list_set_struct().value();` instead of `FOO.get_list_set_struct();`")]] + ::std::vector<::std::set<::cpp2::MyStruct>> get_list_set_struct() &&; + + /** Glean { "field": "list_set_struct" } */ + template >> + [[deprecated("Use `FOO.list_set_struct() = BAR;` instead of `FOO.set_list_set_struct(BAR);`")]] + ::std::vector<::std::set<::cpp2::MyStruct>>& set_list_set_struct(T_Containers_list_set_struct_struct_setter&& list_set_struct_) { + list_set_struct_ref() = std::forward(list_set_struct_); + return __fbthrift_field_list_set_struct; + } + + /** Glean { "field": "list_map_i32_i32" } */ + [[deprecated("Use `FOO.list_map_i32_i32().value();` instead of `FOO.get_list_map_i32_i32();`")]] + const ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>& get_list_map_i32_i32() const&; + + /** Glean { "field": "list_map_i32_i32" } */ + [[deprecated("Use `FOO.list_map_i32_i32().value();` instead of `FOO.get_list_map_i32_i32();`")]] + ::std::vector<::std::map<::std::int32_t, ::std::int32_t>> get_list_map_i32_i32() &&; + + /** Glean { "field": "list_map_i32_i32" } */ + template >> + [[deprecated("Use `FOO.list_map_i32_i32() = BAR;` instead of `FOO.set_list_map_i32_i32(BAR);`")]] + ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>& set_list_map_i32_i32(T_Containers_list_map_i32_i32_struct_setter&& list_map_i32_i32_) { + list_map_i32_i32_ref() = std::forward(list_map_i32_i32_); + return __fbthrift_field_list_map_i32_i32; + } + + /** Glean { "field": "list_map_i32_struct" } */ + [[deprecated("Use `FOO.list_map_i32_struct().value();` instead of `FOO.get_list_map_i32_struct();`")]] + const ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>& get_list_map_i32_struct() const&; + + /** Glean { "field": "list_map_i32_struct" } */ + [[deprecated("Use `FOO.list_map_i32_struct().value();` instead of `FOO.get_list_map_i32_struct();`")]] + ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>> get_list_map_i32_struct() &&; + + /** Glean { "field": "list_map_i32_struct" } */ + template >> + [[deprecated("Use `FOO.list_map_i32_struct() = BAR;` instead of `FOO.set_list_map_i32_struct(BAR);`")]] + ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>& set_list_map_i32_struct(T_Containers_list_map_i32_struct_struct_setter&& list_map_i32_struct_) { + list_map_i32_struct_ref() = std::forward(list_map_i32_struct_); + return __fbthrift_field_list_map_i32_struct; + } + + /** Glean { "field": "list_map_struct_i32" } */ + [[deprecated("Use `FOO.list_map_struct_i32().value();` instead of `FOO.get_list_map_struct_i32();`")]] + const ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>& get_list_map_struct_i32() const&; + + /** Glean { "field": "list_map_struct_i32" } */ + [[deprecated("Use `FOO.list_map_struct_i32().value();` instead of `FOO.get_list_map_struct_i32();`")]] + ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>> get_list_map_struct_i32() &&; + + /** Glean { "field": "list_map_struct_i32" } */ + template >> + [[deprecated("Use `FOO.list_map_struct_i32() = BAR;` instead of `FOO.set_list_map_struct_i32(BAR);`")]] + ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>& set_list_map_struct_i32(T_Containers_list_map_struct_i32_struct_setter&& list_map_struct_i32_) { + list_map_struct_i32_ref() = std::forward(list_map_struct_i32_); + return __fbthrift_field_list_map_struct_i32; + } + + /** Glean { "field": "set_list_i32" } */ + [[deprecated("Use `FOO.set_list_i32().value();` instead of `FOO.get_set_list_i32();`")]] + const ::std::set<::std::vector<::std::int32_t>>& get_set_list_i32() const&; + + /** Glean { "field": "set_list_i32" } */ + [[deprecated("Use `FOO.set_list_i32().value();` instead of `FOO.get_set_list_i32();`")]] + ::std::set<::std::vector<::std::int32_t>> get_set_list_i32() &&; + + /** Glean { "field": "set_list_i32" } */ + template >> + [[deprecated("Use `FOO.set_list_i32() = BAR;` instead of `FOO.set_set_list_i32(BAR);`")]] + ::std::set<::std::vector<::std::int32_t>>& set_set_list_i32(T_Containers_set_list_i32_struct_setter&& set_list_i32_) { + set_list_i32_ref() = std::forward(set_list_i32_); + return __fbthrift_field_set_list_i32; + } + + /** Glean { "field": "set_list_struct" } */ + [[deprecated("Use `FOO.set_list_struct().value();` instead of `FOO.get_set_list_struct();`")]] + const ::std::set<::std::vector<::cpp2::MyStruct>>& get_set_list_struct() const&; + + /** Glean { "field": "set_list_struct" } */ + [[deprecated("Use `FOO.set_list_struct().value();` instead of `FOO.get_set_list_struct();`")]] + ::std::set<::std::vector<::cpp2::MyStruct>> get_set_list_struct() &&; + + /** Glean { "field": "set_list_struct" } */ + template >> + [[deprecated("Use `FOO.set_list_struct() = BAR;` instead of `FOO.set_set_list_struct(BAR);`")]] + ::std::set<::std::vector<::cpp2::MyStruct>>& set_set_list_struct(T_Containers_set_list_struct_struct_setter&& set_list_struct_) { + set_list_struct_ref() = std::forward(set_list_struct_); + return __fbthrift_field_set_list_struct; + } + + /** Glean { "field": "set_set_i32" } */ + [[deprecated("Use `FOO.set_set_i32().value();` instead of `FOO.get_set_set_i32();`")]] + const ::std::set<::std::set<::std::int32_t>>& get_set_set_i32() const&; + + /** Glean { "field": "set_set_i32" } */ + [[deprecated("Use `FOO.set_set_i32().value();` instead of `FOO.get_set_set_i32();`")]] + ::std::set<::std::set<::std::int32_t>> get_set_set_i32() &&; + + /** Glean { "field": "set_set_i32" } */ + template >> + [[deprecated("Use `FOO.set_set_i32() = BAR;` instead of `FOO.set_set_set_i32(BAR);`")]] + ::std::set<::std::set<::std::int32_t>>& set_set_set_i32(T_Containers_set_set_i32_struct_setter&& set_set_i32_) { + set_set_i32_ref() = std::forward(set_set_i32_); + return __fbthrift_field_set_set_i32; + } + + /** Glean { "field": "set_set_struct" } */ + [[deprecated("Use `FOO.set_set_struct().value();` instead of `FOO.get_set_set_struct();`")]] + const ::std::set<::std::set<::cpp2::MyStruct>>& get_set_set_struct() const&; + + /** Glean { "field": "set_set_struct" } */ + [[deprecated("Use `FOO.set_set_struct().value();` instead of `FOO.get_set_set_struct();`")]] + ::std::set<::std::set<::cpp2::MyStruct>> get_set_set_struct() &&; + + /** Glean { "field": "set_set_struct" } */ + template >> + [[deprecated("Use `FOO.set_set_struct() = BAR;` instead of `FOO.set_set_set_struct(BAR);`")]] + ::std::set<::std::set<::cpp2::MyStruct>>& set_set_set_struct(T_Containers_set_set_struct_struct_setter&& set_set_struct_) { + set_set_struct_ref() = std::forward(set_set_struct_); + return __fbthrift_field_set_set_struct; + } + + /** Glean { "field": "set_map_i32_i32" } */ + [[deprecated("Use `FOO.set_map_i32_i32().value();` instead of `FOO.get_set_map_i32_i32();`")]] + const ::std::set<::std::map<::std::int32_t, ::std::int32_t>>& get_set_map_i32_i32() const&; + + /** Glean { "field": "set_map_i32_i32" } */ + [[deprecated("Use `FOO.set_map_i32_i32().value();` instead of `FOO.get_set_map_i32_i32();`")]] + ::std::set<::std::map<::std::int32_t, ::std::int32_t>> get_set_map_i32_i32() &&; + + /** Glean { "field": "set_map_i32_i32" } */ + template >> + [[deprecated("Use `FOO.set_map_i32_i32() = BAR;` instead of `FOO.set_set_map_i32_i32(BAR);`")]] + ::std::set<::std::map<::std::int32_t, ::std::int32_t>>& set_set_map_i32_i32(T_Containers_set_map_i32_i32_struct_setter&& set_map_i32_i32_) { + set_map_i32_i32_ref() = std::forward(set_map_i32_i32_); + return __fbthrift_field_set_map_i32_i32; + } + + /** Glean { "field": "set_map_i32_struct" } */ + [[deprecated("Use `FOO.set_map_i32_struct().value();` instead of `FOO.get_set_map_i32_struct();`")]] + const ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>& get_set_map_i32_struct() const&; + + /** Glean { "field": "set_map_i32_struct" } */ + [[deprecated("Use `FOO.set_map_i32_struct().value();` instead of `FOO.get_set_map_i32_struct();`")]] + ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>> get_set_map_i32_struct() &&; + + /** Glean { "field": "set_map_i32_struct" } */ + template >> + [[deprecated("Use `FOO.set_map_i32_struct() = BAR;` instead of `FOO.set_set_map_i32_struct(BAR);`")]] + ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>& set_set_map_i32_struct(T_Containers_set_map_i32_struct_struct_setter&& set_map_i32_struct_) { + set_map_i32_struct_ref() = std::forward(set_map_i32_struct_); + return __fbthrift_field_set_map_i32_struct; + } + + /** Glean { "field": "set_map_struct_i32" } */ + [[deprecated("Use `FOO.set_map_struct_i32().value();` instead of `FOO.get_set_map_struct_i32();`")]] + const ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>& get_set_map_struct_i32() const&; + + /** Glean { "field": "set_map_struct_i32" } */ + [[deprecated("Use `FOO.set_map_struct_i32().value();` instead of `FOO.get_set_map_struct_i32();`")]] + ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>> get_set_map_struct_i32() &&; + + /** Glean { "field": "set_map_struct_i32" } */ + template >> + [[deprecated("Use `FOO.set_map_struct_i32() = BAR;` instead of `FOO.set_set_map_struct_i32(BAR);`")]] + ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>& set_set_map_struct_i32(T_Containers_set_map_struct_i32_struct_setter&& set_map_struct_i32_) { + set_map_struct_i32_ref() = std::forward(set_map_struct_i32_); + return __fbthrift_field_set_map_struct_i32; + } + + /** Glean { "field": "map_i32_map_i32_i32" } */ + [[deprecated("Use `FOO.map_i32_map_i32_i32().value();` instead of `FOO.get_map_i32_map_i32_i32();`")]] + const ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>& get_map_i32_map_i32_i32() const&; + + /** Glean { "field": "map_i32_map_i32_i32" } */ + [[deprecated("Use `FOO.map_i32_map_i32_i32().value();` instead of `FOO.get_map_i32_map_i32_i32();`")]] + ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>> get_map_i32_map_i32_i32() &&; + + /** Glean { "field": "map_i32_map_i32_i32" } */ + template >> + [[deprecated("Use `FOO.map_i32_map_i32_i32() = BAR;` instead of `FOO.set_map_i32_map_i32_i32(BAR);`")]] + ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>& set_map_i32_map_i32_i32(T_Containers_map_i32_map_i32_i32_struct_setter&& map_i32_map_i32_i32_) { + map_i32_map_i32_i32_ref() = std::forward(map_i32_map_i32_i32_); + return __fbthrift_field_map_i32_map_i32_i32; + } + + /** Glean { "field": "map_i32_map_struct_i32" } */ + [[deprecated("Use `FOO.map_i32_map_struct_i32().value();` instead of `FOO.get_map_i32_map_struct_i32();`")]] + const ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>& get_map_i32_map_struct_i32() const&; + + /** Glean { "field": "map_i32_map_struct_i32" } */ + [[deprecated("Use `FOO.map_i32_map_struct_i32().value();` instead of `FOO.get_map_i32_map_struct_i32();`")]] + ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>> get_map_i32_map_struct_i32() &&; + + /** Glean { "field": "map_i32_map_struct_i32" } */ + template >> + [[deprecated("Use `FOO.map_i32_map_struct_i32() = BAR;` instead of `FOO.set_map_i32_map_struct_i32(BAR);`")]] + ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>& set_map_i32_map_struct_i32(T_Containers_map_i32_map_struct_i32_struct_setter&& map_i32_map_struct_i32_) { + map_i32_map_struct_i32_ref() = std::forward(map_i32_map_struct_i32_); + return __fbthrift_field_map_i32_map_struct_i32; + } + + /** Glean { "field": "map_i32_map_i32_struct" } */ + [[deprecated("Use `FOO.map_i32_map_i32_struct().value();` instead of `FOO.get_map_i32_map_i32_struct();`")]] + const ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>& get_map_i32_map_i32_struct() const&; + + /** Glean { "field": "map_i32_map_i32_struct" } */ + [[deprecated("Use `FOO.map_i32_map_i32_struct().value();` instead of `FOO.get_map_i32_map_i32_struct();`")]] + ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>> get_map_i32_map_i32_struct() &&; + + /** Glean { "field": "map_i32_map_i32_struct" } */ + template >> + [[deprecated("Use `FOO.map_i32_map_i32_struct() = BAR;` instead of `FOO.set_map_i32_map_i32_struct(BAR);`")]] + ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>& set_map_i32_map_i32_struct(T_Containers_map_i32_map_i32_struct_struct_setter&& map_i32_map_i32_struct_) { + map_i32_map_i32_struct_ref() = std::forward(map_i32_map_i32_struct_); + return __fbthrift_field_map_i32_map_i32_struct; + } + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + [[deprecated("Use `FOO.map_i32_map_list_i32_i32().value();` instead of `FOO.get_map_i32_map_list_i32_i32();`")]] + const ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>& get_map_i32_map_list_i32_i32() const&; + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + [[deprecated("Use `FOO.map_i32_map_list_i32_i32().value();` instead of `FOO.get_map_i32_map_list_i32_i32();`")]] + ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>> get_map_i32_map_list_i32_i32() &&; + + /** Glean { "field": "map_i32_map_list_i32_i32" } */ + template >>> + [[deprecated("Use `FOO.map_i32_map_list_i32_i32() = BAR;` instead of `FOO.set_map_i32_map_list_i32_i32(BAR);`")]] + ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>& set_map_i32_map_list_i32_i32(T_Containers_map_i32_map_list_i32_i32_struct_setter&& map_i32_map_list_i32_i32_) { + map_i32_map_list_i32_i32_ref() = std::forward(map_i32_map_list_i32_i32_); + return __fbthrift_field_map_i32_map_list_i32_i32; + } + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + [[deprecated("Use `FOO.map_i32_map_list_struct_i32().value();` instead of `FOO.get_map_i32_map_list_struct_i32();`")]] + const ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>& get_map_i32_map_list_struct_i32() const&; + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + [[deprecated("Use `FOO.map_i32_map_list_struct_i32().value();` instead of `FOO.get_map_i32_map_list_struct_i32();`")]] + ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>> get_map_i32_map_list_struct_i32() &&; + + /** Glean { "field": "map_i32_map_list_struct_i32" } */ + template >>> + [[deprecated("Use `FOO.map_i32_map_list_struct_i32() = BAR;` instead of `FOO.set_map_i32_map_list_struct_i32(BAR);`")]] + ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>& set_map_i32_map_list_struct_i32(T_Containers_map_i32_map_list_struct_i32_struct_setter&& map_i32_map_list_struct_i32_) { + map_i32_map_list_struct_i32_ref() = std::forward(map_i32_map_list_struct_i32_); + return __fbthrift_field_map_i32_map_list_struct_i32; + } + template unsigned long read(Protocol_* iprot); template diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.tcc b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.tcc index 121ba39f357..f54da590c3e 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.tcc +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_types.tcc @@ -5718,6 +5718,310 @@ _readField_map_map_2: if (UNLIKELY(!_readState.advanceToNextField( iprot, 18, + 19, + apache::thrift::protocol::T_LIST))) { + goto _advance_failure; + } +_readField_list_list_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_list_list_i32 = ::std::vector<::std::vector<::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::list<::apache::thrift::type_class::integral>>, ::std::vector<::std::vector<::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_list_list_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(18, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 19, + 20, + apache::thrift::protocol::T_LIST))) { + goto _advance_failure; + } +_readField_list_list_struct: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_list_list_struct = ::std::vector<::std::vector<::cpp2::MyStruct>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, ::std::vector<::std::vector<::cpp2::MyStruct>>>::readWithContext(*iprot, this->__fbthrift_field_list_list_struct, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(19, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 20, + 21, + apache::thrift::protocol::T_LIST))) { + goto _advance_failure; + } +_readField_list_set_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_list_set_i32 = ::std::vector<::std::set<::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::set<::apache::thrift::type_class::integral>>, ::std::vector<::std::set<::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_list_set_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(20, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 21, + 22, + apache::thrift::protocol::T_LIST))) { + goto _advance_failure; + } +_readField_list_set_struct: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_list_set_struct = ::std::vector<::std::set<::cpp2::MyStruct>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, ::std::vector<::std::set<::cpp2::MyStruct>>>::readWithContext(*iprot, this->__fbthrift_field_list_set_struct, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(21, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 22, + 23, + apache::thrift::protocol::T_LIST))) { + goto _advance_failure; + } +_readField_list_map_i32_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_list_map_i32_i32 = ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_list_map_i32_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(22, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 23, + 24, + apache::thrift::protocol::T_LIST))) { + goto _advance_failure; + } +_readField_list_map_i32_struct: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_list_map_i32_struct = ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>>::readWithContext(*iprot, this->__fbthrift_field_list_map_i32_struct, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(23, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 24, + 25, + apache::thrift::protocol::T_LIST))) { + goto _advance_failure; + } +_readField_list_map_struct_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_list_map_struct_i32 = ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_list_map_struct_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(24, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 25, + 26, + apache::thrift::protocol::T_SET))) { + goto _advance_failure; + } +_readField_set_list_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_set_list_i32 = ::std::set<::std::vector<::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::list<::apache::thrift::type_class::integral>>, ::std::set<::std::vector<::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_set_list_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(25, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 26, + 27, + apache::thrift::protocol::T_SET))) { + goto _advance_failure; + } +_readField_set_list_struct: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_set_list_struct = ::std::set<::std::vector<::cpp2::MyStruct>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, ::std::set<::std::vector<::cpp2::MyStruct>>>::readWithContext(*iprot, this->__fbthrift_field_set_list_struct, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(26, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 27, + 28, + apache::thrift::protocol::T_SET))) { + goto _advance_failure; + } +_readField_set_set_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_set_set_i32 = ::std::set<::std::set<::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::set<::apache::thrift::type_class::integral>>, ::std::set<::std::set<::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_set_set_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(27, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 28, + 29, + apache::thrift::protocol::T_SET))) { + goto _advance_failure; + } +_readField_set_set_struct: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_set_set_struct = ::std::set<::std::set<::cpp2::MyStruct>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, ::std::set<::std::set<::cpp2::MyStruct>>>::readWithContext(*iprot, this->__fbthrift_field_set_set_struct, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(28, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 29, + 30, + apache::thrift::protocol::T_SET))) { + goto _advance_failure; + } +_readField_set_map_i32_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_set_map_i32_i32 = ::std::set<::std::map<::std::int32_t, ::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::set<::std::map<::std::int32_t, ::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_set_map_i32_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(29, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 30, + 31, + apache::thrift::protocol::T_SET))) { + goto _advance_failure; + } +_readField_set_map_i32_struct: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_set_map_i32_struct = ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>>::readWithContext(*iprot, this->__fbthrift_field_set_map_i32_struct, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(30, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 31, + 32, + apache::thrift::protocol::T_SET))) { + goto _advance_failure; + } +_readField_set_map_struct_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_set_map_struct_i32 = ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_set_map_struct_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(31, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 32, + 33, + apache::thrift::protocol::T_MAP))) { + goto _advance_failure; + } +_readField_map_i32_map_i32_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_map_i32_map_i32_i32 = ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_map_i32_map_i32_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(32, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 33, + 34, + apache::thrift::protocol::T_MAP))) { + goto _advance_failure; + } +_readField_map_i32_map_struct_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_map_i32_map_struct_i32 = ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>>::readWithContext(*iprot, this->__fbthrift_field_map_i32_map_struct_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(33, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 34, + 35, + apache::thrift::protocol::T_MAP))) { + goto _advance_failure; + } +_readField_map_i32_map_i32_struct: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_map_i32_map_i32_struct = ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>>::readWithContext(*iprot, this->__fbthrift_field_map_i32_map_i32_struct, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(34, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 35, + 36, + apache::thrift::protocol::T_MAP))) { + goto _advance_failure; + } +_readField_map_i32_map_list_i32_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_map_i32_map_list_i32_i32 = ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>>, ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>>::readWithContext(*iprot, this->__fbthrift_field_map_i32_map_list_i32_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(35, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 36, + 37, + apache::thrift::protocol::T_MAP))) { + goto _advance_failure; + } +_readField_map_i32_map_list_struct_i32: + { + _readState.beforeSubobject(iprot); + this->__fbthrift_field_map_i32_map_list_struct_i32 = ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>(); + ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>>, ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>>::readWithContext(*iprot, this->__fbthrift_field_map_i32_map_list_struct_i32, _readState); + _readState.afterSubobject(iprot); + } + this->__isset.set(36, true); + + if (UNLIKELY(!_readState.advanceToNextField( + iprot, + 37, 0, apache::thrift::protocol::T_STOP))) { goto _advance_failure; @@ -5884,6 +6188,158 @@ _loop: goto _skip; } } + case 19: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_LIST))) { + goto _readField_list_list_i32; + } else { + goto _skip; + } + } + case 20: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_LIST))) { + goto _readField_list_list_struct; + } else { + goto _skip; + } + } + case 21: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_LIST))) { + goto _readField_list_set_i32; + } else { + goto _skip; + } + } + case 22: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_LIST))) { + goto _readField_list_set_struct; + } else { + goto _skip; + } + } + case 23: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_LIST))) { + goto _readField_list_map_i32_i32; + } else { + goto _skip; + } + } + case 24: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_LIST))) { + goto _readField_list_map_i32_struct; + } else { + goto _skip; + } + } + case 25: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_LIST))) { + goto _readField_list_map_struct_i32; + } else { + goto _skip; + } + } + case 26: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_SET))) { + goto _readField_set_list_i32; + } else { + goto _skip; + } + } + case 27: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_SET))) { + goto _readField_set_list_struct; + } else { + goto _skip; + } + } + case 28: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_SET))) { + goto _readField_set_set_i32; + } else { + goto _skip; + } + } + case 29: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_SET))) { + goto _readField_set_set_struct; + } else { + goto _skip; + } + } + case 30: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_SET))) { + goto _readField_set_map_i32_i32; + } else { + goto _skip; + } + } + case 31: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_SET))) { + goto _readField_set_map_i32_struct; + } else { + goto _skip; + } + } + case 32: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_SET))) { + goto _readField_set_map_struct_i32; + } else { + goto _skip; + } + } + case 33: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_MAP))) { + goto _readField_map_i32_map_i32_i32; + } else { + goto _skip; + } + } + case 34: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_MAP))) { + goto _readField_map_i32_map_struct_i32; + } else { + goto _skip; + } + } + case 35: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_MAP))) { + goto _readField_map_i32_map_i32_struct; + } else { + goto _skip; + } + } + case 36: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_MAP))) { + goto _readField_map_i32_map_list_i32_i32; + } else { + goto _skip; + } + } + case 37: + { + if (LIKELY(_readState.isCompatibleWithType(iprot, apache::thrift::protocol::T_MAP))) { + goto _readField_map_i32_map_list_struct_i32; + } else { + goto _skip; + } + } default: { _skip: @@ -5971,6 +6427,82 @@ uint32_t Containers::serializedSize(Protocol_ const* prot_) const { xfer += prot_->serializedFieldSize("map_map_2", apache::thrift::protocol::T_MAP, 18); xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_map_map_2); } + { + xfer += prot_->serializedFieldSize("list_list_i32", apache::thrift::protocol::T_LIST, 19); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::list<::apache::thrift::type_class::integral>>, ::std::vector<::std::vector<::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_list_list_i32); + } + { + xfer += prot_->serializedFieldSize("list_list_struct", apache::thrift::protocol::T_LIST, 20); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, ::std::vector<::std::vector<::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_list_list_struct); + } + { + xfer += prot_->serializedFieldSize("list_set_i32", apache::thrift::protocol::T_LIST, 21); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::set<::apache::thrift::type_class::integral>>, ::std::vector<::std::set<::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_list_set_i32); + } + { + xfer += prot_->serializedFieldSize("list_set_struct", apache::thrift::protocol::T_LIST, 22); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, ::std::vector<::std::set<::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_list_set_struct); + } + { + xfer += prot_->serializedFieldSize("list_map_i32_i32", apache::thrift::protocol::T_LIST, 23); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_list_map_i32_i32); + } + { + xfer += prot_->serializedFieldSize("list_map_i32_struct", apache::thrift::protocol::T_LIST, 24); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_list_map_i32_struct); + } + { + xfer += prot_->serializedFieldSize("list_map_struct_i32", apache::thrift::protocol::T_LIST, 25); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_list_map_struct_i32); + } + { + xfer += prot_->serializedFieldSize("set_list_i32", apache::thrift::protocol::T_SET, 26); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::list<::apache::thrift::type_class::integral>>, ::std::set<::std::vector<::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_set_list_i32); + } + { + xfer += prot_->serializedFieldSize("set_list_struct", apache::thrift::protocol::T_SET, 27); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, ::std::set<::std::vector<::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_set_list_struct); + } + { + xfer += prot_->serializedFieldSize("set_set_i32", apache::thrift::protocol::T_SET, 28); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::set<::apache::thrift::type_class::integral>>, ::std::set<::std::set<::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_set_set_i32); + } + { + xfer += prot_->serializedFieldSize("set_set_struct", apache::thrift::protocol::T_SET, 29); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, ::std::set<::std::set<::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_set_set_struct); + } + { + xfer += prot_->serializedFieldSize("set_map_i32_i32", apache::thrift::protocol::T_SET, 30); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::set<::std::map<::std::int32_t, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_set_map_i32_i32); + } + { + xfer += prot_->serializedFieldSize("set_map_i32_struct", apache::thrift::protocol::T_SET, 31); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_set_map_i32_struct); + } + { + xfer += prot_->serializedFieldSize("set_map_struct_i32", apache::thrift::protocol::T_SET, 32); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_set_map_struct_i32); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_i32_i32", apache::thrift::protocol::T_MAP, 33); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_i32_i32); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_struct_i32", apache::thrift::protocol::T_MAP, 34); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_struct_i32); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_i32_struct", apache::thrift::protocol::T_MAP, 35); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_i32_struct); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_list_i32_i32", apache::thrift::protocol::T_MAP, 36); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>>, ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_list_i32_i32); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_list_struct_i32", apache::thrift::protocol::T_MAP, 37); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>>, ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_list_struct_i32); + } xfer += prot_->serializedSizeStop(); return xfer; } @@ -6051,6 +6583,82 @@ uint32_t Containers::serializedSizeZC(Protocol_ const* prot_) const { xfer += prot_->serializedFieldSize("map_map_2", apache::thrift::protocol::T_MAP, 18); xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_map_map_2); } + { + xfer += prot_->serializedFieldSize("list_list_i32", apache::thrift::protocol::T_LIST, 19); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::list<::apache::thrift::type_class::integral>>, ::std::vector<::std::vector<::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_list_list_i32); + } + { + xfer += prot_->serializedFieldSize("list_list_struct", apache::thrift::protocol::T_LIST, 20); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, ::std::vector<::std::vector<::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_list_list_struct); + } + { + xfer += prot_->serializedFieldSize("list_set_i32", apache::thrift::protocol::T_LIST, 21); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::set<::apache::thrift::type_class::integral>>, ::std::vector<::std::set<::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_list_set_i32); + } + { + xfer += prot_->serializedFieldSize("list_set_struct", apache::thrift::protocol::T_LIST, 22); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, ::std::vector<::std::set<::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_list_set_struct); + } + { + xfer += prot_->serializedFieldSize("list_map_i32_i32", apache::thrift::protocol::T_LIST, 23); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_list_map_i32_i32); + } + { + xfer += prot_->serializedFieldSize("list_map_i32_struct", apache::thrift::protocol::T_LIST, 24); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_list_map_i32_struct); + } + { + xfer += prot_->serializedFieldSize("list_map_struct_i32", apache::thrift::protocol::T_LIST, 25); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_list_map_struct_i32); + } + { + xfer += prot_->serializedFieldSize("set_list_i32", apache::thrift::protocol::T_SET, 26); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::list<::apache::thrift::type_class::integral>>, ::std::set<::std::vector<::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_set_list_i32); + } + { + xfer += prot_->serializedFieldSize("set_list_struct", apache::thrift::protocol::T_SET, 27); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, ::std::set<::std::vector<::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_set_list_struct); + } + { + xfer += prot_->serializedFieldSize("set_set_i32", apache::thrift::protocol::T_SET, 28); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::set<::apache::thrift::type_class::integral>>, ::std::set<::std::set<::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_set_set_i32); + } + { + xfer += prot_->serializedFieldSize("set_set_struct", apache::thrift::protocol::T_SET, 29); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, ::std::set<::std::set<::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_set_set_struct); + } + { + xfer += prot_->serializedFieldSize("set_map_i32_i32", apache::thrift::protocol::T_SET, 30); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::set<::std::map<::std::int32_t, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_set_map_i32_i32); + } + { + xfer += prot_->serializedFieldSize("set_map_i32_struct", apache::thrift::protocol::T_SET, 31); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_set_map_i32_struct); + } + { + xfer += prot_->serializedFieldSize("set_map_struct_i32", apache::thrift::protocol::T_SET, 32); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_set_map_struct_i32); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_i32_i32", apache::thrift::protocol::T_MAP, 33); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_i32_i32); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_struct_i32", apache::thrift::protocol::T_MAP, 34); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_struct_i32); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_i32_struct", apache::thrift::protocol::T_MAP, 35); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_i32_struct); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_list_i32_i32", apache::thrift::protocol::T_MAP, 36); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>>, ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_list_i32_i32); + } + { + xfer += prot_->serializedFieldSize("map_i32_map_list_struct_i32", apache::thrift::protocol::T_MAP, 37); + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>>, ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>>::serializedSize(*prot_, this->__fbthrift_field_map_i32_map_list_struct_i32); + } xfer += prot_->serializedSizeStop(); return xfer; } @@ -6186,6 +6794,139 @@ uint32_t Containers::write(Protocol_* prot_) const { xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>>::write(*prot_, this->__fbthrift_field_map_map_2); xfer += prot_->writeFieldEnd(); } + { + constexpr int16_t kPrevFieldId = 18; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "list_list_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::list<::apache::thrift::type_class::integral>>, ::std::vector<::std::vector<::std::int32_t>>>::write(*prot_, this->__fbthrift_field_list_list_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 19; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "list_list_struct", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, ::std::vector<::std::vector<::cpp2::MyStruct>>>::write(*prot_, this->__fbthrift_field_list_list_struct); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 20; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "list_set_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::set<::apache::thrift::type_class::integral>>, ::std::vector<::std::set<::std::int32_t>>>::write(*prot_, this->__fbthrift_field_list_set_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 21; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "list_set_struct", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, ::std::vector<::std::set<::cpp2::MyStruct>>>::write(*prot_, this->__fbthrift_field_list_set_struct); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 22; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "list_map_i32_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>::write(*prot_, this->__fbthrift_field_list_map_i32_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 23; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "list_map_i32_struct", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::vector<::std::map<::std::int32_t, ::cpp2::MyStruct>>>::write(*prot_, this->__fbthrift_field_list_map_i32_struct); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 24; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "list_map_struct_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>::write(*prot_, this->__fbthrift_field_list_map_struct_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 25; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "set_list_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::list<::apache::thrift::type_class::integral>>, ::std::set<::std::vector<::std::int32_t>>>::write(*prot_, this->__fbthrift_field_set_list_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 26; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "set_list_struct", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::list<::apache::thrift::type_class::structure>>, ::std::set<::std::vector<::cpp2::MyStruct>>>::write(*prot_, this->__fbthrift_field_set_list_struct); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 27; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "set_set_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::set<::apache::thrift::type_class::integral>>, ::std::set<::std::set<::std::int32_t>>>::write(*prot_, this->__fbthrift_field_set_set_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 28; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "set_set_struct", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::set<::apache::thrift::type_class::structure>>, ::std::set<::std::set<::cpp2::MyStruct>>>::write(*prot_, this->__fbthrift_field_set_set_struct); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 29; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "set_map_i32_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::set<::std::map<::std::int32_t, ::std::int32_t>>>::write(*prot_, this->__fbthrift_field_set_map_i32_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 30; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "set_map_i32_struct", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::set<::std::map<::std::int32_t, ::cpp2::MyStruct>>>::write(*prot_, this->__fbthrift_field_set_map_i32_struct); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 31; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "set_map_struct_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::set<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::set<::std::map<::cpp2::MyStruct, ::std::int32_t>>>::write(*prot_, this->__fbthrift_field_set_map_struct_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 32; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "map_i32_map_i32_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::std::int32_t>>>::write(*prot_, this->__fbthrift_field_map_i32_map_i32_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 33; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "map_i32_map_struct_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>, ::std::map<::std::int32_t, ::std::map<::cpp2::MyStruct, ::std::int32_t>>>::write(*prot_, this->__fbthrift_field_map_i32_map_struct_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 34; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "map_i32_map_i32_struct", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::structure>>, ::std::map<::std::int32_t, ::std::map<::std::int32_t, ::cpp2::MyStruct>>>::write(*prot_, this->__fbthrift_field_map_i32_map_i32_struct); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 35; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "map_i32_map_list_i32_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::integral>>>, ::std::map<::std::int32_t, ::std::vector<::std::map<::std::int32_t, ::std::int32_t>>>>::write(*prot_, this->__fbthrift_field_map_i32_map_list_i32_i32); + xfer += prot_->writeFieldEnd(); + } + { + constexpr int16_t kPrevFieldId = 36; + xfer += ::apache::thrift::detail::writeFieldBegin(*prot_, "map_i32_map_list_struct_i32", previousFieldHasValue); + previousFieldHasValue = true; + xfer += ::apache::thrift::detail::pm::protocol_methods<::apache::thrift::type_class::map<::apache::thrift::type_class::integral, ::apache::thrift::type_class::list<::apache::thrift::type_class::map<::apache::thrift::type_class::structure, ::apache::thrift::type_class::integral>>>, ::std::map<::std::int32_t, ::std::vector<::std::map<::cpp2::MyStruct, ::std::int32_t>>>>::write(*prot_, this->__fbthrift_field_map_i32_map_list_struct_i32); + xfer += prot_->writeFieldEnd(); + } xfer += prot_->writeFieldStop(); xfer += prot_->writeStructEnd(); return xfer; diff --git a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_visit_by_thrift_field_metadata.h b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_visit_by_thrift_field_metadata.h index f5d004a1ffe..c1d295f78f6 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_visit_by_thrift_field_metadata.h +++ b/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_visit_by_thrift_field_metadata.h @@ -437,6 +437,44 @@ struct VisitByFieldId<::cpp2::Containers> { return f(16, static_cast(t).map_map_ref()); case 18: return f(17, static_cast(t).map_map_2_ref()); + case 19: + return f(18, static_cast(t).list_list_i32_ref()); + case 20: + return f(19, static_cast(t).list_list_struct_ref()); + case 21: + return f(20, static_cast(t).list_set_i32_ref()); + case 22: + return f(21, static_cast(t).list_set_struct_ref()); + case 23: + return f(22, static_cast(t).list_map_i32_i32_ref()); + case 24: + return f(23, static_cast(t).list_map_i32_struct_ref()); + case 25: + return f(24, static_cast(t).list_map_struct_i32_ref()); + case 26: + return f(25, static_cast(t).set_list_i32_ref()); + case 27: + return f(26, static_cast(t).set_list_struct_ref()); + case 28: + return f(27, static_cast(t).set_set_i32_ref()); + case 29: + return f(28, static_cast(t).set_set_struct_ref()); + case 30: + return f(29, static_cast(t).set_map_i32_i32_ref()); + case 31: + return f(30, static_cast(t).set_map_i32_struct_ref()); + case 32: + return f(31, static_cast(t).set_map_struct_i32_ref()); + case 33: + return f(32, static_cast(t).map_i32_map_i32_i32_ref()); + case 34: + return f(33, static_cast(t).map_i32_map_struct_i32_ref()); + case 35: + return f(34, static_cast(t).map_i32_map_i32_struct_ref()); + case 36: + return f(35, static_cast(t).map_i32_map_list_i32_i32_ref()); + case 37: + return f(36, static_cast(t).map_i32_map_list_struct_i32_ref()); default: throwInvalidThriftId(fieldId, "::cpp2::Containers"); } diff --git a/thrift/compiler/test/fixtures/complex-struct/out/java/gen-java/test/fixtures/complex_struct/Containers.java b/thrift/compiler/test/fixtures/complex-struct/out/java/gen-java/test/fixtures/complex_struct/Containers.java index d1cfe43ad13..04bb6bddffe 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/java/gen-java/test/fixtures/complex_struct/Containers.java +++ b/thrift/compiler/test/fixtures/complex-struct/out/java/gen-java/test/fixtures/complex_struct/Containers.java @@ -41,7 +41,26 @@ public Containers( @com.facebook.swift.codec.ThriftField(value=15, name="set_map", requiredness=Requiredness.NONE) final Map, Integer> setMap, @com.facebook.swift.codec.ThriftField(value=16, name="set_map_2", requiredness=Requiredness.NONE) final Map> setMap2, @com.facebook.swift.codec.ThriftField(value=17, name="map_map", requiredness=Requiredness.NONE) final Map, Integer> mapMap, - @com.facebook.swift.codec.ThriftField(value=18, name="map_map_2", requiredness=Requiredness.NONE) final Map> mapMap2 + @com.facebook.swift.codec.ThriftField(value=18, name="map_map_2", requiredness=Requiredness.NONE) final Map> mapMap2, + @com.facebook.swift.codec.ThriftField(value=19, name="list_list_i32", requiredness=Requiredness.NONE) final List> listListI32, + @com.facebook.swift.codec.ThriftField(value=20, name="list_list_struct", requiredness=Requiredness.NONE) final List> listListStruct, + @com.facebook.swift.codec.ThriftField(value=21, name="list_set_i32", requiredness=Requiredness.NONE) final List> listSetI32, + @com.facebook.swift.codec.ThriftField(value=22, name="list_set_struct", requiredness=Requiredness.NONE) final List> listSetStruct, + @com.facebook.swift.codec.ThriftField(value=23, name="list_map_i32_i32", requiredness=Requiredness.NONE) final List> listMapI32I32, + @com.facebook.swift.codec.ThriftField(value=24, name="list_map_i32_struct", requiredness=Requiredness.NONE) final List> listMapI32Struct, + @com.facebook.swift.codec.ThriftField(value=25, name="list_map_struct_i32", requiredness=Requiredness.NONE) final List> listMapStructI32, + @com.facebook.swift.codec.ThriftField(value=26, name="set_list_i32", requiredness=Requiredness.NONE) final Set> setListI32, + @com.facebook.swift.codec.ThriftField(value=27, name="set_list_struct", requiredness=Requiredness.NONE) final Set> setListStruct, + @com.facebook.swift.codec.ThriftField(value=28, name="set_set_i32", requiredness=Requiredness.NONE) final Set> setSetI32, + @com.facebook.swift.codec.ThriftField(value=29, name="set_set_struct", requiredness=Requiredness.NONE) final Set> setSetStruct, + @com.facebook.swift.codec.ThriftField(value=30, name="set_map_i32_i32", requiredness=Requiredness.NONE) final Set> setMapI32I32, + @com.facebook.swift.codec.ThriftField(value=31, name="set_map_i32_struct", requiredness=Requiredness.NONE) final Set> setMapI32Struct, + @com.facebook.swift.codec.ThriftField(value=32, name="set_map_struct_i32", requiredness=Requiredness.NONE) final Set> setMapStructI32, + @com.facebook.swift.codec.ThriftField(value=33, name="map_i32_map_i32_i32", requiredness=Requiredness.NONE) final Map> mapI32MapI32I32, + @com.facebook.swift.codec.ThriftField(value=34, name="map_i32_map_struct_i32", requiredness=Requiredness.NONE) final Map> mapI32MapStructI32, + @com.facebook.swift.codec.ThriftField(value=35, name="map_i32_map_i32_struct", requiredness=Requiredness.NONE) final Map> mapI32MapI32Struct, + @com.facebook.swift.codec.ThriftField(value=36, name="map_i32_map_list_i32_i32", requiredness=Requiredness.NONE) final Map>> mapI32MapListI32I32, + @com.facebook.swift.codec.ThriftField(value=37, name="map_i32_map_list_struct_i32", requiredness=Requiredness.NONE) final Map>> mapI32MapListStructI32 ) { this.structList = structList; this.unionList = unionList; @@ -61,6 +80,25 @@ public Containers( this.setMap2 = setMap2; this.mapMap = mapMap; this.mapMap2 = mapMap2; + this.listListI32 = listListI32; + this.listListStruct = listListStruct; + this.listSetI32 = listSetI32; + this.listSetStruct = listSetStruct; + this.listMapI32I32 = listMapI32I32; + this.listMapI32Struct = listMapI32Struct; + this.listMapStructI32 = listMapStructI32; + this.setListI32 = setListI32; + this.setListStruct = setListStruct; + this.setSetI32 = setSetI32; + this.setSetStruct = setSetStruct; + this.setMapI32I32 = setMapI32I32; + this.setMapI32Struct = setMapI32Struct; + this.setMapStructI32 = setMapStructI32; + this.mapI32MapI32I32 = mapI32MapI32I32; + this.mapI32MapStructI32 = mapI32MapStructI32; + this.mapI32MapI32Struct = mapI32MapI32Struct; + this.mapI32MapListI32I32 = mapI32MapListI32I32; + this.mapI32MapListStructI32 = mapI32MapListStructI32; } @ThriftConstructor @@ -83,6 +121,25 @@ protected Containers() { this.setMap2 = null; this.mapMap = null; this.mapMap2 = null; + this.listListI32 = null; + this.listListStruct = null; + this.listSetI32 = null; + this.listSetStruct = null; + this.listMapI32I32 = null; + this.listMapI32Struct = null; + this.listMapStructI32 = null; + this.setListI32 = null; + this.setListStruct = null; + this.setSetI32 = null; + this.setSetStruct = null; + this.setMapI32I32 = null; + this.setMapI32Struct = null; + this.setMapStructI32 = null; + this.mapI32MapI32I32 = null; + this.mapI32MapStructI32 = null; + this.mapI32MapI32Struct = null; + this.mapI32MapListI32I32 = null; + this.mapI32MapListStructI32 = null; } public static Builder builder() { @@ -112,6 +169,25 @@ public static class Builder { private Map> setMap2 = null; private Map, Integer> mapMap = null; private Map> mapMap2 = null; + private List> listListI32 = null; + private List> listListStruct = null; + private List> listSetI32 = null; + private List> listSetStruct = null; + private List> listMapI32I32 = null; + private List> listMapI32Struct = null; + private List> listMapStructI32 = null; + private Set> setListI32 = null; + private Set> setListStruct = null; + private Set> setSetI32 = null; + private Set> setSetStruct = null; + private Set> setMapI32I32 = null; + private Set> setMapI32Struct = null; + private Set> setMapStructI32 = null; + private Map> mapI32MapI32I32 = null; + private Map> mapI32MapStructI32 = null; + private Map> mapI32MapI32Struct = null; + private Map>> mapI32MapListI32I32 = null; + private Map>> mapI32MapListStructI32 = null; @com.facebook.swift.codec.ThriftField(value=1, name="struct_list", requiredness=Requiredness.NONE) public Builder setStructList(List structList) { @@ -257,6 +333,158 @@ public Builder setMapMap2(Map> mapMap2) { public Map> getMapMap2() { return mapMap2; } + @com.facebook.swift.codec.ThriftField(value=19, name="list_list_i32", requiredness=Requiredness.NONE) + public Builder setListListI32(List> listListI32) { + this.listListI32 = listListI32; + return this; + } + + public List> getListListI32() { return listListI32; } + + @com.facebook.swift.codec.ThriftField(value=20, name="list_list_struct", requiredness=Requiredness.NONE) + public Builder setListListStruct(List> listListStruct) { + this.listListStruct = listListStruct; + return this; + } + + public List> getListListStruct() { return listListStruct; } + + @com.facebook.swift.codec.ThriftField(value=21, name="list_set_i32", requiredness=Requiredness.NONE) + public Builder setListSetI32(List> listSetI32) { + this.listSetI32 = listSetI32; + return this; + } + + public List> getListSetI32() { return listSetI32; } + + @com.facebook.swift.codec.ThriftField(value=22, name="list_set_struct", requiredness=Requiredness.NONE) + public Builder setListSetStruct(List> listSetStruct) { + this.listSetStruct = listSetStruct; + return this; + } + + public List> getListSetStruct() { return listSetStruct; } + + @com.facebook.swift.codec.ThriftField(value=23, name="list_map_i32_i32", requiredness=Requiredness.NONE) + public Builder setListMapI32I32(List> listMapI32I32) { + this.listMapI32I32 = listMapI32I32; + return this; + } + + public List> getListMapI32I32() { return listMapI32I32; } + + @com.facebook.swift.codec.ThriftField(value=24, name="list_map_i32_struct", requiredness=Requiredness.NONE) + public Builder setListMapI32Struct(List> listMapI32Struct) { + this.listMapI32Struct = listMapI32Struct; + return this; + } + + public List> getListMapI32Struct() { return listMapI32Struct; } + + @com.facebook.swift.codec.ThriftField(value=25, name="list_map_struct_i32", requiredness=Requiredness.NONE) + public Builder setListMapStructI32(List> listMapStructI32) { + this.listMapStructI32 = listMapStructI32; + return this; + } + + public List> getListMapStructI32() { return listMapStructI32; } + + @com.facebook.swift.codec.ThriftField(value=26, name="set_list_i32", requiredness=Requiredness.NONE) + public Builder setSetListI32(Set> setListI32) { + this.setListI32 = setListI32; + return this; + } + + public Set> getSetListI32() { return setListI32; } + + @com.facebook.swift.codec.ThriftField(value=27, name="set_list_struct", requiredness=Requiredness.NONE) + public Builder setSetListStruct(Set> setListStruct) { + this.setListStruct = setListStruct; + return this; + } + + public Set> getSetListStruct() { return setListStruct; } + + @com.facebook.swift.codec.ThriftField(value=28, name="set_set_i32", requiredness=Requiredness.NONE) + public Builder setSetSetI32(Set> setSetI32) { + this.setSetI32 = setSetI32; + return this; + } + + public Set> getSetSetI32() { return setSetI32; } + + @com.facebook.swift.codec.ThriftField(value=29, name="set_set_struct", requiredness=Requiredness.NONE) + public Builder setSetSetStruct(Set> setSetStruct) { + this.setSetStruct = setSetStruct; + return this; + } + + public Set> getSetSetStruct() { return setSetStruct; } + + @com.facebook.swift.codec.ThriftField(value=30, name="set_map_i32_i32", requiredness=Requiredness.NONE) + public Builder setSetMapI32I32(Set> setMapI32I32) { + this.setMapI32I32 = setMapI32I32; + return this; + } + + public Set> getSetMapI32I32() { return setMapI32I32; } + + @com.facebook.swift.codec.ThriftField(value=31, name="set_map_i32_struct", requiredness=Requiredness.NONE) + public Builder setSetMapI32Struct(Set> setMapI32Struct) { + this.setMapI32Struct = setMapI32Struct; + return this; + } + + public Set> getSetMapI32Struct() { return setMapI32Struct; } + + @com.facebook.swift.codec.ThriftField(value=32, name="set_map_struct_i32", requiredness=Requiredness.NONE) + public Builder setSetMapStructI32(Set> setMapStructI32) { + this.setMapStructI32 = setMapStructI32; + return this; + } + + public Set> getSetMapStructI32() { return setMapStructI32; } + + @com.facebook.swift.codec.ThriftField(value=33, name="map_i32_map_i32_i32", requiredness=Requiredness.NONE) + public Builder setMapI32MapI32I32(Map> mapI32MapI32I32) { + this.mapI32MapI32I32 = mapI32MapI32I32; + return this; + } + + public Map> getMapI32MapI32I32() { return mapI32MapI32I32; } + + @com.facebook.swift.codec.ThriftField(value=34, name="map_i32_map_struct_i32", requiredness=Requiredness.NONE) + public Builder setMapI32MapStructI32(Map> mapI32MapStructI32) { + this.mapI32MapStructI32 = mapI32MapStructI32; + return this; + } + + public Map> getMapI32MapStructI32() { return mapI32MapStructI32; } + + @com.facebook.swift.codec.ThriftField(value=35, name="map_i32_map_i32_struct", requiredness=Requiredness.NONE) + public Builder setMapI32MapI32Struct(Map> mapI32MapI32Struct) { + this.mapI32MapI32Struct = mapI32MapI32Struct; + return this; + } + + public Map> getMapI32MapI32Struct() { return mapI32MapI32Struct; } + + @com.facebook.swift.codec.ThriftField(value=36, name="map_i32_map_list_i32_i32", requiredness=Requiredness.NONE) + public Builder setMapI32MapListI32I32(Map>> mapI32MapListI32I32) { + this.mapI32MapListI32I32 = mapI32MapListI32I32; + return this; + } + + public Map>> getMapI32MapListI32I32() { return mapI32MapListI32I32; } + + @com.facebook.swift.codec.ThriftField(value=37, name="map_i32_map_list_struct_i32", requiredness=Requiredness.NONE) + public Builder setMapI32MapListStructI32(Map>> mapI32MapListStructI32) { + this.mapI32MapListStructI32 = mapI32MapListStructI32; + return this; + } + + public Map>> getMapI32MapListStructI32() { return mapI32MapListStructI32; } + public Builder() { } public Builder(Containers other) { this.structList = other.structList; @@ -277,6 +505,25 @@ public Builder(Containers other) { this.setMap2 = other.setMap2; this.mapMap = other.mapMap; this.mapMap2 = other.mapMap2; + this.listListI32 = other.listListI32; + this.listListStruct = other.listListStruct; + this.listSetI32 = other.listSetI32; + this.listSetStruct = other.listSetStruct; + this.listMapI32I32 = other.listMapI32I32; + this.listMapI32Struct = other.listMapI32Struct; + this.listMapStructI32 = other.listMapStructI32; + this.setListI32 = other.setListI32; + this.setListStruct = other.setListStruct; + this.setSetI32 = other.setSetI32; + this.setSetStruct = other.setSetStruct; + this.setMapI32I32 = other.setMapI32I32; + this.setMapI32Struct = other.setMapI32Struct; + this.setMapStructI32 = other.setMapStructI32; + this.mapI32MapI32I32 = other.mapI32MapI32I32; + this.mapI32MapStructI32 = other.mapI32MapStructI32; + this.mapI32MapI32Struct = other.mapI32MapI32Struct; + this.mapI32MapListI32I32 = other.mapI32MapListI32I32; + this.mapI32MapListStructI32 = other.mapI32MapListStructI32; } @ThriftConstructor @@ -299,7 +546,26 @@ public Containers build() { this.setMap, this.setMap2, this.mapMap, - this.mapMap2 + this.mapMap2, + this.listListI32, + this.listListStruct, + this.listSetI32, + this.listSetStruct, + this.listMapI32I32, + this.listMapI32Struct, + this.listMapStructI32, + this.setListI32, + this.setListStruct, + this.setSetI32, + this.setSetStruct, + this.setMapI32I32, + this.setMapI32Struct, + this.setMapStructI32, + this.mapI32MapI32I32, + this.mapI32MapStructI32, + this.mapI32MapI32Struct, + this.mapI32MapListI32I32, + this.mapI32MapListStructI32 ); return result; } @@ -363,6 +629,63 @@ public Containers build() { private final Map> mapMap2; public static final int _MAP_MAP_2 = 18; private static final TField MAP_MAP_2_FIELD_DESC = new TField("map_map_2", TType.MAP, (short)18); + private final List> listListI32; + public static final int _LIST_LIST_I32 = 19; + private static final TField LIST_LIST_I32_FIELD_DESC = new TField("list_list_i32", TType.LIST, (short)19); + private final List> listListStruct; + public static final int _LIST_LIST_STRUCT = 20; + private static final TField LIST_LIST_STRUCT_FIELD_DESC = new TField("list_list_struct", TType.LIST, (short)20); + private final List> listSetI32; + public static final int _LIST_SET_I32 = 21; + private static final TField LIST_SET_I32_FIELD_DESC = new TField("list_set_i32", TType.LIST, (short)21); + private final List> listSetStruct; + public static final int _LIST_SET_STRUCT = 22; + private static final TField LIST_SET_STRUCT_FIELD_DESC = new TField("list_set_struct", TType.LIST, (short)22); + private final List> listMapI32I32; + public static final int _LIST_MAP_I32_I32 = 23; + private static final TField LIST_MAP_I32_I32_FIELD_DESC = new TField("list_map_i32_i32", TType.LIST, (short)23); + private final List> listMapI32Struct; + public static final int _LIST_MAP_I32_STRUCT = 24; + private static final TField LIST_MAP_I32_STRUCT_FIELD_DESC = new TField("list_map_i32_struct", TType.LIST, (short)24); + private final List> listMapStructI32; + public static final int _LIST_MAP_STRUCT_I32 = 25; + private static final TField LIST_MAP_STRUCT_I32_FIELD_DESC = new TField("list_map_struct_i32", TType.LIST, (short)25); + private final Set> setListI32; + public static final int _SET_LIST_I32 = 26; + private static final TField SET_LIST_I32_FIELD_DESC = new TField("set_list_i32", TType.SET, (short)26); + private final Set> setListStruct; + public static final int _SET_LIST_STRUCT = 27; + private static final TField SET_LIST_STRUCT_FIELD_DESC = new TField("set_list_struct", TType.SET, (short)27); + private final Set> setSetI32; + public static final int _SET_SET_I32 = 28; + private static final TField SET_SET_I32_FIELD_DESC = new TField("set_set_i32", TType.SET, (short)28); + private final Set> setSetStruct; + public static final int _SET_SET_STRUCT = 29; + private static final TField SET_SET_STRUCT_FIELD_DESC = new TField("set_set_struct", TType.SET, (short)29); + private final Set> setMapI32I32; + public static final int _SET_MAP_I32_I32 = 30; + private static final TField SET_MAP_I32_I32_FIELD_DESC = new TField("set_map_i32_i32", TType.SET, (short)30); + private final Set> setMapI32Struct; + public static final int _SET_MAP_I32_STRUCT = 31; + private static final TField SET_MAP_I32_STRUCT_FIELD_DESC = new TField("set_map_i32_struct", TType.SET, (short)31); + private final Set> setMapStructI32; + public static final int _SET_MAP_STRUCT_I32 = 32; + private static final TField SET_MAP_STRUCT_I32_FIELD_DESC = new TField("set_map_struct_i32", TType.SET, (short)32); + private final Map> mapI32MapI32I32; + public static final int _MAP_I32_MAP_I32_I32 = 33; + private static final TField MAP_I32_MAP_I32_I32_FIELD_DESC = new TField("map_i32_map_i32_i32", TType.MAP, (short)33); + private final Map> mapI32MapStructI32; + public static final int _MAP_I32_MAP_STRUCT_I32 = 34; + private static final TField MAP_I32_MAP_STRUCT_I32_FIELD_DESC = new TField("map_i32_map_struct_i32", TType.MAP, (short)34); + private final Map> mapI32MapI32Struct; + public static final int _MAP_I32_MAP_I32_STRUCT = 35; + private static final TField MAP_I32_MAP_I32_STRUCT_FIELD_DESC = new TField("map_i32_map_i32_struct", TType.MAP, (short)35); + private final Map>> mapI32MapListI32I32; + public static final int _MAP_I32_MAP_LIST_I32_I32 = 36; + private static final TField MAP_I32_MAP_LIST_I32_I32_FIELD_DESC = new TField("map_i32_map_list_i32_i32", TType.MAP, (short)36); + private final Map>> mapI32MapListStructI32; + public static final int _MAP_I32_MAP_LIST_STRUCT_I32 = 37; + private static final TField MAP_I32_MAP_LIST_STRUCT_I32_FIELD_DESC = new TField("map_i32_map_list_struct_i32", TType.MAP, (short)37); static { NAMES_TO_IDS.put("structList", 1); THRIFT_NAMES_TO_IDS.put("struct_list", 1); @@ -418,6 +741,63 @@ public Containers build() { NAMES_TO_IDS.put("mapMap2", 18); THRIFT_NAMES_TO_IDS.put("map_map_2", 18); FIELD_METADATA.put(18, MAP_MAP_2_FIELD_DESC); + NAMES_TO_IDS.put("listListI32", 19); + THRIFT_NAMES_TO_IDS.put("list_list_i32", 19); + FIELD_METADATA.put(19, LIST_LIST_I32_FIELD_DESC); + NAMES_TO_IDS.put("listListStruct", 20); + THRIFT_NAMES_TO_IDS.put("list_list_struct", 20); + FIELD_METADATA.put(20, LIST_LIST_STRUCT_FIELD_DESC); + NAMES_TO_IDS.put("listSetI32", 21); + THRIFT_NAMES_TO_IDS.put("list_set_i32", 21); + FIELD_METADATA.put(21, LIST_SET_I32_FIELD_DESC); + NAMES_TO_IDS.put("listSetStruct", 22); + THRIFT_NAMES_TO_IDS.put("list_set_struct", 22); + FIELD_METADATA.put(22, LIST_SET_STRUCT_FIELD_DESC); + NAMES_TO_IDS.put("listMapI32I32", 23); + THRIFT_NAMES_TO_IDS.put("list_map_i32_i32", 23); + FIELD_METADATA.put(23, LIST_MAP_I32_I32_FIELD_DESC); + NAMES_TO_IDS.put("listMapI32Struct", 24); + THRIFT_NAMES_TO_IDS.put("list_map_i32_struct", 24); + FIELD_METADATA.put(24, LIST_MAP_I32_STRUCT_FIELD_DESC); + NAMES_TO_IDS.put("listMapStructI32", 25); + THRIFT_NAMES_TO_IDS.put("list_map_struct_i32", 25); + FIELD_METADATA.put(25, LIST_MAP_STRUCT_I32_FIELD_DESC); + NAMES_TO_IDS.put("setListI32", 26); + THRIFT_NAMES_TO_IDS.put("set_list_i32", 26); + FIELD_METADATA.put(26, SET_LIST_I32_FIELD_DESC); + NAMES_TO_IDS.put("setListStruct", 27); + THRIFT_NAMES_TO_IDS.put("set_list_struct", 27); + FIELD_METADATA.put(27, SET_LIST_STRUCT_FIELD_DESC); + NAMES_TO_IDS.put("setSetI32", 28); + THRIFT_NAMES_TO_IDS.put("set_set_i32", 28); + FIELD_METADATA.put(28, SET_SET_I32_FIELD_DESC); + NAMES_TO_IDS.put("setSetStruct", 29); + THRIFT_NAMES_TO_IDS.put("set_set_struct", 29); + FIELD_METADATA.put(29, SET_SET_STRUCT_FIELD_DESC); + NAMES_TO_IDS.put("setMapI32I32", 30); + THRIFT_NAMES_TO_IDS.put("set_map_i32_i32", 30); + FIELD_METADATA.put(30, SET_MAP_I32_I32_FIELD_DESC); + NAMES_TO_IDS.put("setMapI32Struct", 31); + THRIFT_NAMES_TO_IDS.put("set_map_i32_struct", 31); + FIELD_METADATA.put(31, SET_MAP_I32_STRUCT_FIELD_DESC); + NAMES_TO_IDS.put("setMapStructI32", 32); + THRIFT_NAMES_TO_IDS.put("set_map_struct_i32", 32); + FIELD_METADATA.put(32, SET_MAP_STRUCT_I32_FIELD_DESC); + NAMES_TO_IDS.put("mapI32MapI32I32", 33); + THRIFT_NAMES_TO_IDS.put("map_i32_map_i32_i32", 33); + FIELD_METADATA.put(33, MAP_I32_MAP_I32_I32_FIELD_DESC); + NAMES_TO_IDS.put("mapI32MapStructI32", 34); + THRIFT_NAMES_TO_IDS.put("map_i32_map_struct_i32", 34); + FIELD_METADATA.put(34, MAP_I32_MAP_STRUCT_I32_FIELD_DESC); + NAMES_TO_IDS.put("mapI32MapI32Struct", 35); + THRIFT_NAMES_TO_IDS.put("map_i32_map_i32_struct", 35); + FIELD_METADATA.put(35, MAP_I32_MAP_I32_STRUCT_FIELD_DESC); + NAMES_TO_IDS.put("mapI32MapListI32I32", 36); + THRIFT_NAMES_TO_IDS.put("map_i32_map_list_i32_i32", 36); + FIELD_METADATA.put(36, MAP_I32_MAP_LIST_I32_I32_FIELD_DESC); + NAMES_TO_IDS.put("mapI32MapListStructI32", 37); + THRIFT_NAMES_TO_IDS.put("map_i32_map_list_struct_i32", 37); + FIELD_METADATA.put(37, MAP_I32_MAP_LIST_STRUCT_I32_FIELD_DESC); } @Nullable @@ -509,6 +889,101 @@ public Containers build() { @com.facebook.swift.codec.ThriftField(value=18, name="map_map_2", requiredness=Requiredness.NONE) public Map> getMapMap2() { return mapMap2; } + + @Nullable + @com.facebook.swift.codec.ThriftField(value=19, name="list_list_i32", requiredness=Requiredness.NONE) + public List> getListListI32() { return listListI32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=20, name="list_list_struct", requiredness=Requiredness.NONE) + public List> getListListStruct() { return listListStruct; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=21, name="list_set_i32", requiredness=Requiredness.NONE) + public List> getListSetI32() { return listSetI32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=22, name="list_set_struct", requiredness=Requiredness.NONE) + public List> getListSetStruct() { return listSetStruct; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=23, name="list_map_i32_i32", requiredness=Requiredness.NONE) + public List> getListMapI32I32() { return listMapI32I32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=24, name="list_map_i32_struct", requiredness=Requiredness.NONE) + public List> getListMapI32Struct() { return listMapI32Struct; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=25, name="list_map_struct_i32", requiredness=Requiredness.NONE) + public List> getListMapStructI32() { return listMapStructI32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=26, name="set_list_i32", requiredness=Requiredness.NONE) + public Set> getSetListI32() { return setListI32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=27, name="set_list_struct", requiredness=Requiredness.NONE) + public Set> getSetListStruct() { return setListStruct; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=28, name="set_set_i32", requiredness=Requiredness.NONE) + public Set> getSetSetI32() { return setSetI32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=29, name="set_set_struct", requiredness=Requiredness.NONE) + public Set> getSetSetStruct() { return setSetStruct; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=30, name="set_map_i32_i32", requiredness=Requiredness.NONE) + public Set> getSetMapI32I32() { return setMapI32I32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=31, name="set_map_i32_struct", requiredness=Requiredness.NONE) + public Set> getSetMapI32Struct() { return setMapI32Struct; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=32, name="set_map_struct_i32", requiredness=Requiredness.NONE) + public Set> getSetMapStructI32() { return setMapStructI32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=33, name="map_i32_map_i32_i32", requiredness=Requiredness.NONE) + public Map> getMapI32MapI32I32() { return mapI32MapI32I32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=34, name="map_i32_map_struct_i32", requiredness=Requiredness.NONE) + public Map> getMapI32MapStructI32() { return mapI32MapStructI32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=35, name="map_i32_map_i32_struct", requiredness=Requiredness.NONE) + public Map> getMapI32MapI32Struct() { return mapI32MapI32Struct; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=36, name="map_i32_map_list_i32_i32", requiredness=Requiredness.NONE) + public Map>> getMapI32MapListI32I32() { return mapI32MapListI32I32; } + + + @Nullable + @com.facebook.swift.codec.ThriftField(value=37, name="map_i32_map_list_struct_i32", requiredness=Requiredness.NONE) + public Map>> getMapI32MapListStructI32() { return mapI32MapListStructI32; } + @java.lang.Override public String toString() { ToStringHelper helper = toStringHelper(this); @@ -530,6 +1005,25 @@ public String toString() { helper.add("setMap2", setMap2); helper.add("mapMap", mapMap); helper.add("mapMap2", mapMap2); + helper.add("listListI32", listListI32); + helper.add("listListStruct", listListStruct); + helper.add("listSetI32", listSetI32); + helper.add("listSetStruct", listSetStruct); + helper.add("listMapI32I32", listMapI32I32); + helper.add("listMapI32Struct", listMapI32Struct); + helper.add("listMapStructI32", listMapStructI32); + helper.add("setListI32", setListI32); + helper.add("setListStruct", setListStruct); + helper.add("setSetI32", setSetI32); + helper.add("setSetStruct", setSetStruct); + helper.add("setMapI32I32", setMapI32I32); + helper.add("setMapI32Struct", setMapI32Struct); + helper.add("setMapStructI32", setMapStructI32); + helper.add("mapI32MapI32I32", mapI32MapI32I32); + helper.add("mapI32MapStructI32", mapI32MapStructI32); + helper.add("mapI32MapI32Struct", mapI32MapI32Struct); + helper.add("mapI32MapListI32I32", mapI32MapListI32I32); + helper.add("mapI32MapListStructI32", mapI32MapListStructI32); return helper.toString(); } @@ -563,6 +1057,25 @@ public boolean equals(java.lang.Object o) { Objects.equals(setMap2, other.setMap2) && Objects.equals(mapMap, other.mapMap) && Objects.equals(mapMap2, other.mapMap2) && + Objects.equals(listListI32, other.listListI32) && + Objects.equals(listListStruct, other.listListStruct) && + Objects.equals(listSetI32, other.listSetI32) && + Objects.equals(listSetStruct, other.listSetStruct) && + Objects.equals(listMapI32I32, other.listMapI32I32) && + Objects.equals(listMapI32Struct, other.listMapI32Struct) && + Objects.equals(listMapStructI32, other.listMapStructI32) && + Objects.equals(setListI32, other.setListI32) && + Objects.equals(setListStruct, other.setListStruct) && + Objects.equals(setSetI32, other.setSetI32) && + Objects.equals(setSetStruct, other.setSetStruct) && + Objects.equals(setMapI32I32, other.setMapI32I32) && + Objects.equals(setMapI32Struct, other.setMapI32Struct) && + Objects.equals(setMapStructI32, other.setMapStructI32) && + Objects.equals(mapI32MapI32I32, other.mapI32MapI32I32) && + Objects.equals(mapI32MapStructI32, other.mapI32MapStructI32) && + Objects.equals(mapI32MapI32Struct, other.mapI32MapI32Struct) && + Objects.equals(mapI32MapListI32I32, other.mapI32MapListI32I32) && + Objects.equals(mapI32MapListStructI32, other.mapI32MapListStructI32) && true; } @@ -586,7 +1099,26 @@ public int hashCode() { setMap, setMap2, mapMap, - mapMap2 + mapMap2, + listListI32, + listListStruct, + listSetI32, + listSetStruct, + listMapI32I32, + listMapI32Struct, + listMapStructI32, + setListI32, + setListStruct, + setSetI32, + setSetStruct, + setMapI32I32, + setMapI32Struct, + setMapStructI32, + mapI32MapI32I32, + mapI32MapStructI32, + mapI32MapI32Struct, + mapI32MapListI32I32, + mapI32MapListStructI32 }); } @@ -1017,104 +1549,787 @@ public static Containers read0(TProtocol oprot) throws TException { TProtocolUtil.skip(oprot, __field.type); } break; - default: - TProtocolUtil.skip(oprot, __field.type); + case _LIST_LIST_I32: + if (__field.type == TType.LIST) { + List> listListI32; + { + TList _list = oprot.readListBegin(); + listListI32 = new ArrayList>(Math.max(0, _list.size)); + for (int _i = 0; (_list.size < 0) ? oprot.peekList() : (_i < _list.size); _i++) { + + List _value1; + { + TList _list1 = oprot.readListBegin(); + _value1 = new ArrayList(Math.max(0, _list1.size)); + for (int _i1 = 0; (_list1.size < 0) ? oprot.peekList() : (_i1 < _list1.size); _i1++) { + + + int _value2 = oprot.readI32(); + + + _value1.add(_value2); + + } + oprot.readListEnd(); + } + listListI32.add(_value1); + } + oprot.readListEnd(); + } + builder.setListListI32(listListI32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } break; - } - oprot.readFieldEnd(); - } - oprot.readStructEnd(); - return builder.build(); - } - - public void write0(TProtocol oprot) throws TException { - oprot.writeStructBegin(STRUCT_DESC); - if (structList != null) { - oprot.writeFieldBegin(STRUCT_LIST_FIELD_DESC); - List _iter0 = structList; - oprot.writeListBegin(new TList(TType.STRUCT, _iter0.size())); - for (test.fixtures.complex_struct.MyStruct _iter1 : _iter0) { - _iter1.write0(oprot); - } - oprot.writeListEnd(); - oprot.writeFieldEnd(); - } - if (unionList != null) { - oprot.writeFieldBegin(UNION_LIST_FIELD_DESC); - List _iter0 = unionList; - oprot.writeListBegin(new TList(TType.STRUCT, _iter0.size())); - for (test.fixtures.complex_struct.MyUnion _iter1 : _iter0) { - _iter1.write0(oprot); - } - oprot.writeListEnd(); - oprot.writeFieldEnd(); - } - if (enumList != null) { - oprot.writeFieldBegin(ENUM_LIST_FIELD_DESC); - List _iter0 = enumList; - oprot.writeListBegin(new TList(TType.I32, _iter0.size())); - for (test.fixtures.complex_struct.MyEnum _iter1 : _iter0) { - oprot.writeI32(_iter1 == null ? 0 : com.facebook.thrift.util.EnumUtil.getValue(_iter1)); - } - oprot.writeListEnd(); - oprot.writeFieldEnd(); - } - if (structSet != null) { - oprot.writeFieldBegin(STRUCT_SET_FIELD_DESC); - Set _iter0 = structSet; - oprot.writeSetBegin(new TSet(TType.STRUCT, _iter0.size())); - for (test.fixtures.complex_struct.MyStruct _iter1 : _iter0) { - _iter1.write0(oprot); - } - oprot.writeSetEnd(); - oprot.writeFieldEnd(); - } - if (unionSet != null) { - oprot.writeFieldBegin(UNION_SET_FIELD_DESC); - Set _iter0 = unionSet; - oprot.writeSetBegin(new TSet(TType.STRUCT, _iter0.size())); - for (test.fixtures.complex_struct.MyUnion _iter1 : _iter0) { - _iter1.write0(oprot); - } - oprot.writeSetEnd(); - oprot.writeFieldEnd(); - } - if (enumSet != null) { - oprot.writeFieldBegin(ENUM_SET_FIELD_DESC); - Set _iter0 = enumSet; - oprot.writeSetBegin(new TSet(TType.I32, _iter0.size())); - for (test.fixtures.complex_struct.MyEnum _iter1 : _iter0) { - oprot.writeI32(_iter1 == null ? 0 : com.facebook.thrift.util.EnumUtil.getValue(_iter1)); - } - oprot.writeSetEnd(); - oprot.writeFieldEnd(); - } - if (structMap != null) { - oprot.writeFieldBegin(STRUCT_MAP_FIELD_DESC); - Map _iter0 = structMap; - oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I64, _iter0.size())); - for (Map.Entry _iter1 : _iter0.entrySet()) { - _iter1.getKey().write0(oprot); - oprot.writeI64(_iter1.getValue()); - } - oprot.writeMapEnd(); - oprot.writeFieldEnd(); - } - if (unionMap != null) { - oprot.writeFieldBegin(UNION_MAP_FIELD_DESC); - Map _iter0 = unionMap; - oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I64, _iter0.size())); - for (Map.Entry _iter1 : _iter0.entrySet()) { - _iter1.getKey().write0(oprot); - oprot.writeI64(_iter1.getValue()); - } - oprot.writeMapEnd(); - oprot.writeFieldEnd(); - } - if (enumMap != null) { - oprot.writeFieldBegin(ENUM_MAP_FIELD_DESC); - Map _iter0 = enumMap; - oprot.writeMapBegin(new TMap(TType.I32, TType.I64, _iter0.size())); + case _LIST_LIST_STRUCT: + if (__field.type == TType.LIST) { + List> listListStruct; + { + TList _list = oprot.readListBegin(); + listListStruct = new ArrayList>(Math.max(0, _list.size)); + for (int _i = 0; (_list.size < 0) ? oprot.peekList() : (_i < _list.size); _i++) { + + List _value1; + { + TList _list1 = oprot.readListBegin(); + _value1 = new ArrayList(Math.max(0, _list1.size)); + for (int _i1 = 0; (_list1.size < 0) ? oprot.peekList() : (_i1 < _list1.size); _i1++) { + + + test.fixtures.complex_struct.MyStruct _value2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + _value1.add(_value2); + + } + oprot.readListEnd(); + } + listListStruct.add(_value1); + } + oprot.readListEnd(); + } + builder.setListListStruct(listListStruct); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _LIST_SET_I32: + if (__field.type == TType.LIST) { + List> listSetI32; + { + TList _list = oprot.readListBegin(); + listSetI32 = new ArrayList>(Math.max(0, _list.size)); + for (int _i = 0; (_list.size < 0) ? oprot.peekList() : (_i < _list.size); _i++) { + + Set _value1; + { + TSet _set1 = oprot.readSetBegin(); + _value1 = new HashSet(Math.max(0, _set1.size)); + for (int _i1 = 0; (_set1.size < 0) ? oprot.peekSet() : (_i1 < _set1.size); _i1++) { + + + int _value2 = oprot.readI32(); + + + _value1.add(_value2); + + } + oprot.readSetEnd(); + } + listSetI32.add(_value1); + } + oprot.readListEnd(); + } + builder.setListSetI32(listSetI32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _LIST_SET_STRUCT: + if (__field.type == TType.LIST) { + List> listSetStruct; + { + TList _list = oprot.readListBegin(); + listSetStruct = new ArrayList>(Math.max(0, _list.size)); + for (int _i = 0; (_list.size < 0) ? oprot.peekList() : (_i < _list.size); _i++) { + + Set _value1; + { + TSet _set1 = oprot.readSetBegin(); + _value1 = new HashSet(Math.max(0, _set1.size)); + for (int _i1 = 0; (_set1.size < 0) ? oprot.peekSet() : (_i1 < _set1.size); _i1++) { + + + test.fixtures.complex_struct.MyStruct _value2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + _value1.add(_value2); + + } + oprot.readSetEnd(); + } + listSetStruct.add(_value1); + } + oprot.readListEnd(); + } + builder.setListSetStruct(listSetStruct); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _LIST_MAP_I32_I32: + if (__field.type == TType.LIST) { + List> listMapI32I32; + { + TList _list = oprot.readListBegin(); + listMapI32I32 = new ArrayList>(Math.max(0, _list.size)); + for (int _i = 0; (_list.size < 0) ? oprot.peekList() : (_i < _list.size); _i++) { + + Map _value1; + { + TMap _map1 = oprot.readMapBegin(); + _value1 = new HashMap(Math.max(0, _map1.size)); + for (int _i1 = 0; (_map1.size < 0) ? oprot.peekMap() : (_i1 < _map1.size); _i1++) { + + + int _key2 = oprot.readI32(); + + + + int _value2 = oprot.readI32(); + + + _value1.put(_key2, _value2); + + } + } + oprot.readMapEnd(); + listMapI32I32.add(_value1); + } + oprot.readListEnd(); + } + builder.setListMapI32I32(listMapI32I32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _LIST_MAP_I32_STRUCT: + if (__field.type == TType.LIST) { + List> listMapI32Struct; + { + TList _list = oprot.readListBegin(); + listMapI32Struct = new ArrayList>(Math.max(0, _list.size)); + for (int _i = 0; (_list.size < 0) ? oprot.peekList() : (_i < _list.size); _i++) { + + Map _value1; + { + TMap _map1 = oprot.readMapBegin(); + _value1 = new HashMap(Math.max(0, _map1.size)); + for (int _i1 = 0; (_map1.size < 0) ? oprot.peekMap() : (_i1 < _map1.size); _i1++) { + + + int _key2 = oprot.readI32(); + + + + test.fixtures.complex_struct.MyStruct _value2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + _value1.put(_key2, _value2); + + } + } + oprot.readMapEnd(); + listMapI32Struct.add(_value1); + } + oprot.readListEnd(); + } + builder.setListMapI32Struct(listMapI32Struct); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _LIST_MAP_STRUCT_I32: + if (__field.type == TType.LIST) { + List> listMapStructI32; + { + TList _list = oprot.readListBegin(); + listMapStructI32 = new ArrayList>(Math.max(0, _list.size)); + for (int _i = 0; (_list.size < 0) ? oprot.peekList() : (_i < _list.size); _i++) { + + Map _value1; + { + TMap _map1 = oprot.readMapBegin(); + _value1 = new HashMap(Math.max(0, _map1.size)); + for (int _i1 = 0; (_map1.size < 0) ? oprot.peekMap() : (_i1 < _map1.size); _i1++) { + + + test.fixtures.complex_struct.MyStruct _key2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + + int _value2 = oprot.readI32(); + + + _value1.put(_key2, _value2); + + } + } + oprot.readMapEnd(); + listMapStructI32.add(_value1); + } + oprot.readListEnd(); + } + builder.setListMapStructI32(listMapStructI32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _SET_LIST_I32: + if (__field.type == TType.SET) { + Set> setListI32; + { + TSet _set = oprot.readSetBegin(); + setListI32 = new HashSet>(Math.max(0, _set.size)); + for (int _i = 0; (_set.size < 0) ? oprot.peekSet() : (_i < _set.size); _i++) { + + List _value1; + { + TList _list1 = oprot.readListBegin(); + _value1 = new ArrayList(Math.max(0, _list1.size)); + for (int _i1 = 0; (_list1.size < 0) ? oprot.peekList() : (_i1 < _list1.size); _i1++) { + + + int _value2 = oprot.readI32(); + + + _value1.add(_value2); + + } + oprot.readListEnd(); + } + setListI32.add(_value1); + } + oprot.readSetEnd(); + } + builder.setSetListI32(setListI32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _SET_LIST_STRUCT: + if (__field.type == TType.SET) { + Set> setListStruct; + { + TSet _set = oprot.readSetBegin(); + setListStruct = new HashSet>(Math.max(0, _set.size)); + for (int _i = 0; (_set.size < 0) ? oprot.peekSet() : (_i < _set.size); _i++) { + + List _value1; + { + TList _list1 = oprot.readListBegin(); + _value1 = new ArrayList(Math.max(0, _list1.size)); + for (int _i1 = 0; (_list1.size < 0) ? oprot.peekList() : (_i1 < _list1.size); _i1++) { + + + test.fixtures.complex_struct.MyStruct _value2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + _value1.add(_value2); + + } + oprot.readListEnd(); + } + setListStruct.add(_value1); + } + oprot.readSetEnd(); + } + builder.setSetListStruct(setListStruct); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _SET_SET_I32: + if (__field.type == TType.SET) { + Set> setSetI32; + { + TSet _set = oprot.readSetBegin(); + setSetI32 = new HashSet>(Math.max(0, _set.size)); + for (int _i = 0; (_set.size < 0) ? oprot.peekSet() : (_i < _set.size); _i++) { + + Set _value1; + { + TSet _set1 = oprot.readSetBegin(); + _value1 = new HashSet(Math.max(0, _set1.size)); + for (int _i1 = 0; (_set1.size < 0) ? oprot.peekSet() : (_i1 < _set1.size); _i1++) { + + + int _value2 = oprot.readI32(); + + + _value1.add(_value2); + + } + oprot.readSetEnd(); + } + setSetI32.add(_value1); + } + oprot.readSetEnd(); + } + builder.setSetSetI32(setSetI32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _SET_SET_STRUCT: + if (__field.type == TType.SET) { + Set> setSetStruct; + { + TSet _set = oprot.readSetBegin(); + setSetStruct = new HashSet>(Math.max(0, _set.size)); + for (int _i = 0; (_set.size < 0) ? oprot.peekSet() : (_i < _set.size); _i++) { + + Set _value1; + { + TSet _set1 = oprot.readSetBegin(); + _value1 = new HashSet(Math.max(0, _set1.size)); + for (int _i1 = 0; (_set1.size < 0) ? oprot.peekSet() : (_i1 < _set1.size); _i1++) { + + + test.fixtures.complex_struct.MyStruct _value2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + _value1.add(_value2); + + } + oprot.readSetEnd(); + } + setSetStruct.add(_value1); + } + oprot.readSetEnd(); + } + builder.setSetSetStruct(setSetStruct); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _SET_MAP_I32_I32: + if (__field.type == TType.SET) { + Set> setMapI32I32; + { + TSet _set = oprot.readSetBegin(); + setMapI32I32 = new HashSet>(Math.max(0, _set.size)); + for (int _i = 0; (_set.size < 0) ? oprot.peekSet() : (_i < _set.size); _i++) { + + Map _value1; + { + TMap _map1 = oprot.readMapBegin(); + _value1 = new HashMap(Math.max(0, _map1.size)); + for (int _i1 = 0; (_map1.size < 0) ? oprot.peekMap() : (_i1 < _map1.size); _i1++) { + + + int _key2 = oprot.readI32(); + + + + int _value2 = oprot.readI32(); + + + _value1.put(_key2, _value2); + + } + } + oprot.readMapEnd(); + setMapI32I32.add(_value1); + } + oprot.readSetEnd(); + } + builder.setSetMapI32I32(setMapI32I32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _SET_MAP_I32_STRUCT: + if (__field.type == TType.SET) { + Set> setMapI32Struct; + { + TSet _set = oprot.readSetBegin(); + setMapI32Struct = new HashSet>(Math.max(0, _set.size)); + for (int _i = 0; (_set.size < 0) ? oprot.peekSet() : (_i < _set.size); _i++) { + + Map _value1; + { + TMap _map1 = oprot.readMapBegin(); + _value1 = new HashMap(Math.max(0, _map1.size)); + for (int _i1 = 0; (_map1.size < 0) ? oprot.peekMap() : (_i1 < _map1.size); _i1++) { + + + int _key2 = oprot.readI32(); + + + + test.fixtures.complex_struct.MyStruct _value2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + _value1.put(_key2, _value2); + + } + } + oprot.readMapEnd(); + setMapI32Struct.add(_value1); + } + oprot.readSetEnd(); + } + builder.setSetMapI32Struct(setMapI32Struct); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _SET_MAP_STRUCT_I32: + if (__field.type == TType.SET) { + Set> setMapStructI32; + { + TSet _set = oprot.readSetBegin(); + setMapStructI32 = new HashSet>(Math.max(0, _set.size)); + for (int _i = 0; (_set.size < 0) ? oprot.peekSet() : (_i < _set.size); _i++) { + + Map _value1; + { + TMap _map1 = oprot.readMapBegin(); + _value1 = new HashMap(Math.max(0, _map1.size)); + for (int _i1 = 0; (_map1.size < 0) ? oprot.peekMap() : (_i1 < _map1.size); _i1++) { + + + test.fixtures.complex_struct.MyStruct _key2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + + int _value2 = oprot.readI32(); + + + _value1.put(_key2, _value2); + + } + } + oprot.readMapEnd(); + setMapStructI32.add(_value1); + } + oprot.readSetEnd(); + } + builder.setSetMapStructI32(setMapStructI32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _MAP_I32_MAP_I32_I32: + if (__field.type == TType.MAP) { + Map> mapI32MapI32I32; + { + TMap _map = oprot.readMapBegin(); + mapI32MapI32I32 = new HashMap>(Math.max(0, _map.size)); + for (int _i = 0; (_map.size < 0) ? oprot.peekMap() : (_i < _map.size); _i++) { + + int _key1 = oprot.readI32(); + Map _value1; + { + TMap _map1 = oprot.readMapBegin(); + _value1 = new HashMap(Math.max(0, _map1.size)); + for (int _i1 = 0; (_map1.size < 0) ? oprot.peekMap() : (_i1 < _map1.size); _i1++) { + + + int _key2 = oprot.readI32(); + + + + int _value2 = oprot.readI32(); + + + _value1.put(_key2, _value2); + + } + } + oprot.readMapEnd(); + mapI32MapI32I32.put(_key1, _value1); + } + } + oprot.readMapEnd(); + builder.setMapI32MapI32I32(mapI32MapI32I32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _MAP_I32_MAP_STRUCT_I32: + if (__field.type == TType.MAP) { + Map> mapI32MapStructI32; + { + TMap _map = oprot.readMapBegin(); + mapI32MapStructI32 = new HashMap>(Math.max(0, _map.size)); + for (int _i = 0; (_map.size < 0) ? oprot.peekMap() : (_i < _map.size); _i++) { + + int _key1 = oprot.readI32(); + Map _value1; + { + TMap _map1 = oprot.readMapBegin(); + _value1 = new HashMap(Math.max(0, _map1.size)); + for (int _i1 = 0; (_map1.size < 0) ? oprot.peekMap() : (_i1 < _map1.size); _i1++) { + + + test.fixtures.complex_struct.MyStruct _key2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + + int _value2 = oprot.readI32(); + + + _value1.put(_key2, _value2); + + } + } + oprot.readMapEnd(); + mapI32MapStructI32.put(_key1, _value1); + } + } + oprot.readMapEnd(); + builder.setMapI32MapStructI32(mapI32MapStructI32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _MAP_I32_MAP_I32_STRUCT: + if (__field.type == TType.MAP) { + Map> mapI32MapI32Struct; + { + TMap _map = oprot.readMapBegin(); + mapI32MapI32Struct = new HashMap>(Math.max(0, _map.size)); + for (int _i = 0; (_map.size < 0) ? oprot.peekMap() : (_i < _map.size); _i++) { + + int _key1 = oprot.readI32(); + Map _value1; + { + TMap _map1 = oprot.readMapBegin(); + _value1 = new HashMap(Math.max(0, _map1.size)); + for (int _i1 = 0; (_map1.size < 0) ? oprot.peekMap() : (_i1 < _map1.size); _i1++) { + + + int _key2 = oprot.readI32(); + + + + test.fixtures.complex_struct.MyStruct _value2 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + _value1.put(_key2, _value2); + + } + } + oprot.readMapEnd(); + mapI32MapI32Struct.put(_key1, _value1); + } + } + oprot.readMapEnd(); + builder.setMapI32MapI32Struct(mapI32MapI32Struct); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _MAP_I32_MAP_LIST_I32_I32: + if (__field.type == TType.MAP) { + Map>> mapI32MapListI32I32; + { + TMap _map = oprot.readMapBegin(); + mapI32MapListI32I32 = new HashMap>>(Math.max(0, _map.size)); + for (int _i = 0; (_map.size < 0) ? oprot.peekMap() : (_i < _map.size); _i++) { + + int _key1 = oprot.readI32(); + List> _value1; + { + TList _list1 = oprot.readListBegin(); + _value1 = new ArrayList>(Math.max(0, _list1.size)); + for (int _i1 = 0; (_list1.size < 0) ? oprot.peekList() : (_i1 < _list1.size); _i1++) { + + Map _value2; + { + TMap _map2 = oprot.readMapBegin(); + _value2 = new HashMap(Math.max(0, _map2.size)); + for (int _i2 = 0; (_map2.size < 0) ? oprot.peekMap() : (_i2 < _map2.size); _i2++) { + + + int _key3 = oprot.readI32(); + + + + int _value3 = oprot.readI32(); + + + _value2.put(_key3, _value3); + + } + } + oprot.readMapEnd(); + + + _value1.add(_value2); + + } + oprot.readListEnd(); + } + mapI32MapListI32I32.put(_key1, _value1); + } + } + oprot.readMapEnd(); + builder.setMapI32MapListI32I32(mapI32MapListI32I32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + case _MAP_I32_MAP_LIST_STRUCT_I32: + if (__field.type == TType.MAP) { + Map>> mapI32MapListStructI32; + { + TMap _map = oprot.readMapBegin(); + mapI32MapListStructI32 = new HashMap>>(Math.max(0, _map.size)); + for (int _i = 0; (_map.size < 0) ? oprot.peekMap() : (_i < _map.size); _i++) { + + int _key1 = oprot.readI32(); + List> _value1; + { + TList _list1 = oprot.readListBegin(); + _value1 = new ArrayList>(Math.max(0, _list1.size)); + for (int _i1 = 0; (_list1.size < 0) ? oprot.peekList() : (_i1 < _list1.size); _i1++) { + + Map _value2; + { + TMap _map2 = oprot.readMapBegin(); + _value2 = new HashMap(Math.max(0, _map2.size)); + for (int _i2 = 0; (_map2.size < 0) ? oprot.peekMap() : (_i2 < _map2.size); _i2++) { + + + test.fixtures.complex_struct.MyStruct _key3 = test.fixtures.complex_struct.MyStruct.read0(oprot); + + + + int _value3 = oprot.readI32(); + + + _value2.put(_key3, _value3); + + } + } + oprot.readMapEnd(); + + + _value1.add(_value2); + + } + oprot.readListEnd(); + } + mapI32MapListStructI32.put(_key1, _value1); + } + } + oprot.readMapEnd(); + builder.setMapI32MapListStructI32(mapI32MapListStructI32); + } else { + TProtocolUtil.skip(oprot, __field.type); + } + break; + default: + TProtocolUtil.skip(oprot, __field.type); + break; + } + oprot.readFieldEnd(); + } + oprot.readStructEnd(); + return builder.build(); + } + + public void write0(TProtocol oprot) throws TException { + oprot.writeStructBegin(STRUCT_DESC); + if (structList != null) { + oprot.writeFieldBegin(STRUCT_LIST_FIELD_DESC); + List _iter0 = structList; + oprot.writeListBegin(new TList(TType.STRUCT, _iter0.size())); + for (test.fixtures.complex_struct.MyStruct _iter1 : _iter0) { + _iter1.write0(oprot); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (unionList != null) { + oprot.writeFieldBegin(UNION_LIST_FIELD_DESC); + List _iter0 = unionList; + oprot.writeListBegin(new TList(TType.STRUCT, _iter0.size())); + for (test.fixtures.complex_struct.MyUnion _iter1 : _iter0) { + _iter1.write0(oprot); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (enumList != null) { + oprot.writeFieldBegin(ENUM_LIST_FIELD_DESC); + List _iter0 = enumList; + oprot.writeListBegin(new TList(TType.I32, _iter0.size())); + for (test.fixtures.complex_struct.MyEnum _iter1 : _iter0) { + oprot.writeI32(_iter1 == null ? 0 : com.facebook.thrift.util.EnumUtil.getValue(_iter1)); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (structSet != null) { + oprot.writeFieldBegin(STRUCT_SET_FIELD_DESC); + Set _iter0 = structSet; + oprot.writeSetBegin(new TSet(TType.STRUCT, _iter0.size())); + for (test.fixtures.complex_struct.MyStruct _iter1 : _iter0) { + _iter1.write0(oprot); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (unionSet != null) { + oprot.writeFieldBegin(UNION_SET_FIELD_DESC); + Set _iter0 = unionSet; + oprot.writeSetBegin(new TSet(TType.STRUCT, _iter0.size())); + for (test.fixtures.complex_struct.MyUnion _iter1 : _iter0) { + _iter1.write0(oprot); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (enumSet != null) { + oprot.writeFieldBegin(ENUM_SET_FIELD_DESC); + Set _iter0 = enumSet; + oprot.writeSetBegin(new TSet(TType.I32, _iter0.size())); + for (test.fixtures.complex_struct.MyEnum _iter1 : _iter0) { + oprot.writeI32(_iter1 == null ? 0 : com.facebook.thrift.util.EnumUtil.getValue(_iter1)); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (structMap != null) { + oprot.writeFieldBegin(STRUCT_MAP_FIELD_DESC); + Map _iter0 = structMap; + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I64, _iter0.size())); + for (Map.Entry _iter1 : _iter0.entrySet()) { + _iter1.getKey().write0(oprot); + oprot.writeI64(_iter1.getValue()); + } + oprot.writeMapEnd(); + oprot.writeFieldEnd(); + } + if (unionMap != null) { + oprot.writeFieldBegin(UNION_MAP_FIELD_DESC); + Map _iter0 = unionMap; + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I64, _iter0.size())); + for (Map.Entry _iter1 : _iter0.entrySet()) { + _iter1.getKey().write0(oprot); + oprot.writeI64(_iter1.getValue()); + } + oprot.writeMapEnd(); + oprot.writeFieldEnd(); + } + if (enumMap != null) { + oprot.writeFieldBegin(ENUM_MAP_FIELD_DESC); + Map _iter0 = enumMap; + oprot.writeMapBegin(new TMap(TType.I32, TType.I64, _iter0.size())); for (Map.Entry _iter1 : _iter0.entrySet()) { oprot.writeI32(_iter1 == null ? 0 : com.facebook.thrift.util.EnumUtil.getValue(_iter1.getKey())); oprot.writeI64(_iter1.getValue()); @@ -1247,6 +2462,296 @@ public void write0(TProtocol oprot) throws TException { oprot.writeMapEnd(); oprot.writeFieldEnd(); } + if (listListI32 != null) { + oprot.writeFieldBegin(LIST_LIST_I32_FIELD_DESC); + List> _iter0 = listListI32; + oprot.writeListBegin(new TList(TType.LIST, _iter0.size())); + for (List _iter1 : _iter0) { + oprot.writeListBegin(new TList(TType.I32, _iter1.size())); + for (int _iter2 : _iter1) { + oprot.writeI32(_iter2); + } + oprot.writeListEnd(); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (listListStruct != null) { + oprot.writeFieldBegin(LIST_LIST_STRUCT_FIELD_DESC); + List> _iter0 = listListStruct; + oprot.writeListBegin(new TList(TType.LIST, _iter0.size())); + for (List _iter1 : _iter0) { + oprot.writeListBegin(new TList(TType.STRUCT, _iter1.size())); + for (test.fixtures.complex_struct.MyStruct _iter2 : _iter1) { + _iter2.write0(oprot); + } + oprot.writeListEnd(); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (listSetI32 != null) { + oprot.writeFieldBegin(LIST_SET_I32_FIELD_DESC); + List> _iter0 = listSetI32; + oprot.writeListBegin(new TList(TType.SET, _iter0.size())); + for (Set _iter1 : _iter0) { + oprot.writeSetBegin(new TSet(TType.I32, _iter1.size())); + for (int _iter2 : _iter1) { + oprot.writeI32(_iter2); + } + oprot.writeSetEnd(); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (listSetStruct != null) { + oprot.writeFieldBegin(LIST_SET_STRUCT_FIELD_DESC); + List> _iter0 = listSetStruct; + oprot.writeListBegin(new TList(TType.SET, _iter0.size())); + for (Set _iter1 : _iter0) { + oprot.writeSetBegin(new TSet(TType.STRUCT, _iter1.size())); + for (test.fixtures.complex_struct.MyStruct _iter2 : _iter1) { + _iter2.write0(oprot); + } + oprot.writeSetEnd(); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (listMapI32I32 != null) { + oprot.writeFieldBegin(LIST_MAP_I32_I32_FIELD_DESC); + List> _iter0 = listMapI32I32; + oprot.writeListBegin(new TList(TType.MAP, _iter0.size())); + for (Map _iter1 : _iter0) { + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter1.size())); + for (Map.Entry _iter2 : _iter1.entrySet()) { + oprot.writeI32(_iter2.getKey()); + oprot.writeI32(_iter2.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (listMapI32Struct != null) { + oprot.writeFieldBegin(LIST_MAP_I32_STRUCT_FIELD_DESC); + List> _iter0 = listMapI32Struct; + oprot.writeListBegin(new TList(TType.MAP, _iter0.size())); + for (Map _iter1 : _iter0) { + oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, _iter1.size())); + for (Map.Entry _iter2 : _iter1.entrySet()) { + oprot.writeI32(_iter2.getKey()); + _iter2.getValue().write0(oprot); + } + oprot.writeMapEnd(); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (listMapStructI32 != null) { + oprot.writeFieldBegin(LIST_MAP_STRUCT_I32_FIELD_DESC); + List> _iter0 = listMapStructI32; + oprot.writeListBegin(new TList(TType.MAP, _iter0.size())); + for (Map _iter1 : _iter0) { + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I32, _iter1.size())); + for (Map.Entry _iter2 : _iter1.entrySet()) { + _iter2.getKey().write0(oprot); + oprot.writeI32(_iter2.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeListEnd(); + oprot.writeFieldEnd(); + } + if (setListI32 != null) { + oprot.writeFieldBegin(SET_LIST_I32_FIELD_DESC); + Set> _iter0 = setListI32; + oprot.writeSetBegin(new TSet(TType.LIST, _iter0.size())); + for (List _iter1 : _iter0) { + oprot.writeListBegin(new TList(TType.I32, _iter1.size())); + for (int _iter2 : _iter1) { + oprot.writeI32(_iter2); + } + oprot.writeListEnd(); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (setListStruct != null) { + oprot.writeFieldBegin(SET_LIST_STRUCT_FIELD_DESC); + Set> _iter0 = setListStruct; + oprot.writeSetBegin(new TSet(TType.LIST, _iter0.size())); + for (List _iter1 : _iter0) { + oprot.writeListBegin(new TList(TType.STRUCT, _iter1.size())); + for (test.fixtures.complex_struct.MyStruct _iter2 : _iter1) { + _iter2.write0(oprot); + } + oprot.writeListEnd(); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (setSetI32 != null) { + oprot.writeFieldBegin(SET_SET_I32_FIELD_DESC); + Set> _iter0 = setSetI32; + oprot.writeSetBegin(new TSet(TType.SET, _iter0.size())); + for (Set _iter1 : _iter0) { + oprot.writeSetBegin(new TSet(TType.I32, _iter1.size())); + for (int _iter2 : _iter1) { + oprot.writeI32(_iter2); + } + oprot.writeSetEnd(); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (setSetStruct != null) { + oprot.writeFieldBegin(SET_SET_STRUCT_FIELD_DESC); + Set> _iter0 = setSetStruct; + oprot.writeSetBegin(new TSet(TType.SET, _iter0.size())); + for (Set _iter1 : _iter0) { + oprot.writeSetBegin(new TSet(TType.STRUCT, _iter1.size())); + for (test.fixtures.complex_struct.MyStruct _iter2 : _iter1) { + _iter2.write0(oprot); + } + oprot.writeSetEnd(); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (setMapI32I32 != null) { + oprot.writeFieldBegin(SET_MAP_I32_I32_FIELD_DESC); + Set> _iter0 = setMapI32I32; + oprot.writeSetBegin(new TSet(TType.MAP, _iter0.size())); + for (Map _iter1 : _iter0) { + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter1.size())); + for (Map.Entry _iter2 : _iter1.entrySet()) { + oprot.writeI32(_iter2.getKey()); + oprot.writeI32(_iter2.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (setMapI32Struct != null) { + oprot.writeFieldBegin(SET_MAP_I32_STRUCT_FIELD_DESC); + Set> _iter0 = setMapI32Struct; + oprot.writeSetBegin(new TSet(TType.MAP, _iter0.size())); + for (Map _iter1 : _iter0) { + oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, _iter1.size())); + for (Map.Entry _iter2 : _iter1.entrySet()) { + oprot.writeI32(_iter2.getKey()); + _iter2.getValue().write0(oprot); + } + oprot.writeMapEnd(); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (setMapStructI32 != null) { + oprot.writeFieldBegin(SET_MAP_STRUCT_I32_FIELD_DESC); + Set> _iter0 = setMapStructI32; + oprot.writeSetBegin(new TSet(TType.MAP, _iter0.size())); + for (Map _iter1 : _iter0) { + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I32, _iter1.size())); + for (Map.Entry _iter2 : _iter1.entrySet()) { + _iter2.getKey().write0(oprot); + oprot.writeI32(_iter2.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeSetEnd(); + oprot.writeFieldEnd(); + } + if (mapI32MapI32I32 != null) { + oprot.writeFieldBegin(MAP_I32_MAP_I32_I32_FIELD_DESC); + Map> _iter0 = mapI32MapI32I32; + oprot.writeMapBegin(new TMap(TType.I32, TType.MAP, _iter0.size())); + for (Map.Entry> _iter1 : _iter0.entrySet()) { + oprot.writeI32(_iter1.getKey()); + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter1.getValue().size())); + for (Map.Entry _iter2 : _iter1.getValue().entrySet()) { + oprot.writeI32(_iter2.getKey()); + oprot.writeI32(_iter2.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeMapEnd(); + oprot.writeFieldEnd(); + } + if (mapI32MapStructI32 != null) { + oprot.writeFieldBegin(MAP_I32_MAP_STRUCT_I32_FIELD_DESC); + Map> _iter0 = mapI32MapStructI32; + oprot.writeMapBegin(new TMap(TType.I32, TType.MAP, _iter0.size())); + for (Map.Entry> _iter1 : _iter0.entrySet()) { + oprot.writeI32(_iter1.getKey()); + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I32, _iter1.getValue().size())); + for (Map.Entry _iter2 : _iter1.getValue().entrySet()) { + _iter2.getKey().write0(oprot); + oprot.writeI32(_iter2.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeMapEnd(); + oprot.writeFieldEnd(); + } + if (mapI32MapI32Struct != null) { + oprot.writeFieldBegin(MAP_I32_MAP_I32_STRUCT_FIELD_DESC); + Map> _iter0 = mapI32MapI32Struct; + oprot.writeMapBegin(new TMap(TType.I32, TType.MAP, _iter0.size())); + for (Map.Entry> _iter1 : _iter0.entrySet()) { + oprot.writeI32(_iter1.getKey()); + oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, _iter1.getValue().size())); + for (Map.Entry _iter2 : _iter1.getValue().entrySet()) { + oprot.writeI32(_iter2.getKey()); + _iter2.getValue().write0(oprot); + } + oprot.writeMapEnd(); + } + oprot.writeMapEnd(); + oprot.writeFieldEnd(); + } + if (mapI32MapListI32I32 != null) { + oprot.writeFieldBegin(MAP_I32_MAP_LIST_I32_I32_FIELD_DESC); + Map>> _iter0 = mapI32MapListI32I32; + oprot.writeMapBegin(new TMap(TType.I32, TType.LIST, _iter0.size())); + for (Map.Entry>> _iter1 : _iter0.entrySet()) { + oprot.writeI32(_iter1.getKey()); + oprot.writeListBegin(new TList(TType.MAP, _iter1.getValue().size())); + for (Map _iter2 : _iter1.getValue()) { + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter2.size())); + for (Map.Entry _iter3 : _iter2.entrySet()) { + oprot.writeI32(_iter3.getKey()); + oprot.writeI32(_iter3.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeListEnd(); + } + oprot.writeMapEnd(); + oprot.writeFieldEnd(); + } + if (mapI32MapListStructI32 != null) { + oprot.writeFieldBegin(MAP_I32_MAP_LIST_STRUCT_I32_FIELD_DESC); + Map>> _iter0 = mapI32MapListStructI32; + oprot.writeMapBegin(new TMap(TType.I32, TType.LIST, _iter0.size())); + for (Map.Entry>> _iter1 : _iter0.entrySet()) { + oprot.writeI32(_iter1.getKey()); + oprot.writeListBegin(new TList(TType.MAP, _iter1.getValue().size())); + for (Map _iter2 : _iter1.getValue()) { + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I32, _iter2.size())); + for (Map.Entry _iter3 : _iter2.entrySet()) { + _iter3.getKey().write0(oprot); + oprot.writeI32(_iter3.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeListEnd(); + } + oprot.writeMapEnd(); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } diff --git a/thrift/compiler/test/fixtures/complex-struct/out/java_deprecated/gen-javadeprecated/Containers.java b/thrift/compiler/test/fixtures/complex-struct/out/java_deprecated/gen-javadeprecated/Containers.java index 9abc2c35594..04ec1c2f283 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/java_deprecated/gen-javadeprecated/Containers.java +++ b/thrift/compiler/test/fixtures/complex-struct/out/java_deprecated/gen-javadeprecated/Containers.java @@ -42,6 +42,25 @@ public class Containers implements TBase, java.io.Serializable, Cloneable { private static final TField SET_MAP_2_FIELD_DESC = new TField("set_map_2", TType.MAP, (short)16); private static final TField MAP_MAP_FIELD_DESC = new TField("map_map", TType.MAP, (short)17); private static final TField MAP_MAP_2_FIELD_DESC = new TField("map_map_2", TType.MAP, (short)18); + private static final TField LIST_LIST_I32_FIELD_DESC = new TField("list_list_i32", TType.LIST, (short)19); + private static final TField LIST_LIST_STRUCT_FIELD_DESC = new TField("list_list_struct", TType.LIST, (short)20); + private static final TField LIST_SET_I32_FIELD_DESC = new TField("list_set_i32", TType.LIST, (short)21); + private static final TField LIST_SET_STRUCT_FIELD_DESC = new TField("list_set_struct", TType.LIST, (short)22); + private static final TField LIST_MAP_I32_I32_FIELD_DESC = new TField("list_map_i32_i32", TType.LIST, (short)23); + private static final TField LIST_MAP_I32_STRUCT_FIELD_DESC = new TField("list_map_i32_struct", TType.LIST, (short)24); + private static final TField LIST_MAP_STRUCT_I32_FIELD_DESC = new TField("list_map_struct_i32", TType.LIST, (short)25); + private static final TField SET_LIST_I32_FIELD_DESC = new TField("set_list_i32", TType.SET, (short)26); + private static final TField SET_LIST_STRUCT_FIELD_DESC = new TField("set_list_struct", TType.SET, (short)27); + private static final TField SET_SET_I32_FIELD_DESC = new TField("set_set_i32", TType.SET, (short)28); + private static final TField SET_SET_STRUCT_FIELD_DESC = new TField("set_set_struct", TType.SET, (short)29); + private static final TField SET_MAP_I32_I32_FIELD_DESC = new TField("set_map_i32_i32", TType.SET, (short)30); + private static final TField SET_MAP_I32_STRUCT_FIELD_DESC = new TField("set_map_i32_struct", TType.SET, (short)31); + private static final TField SET_MAP_STRUCT_I32_FIELD_DESC = new TField("set_map_struct_i32", TType.SET, (short)32); + private static final TField MAP_I32_MAP_I32_I32_FIELD_DESC = new TField("map_i32_map_i32_i32", TType.MAP, (short)33); + private static final TField MAP_I32_MAP_STRUCT_I32_FIELD_DESC = new TField("map_i32_map_struct_i32", TType.MAP, (short)34); + private static final TField MAP_I32_MAP_I32_STRUCT_FIELD_DESC = new TField("map_i32_map_i32_struct", TType.MAP, (short)35); + private static final TField MAP_I32_MAP_LIST_I32_I32_FIELD_DESC = new TField("map_i32_map_list_i32_i32", TType.MAP, (short)36); + private static final TField MAP_I32_MAP_LIST_STRUCT_I32_FIELD_DESC = new TField("map_i32_map_list_struct_i32", TType.MAP, (short)37); public List struct_list; public List union_list; @@ -61,6 +80,25 @@ public class Containers implements TBase, java.io.Serializable, Cloneable { public Map> set_map_2; public Map,Integer> map_map; public Map> map_map_2; + public List> list_list_i32; + public List> list_list_struct; + public List> list_set_i32; + public List> list_set_struct; + public List> list_map_i32_i32; + public List> list_map_i32_struct; + public List> list_map_struct_i32; + public Set> set_list_i32; + public Set> set_list_struct; + public Set> set_set_i32; + public Set> set_set_struct; + public Set> set_map_i32_i32; + public Set> set_map_i32_struct; + public Set> set_map_struct_i32; + public Map> map_i32_map_i32_i32; + public Map> map_i32_map_struct_i32; + public Map> map_i32_map_i32_struct; + public Map>> map_i32_map_list_i32_i32; + public Map>> map_i32_map_list_struct_i32; public static final int STRUCT_LIST = 1; public static final int UNION_LIST = 2; public static final int ENUM_LIST = 3; @@ -79,6 +117,25 @@ public class Containers implements TBase, java.io.Serializable, Cloneable { public static final int SET_MAP_2 = 16; public static final int MAP_MAP = 17; public static final int MAP_MAP_2 = 18; + public static final int LIST_LIST_I32 = 19; + public static final int LIST_LIST_STRUCT = 20; + public static final int LIST_SET_I32 = 21; + public static final int LIST_SET_STRUCT = 22; + public static final int LIST_MAP_I32_I32 = 23; + public static final int LIST_MAP_I32_STRUCT = 24; + public static final int LIST_MAP_STRUCT_I32 = 25; + public static final int SET_LIST_I32 = 26; + public static final int SET_LIST_STRUCT = 27; + public static final int SET_SET_I32 = 28; + public static final int SET_SET_STRUCT = 29; + public static final int SET_MAP_I32_I32 = 30; + public static final int SET_MAP_I32_STRUCT = 31; + public static final int SET_MAP_STRUCT_I32 = 32; + public static final int MAP_I32_MAP_I32_I32 = 33; + public static final int MAP_I32_MAP_STRUCT_I32 = 34; + public static final int MAP_I32_MAP_I32_STRUCT = 35; + public static final int MAP_I32_MAP_LIST_I32_I32 = 36; + public static final int MAP_I32_MAP_LIST_STRUCT_I32 = 37; // isset id assignments @@ -160,6 +217,100 @@ public class Containers implements TBase, java.io.Serializable, Cloneable { new MapMetaData(TType.MAP, new FieldValueMetaData(TType.I32), new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(LIST_LIST_I32, new FieldMetaData("list_list_i32", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(LIST_LIST_STRUCT, new FieldMetaData("list_list_struct", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, MyStruct.class))))); + tmpMetaDataMap.put(LIST_SET_I32, new FieldMetaData("list_set_i32", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new SetMetaData(TType.SET, + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(LIST_SET_STRUCT, new FieldMetaData("list_set_struct", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new SetMetaData(TType.SET, + new StructMetaData(TType.STRUCT, MyStruct.class))))); + tmpMetaDataMap.put(LIST_MAP_I32_I32, new FieldMetaData("list_map_i32_i32", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(LIST_MAP_I32_STRUCT, new FieldMetaData("list_map_i32_struct", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new StructMetaData(TType.STRUCT, MyStruct.class))))); + tmpMetaDataMap.put(LIST_MAP_STRUCT_I32, new FieldMetaData("list_map_struct_i32", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new MapMetaData(TType.MAP, + new StructMetaData(TType.STRUCT, MyStruct.class), + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(SET_LIST_I32, new FieldMetaData("set_list_i32", TFieldRequirementType.DEFAULT, + new SetMetaData(TType.SET, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(SET_LIST_STRUCT, new FieldMetaData("set_list_struct", TFieldRequirementType.DEFAULT, + new SetMetaData(TType.SET, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, MyStruct.class))))); + tmpMetaDataMap.put(SET_SET_I32, new FieldMetaData("set_set_i32", TFieldRequirementType.DEFAULT, + new SetMetaData(TType.SET, + new SetMetaData(TType.SET, + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(SET_SET_STRUCT, new FieldMetaData("set_set_struct", TFieldRequirementType.DEFAULT, + new SetMetaData(TType.SET, + new SetMetaData(TType.SET, + new StructMetaData(TType.STRUCT, MyStruct.class))))); + tmpMetaDataMap.put(SET_MAP_I32_I32, new FieldMetaData("set_map_i32_i32", TFieldRequirementType.DEFAULT, + new SetMetaData(TType.SET, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(SET_MAP_I32_STRUCT, new FieldMetaData("set_map_i32_struct", TFieldRequirementType.DEFAULT, + new SetMetaData(TType.SET, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new StructMetaData(TType.STRUCT, MyStruct.class))))); + tmpMetaDataMap.put(SET_MAP_STRUCT_I32, new FieldMetaData("set_map_struct_i32", TFieldRequirementType.DEFAULT, + new SetMetaData(TType.SET, + new MapMetaData(TType.MAP, + new StructMetaData(TType.STRUCT, MyStruct.class), + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(MAP_I32_MAP_I32_I32, new FieldMetaData("map_i32_map_i32_i32", TFieldRequirementType.DEFAULT, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(MAP_I32_MAP_STRUCT_I32, new FieldMetaData("map_i32_map_struct_i32", TFieldRequirementType.DEFAULT, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new MapMetaData(TType.MAP, + new StructMetaData(TType.STRUCT, MyStruct.class), + new FieldValueMetaData(TType.I32))))); + tmpMetaDataMap.put(MAP_I32_MAP_I32_STRUCT, new FieldMetaData("map_i32_map_i32_struct", TFieldRequirementType.DEFAULT, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new StructMetaData(TType.STRUCT, MyStruct.class))))); + tmpMetaDataMap.put(MAP_I32_MAP_LIST_I32_I32, new FieldMetaData("map_i32_map_list_i32_i32", TFieldRequirementType.DEFAULT, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new ListMetaData(TType.LIST, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new FieldValueMetaData(TType.I32)))))); + tmpMetaDataMap.put(MAP_I32_MAP_LIST_STRUCT_I32, new FieldMetaData("map_i32_map_list_struct_i32", TFieldRequirementType.DEFAULT, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.I32), + new ListMetaData(TType.LIST, + new MapMetaData(TType.MAP, + new StructMetaData(TType.STRUCT, MyStruct.class), + new FieldValueMetaData(TType.I32)))))); metaDataMap = Collections.unmodifiableMap(tmpMetaDataMap); } @@ -188,7 +339,26 @@ public Containers( Map,Integer> set_map, Map> set_map_2, Map,Integer> map_map, - Map> map_map_2) { + Map> map_map_2, + List> list_list_i32, + List> list_list_struct, + List> list_set_i32, + List> list_set_struct, + List> list_map_i32_i32, + List> list_map_i32_struct, + List> list_map_struct_i32, + Set> set_list_i32, + Set> set_list_struct, + Set> set_set_i32, + Set> set_set_struct, + Set> set_map_i32_i32, + Set> set_map_i32_struct, + Set> set_map_struct_i32, + Map> map_i32_map_i32_i32, + Map> map_i32_map_struct_i32, + Map> map_i32_map_i32_struct, + Map>> map_i32_map_list_i32_i32, + Map>> map_i32_map_list_struct_i32) { this(); this.struct_list = struct_list; this.union_list = union_list; @@ -208,6 +378,25 @@ public Containers( this.set_map_2 = set_map_2; this.map_map = map_map; this.map_map_2 = map_map_2; + this.list_list_i32 = list_list_i32; + this.list_list_struct = list_list_struct; + this.list_set_i32 = list_set_i32; + this.list_set_struct = list_set_struct; + this.list_map_i32_i32 = list_map_i32_i32; + this.list_map_i32_struct = list_map_i32_struct; + this.list_map_struct_i32 = list_map_struct_i32; + this.set_list_i32 = set_list_i32; + this.set_list_struct = set_list_struct; + this.set_set_i32 = set_set_i32; + this.set_set_struct = set_set_struct; + this.set_map_i32_i32 = set_map_i32_i32; + this.set_map_i32_struct = set_map_i32_struct; + this.set_map_struct_i32 = set_map_struct_i32; + this.map_i32_map_i32_i32 = map_i32_map_i32_i32; + this.map_i32_map_struct_i32 = map_i32_map_struct_i32; + this.map_i32_map_i32_struct = map_i32_map_i32_struct; + this.map_i32_map_list_i32_i32 = map_i32_map_list_i32_i32; + this.map_i32_map_list_struct_i32 = map_i32_map_list_struct_i32; } public static class Builder { @@ -229,6 +418,25 @@ public static class Builder { private Map> set_map_2; private Map,Integer> map_map; private Map> map_map_2; + private List> list_list_i32; + private List> list_list_struct; + private List> list_set_i32; + private List> list_set_struct; + private List> list_map_i32_i32; + private List> list_map_i32_struct; + private List> list_map_struct_i32; + private Set> set_list_i32; + private Set> set_list_struct; + private Set> set_set_i32; + private Set> set_set_struct; + private Set> set_map_i32_i32; + private Set> set_map_i32_struct; + private Set> set_map_struct_i32; + private Map> map_i32_map_i32_i32; + private Map> map_i32_map_struct_i32; + private Map> map_i32_map_i32_struct; + private Map>> map_i32_map_list_i32_i32; + private Map>> map_i32_map_list_struct_i32; public Builder() { } @@ -323,6 +531,101 @@ public Builder setMap_map_2(final Map> map_map_2) { return this; } + public Builder setList_list_i32(final List> list_list_i32) { + this.list_list_i32 = list_list_i32; + return this; + } + + public Builder setList_list_struct(final List> list_list_struct) { + this.list_list_struct = list_list_struct; + return this; + } + + public Builder setList_set_i32(final List> list_set_i32) { + this.list_set_i32 = list_set_i32; + return this; + } + + public Builder setList_set_struct(final List> list_set_struct) { + this.list_set_struct = list_set_struct; + return this; + } + + public Builder setList_map_i32_i32(final List> list_map_i32_i32) { + this.list_map_i32_i32 = list_map_i32_i32; + return this; + } + + public Builder setList_map_i32_struct(final List> list_map_i32_struct) { + this.list_map_i32_struct = list_map_i32_struct; + return this; + } + + public Builder setList_map_struct_i32(final List> list_map_struct_i32) { + this.list_map_struct_i32 = list_map_struct_i32; + return this; + } + + public Builder setSet_list_i32(final Set> set_list_i32) { + this.set_list_i32 = set_list_i32; + return this; + } + + public Builder setSet_list_struct(final Set> set_list_struct) { + this.set_list_struct = set_list_struct; + return this; + } + + public Builder setSet_set_i32(final Set> set_set_i32) { + this.set_set_i32 = set_set_i32; + return this; + } + + public Builder setSet_set_struct(final Set> set_set_struct) { + this.set_set_struct = set_set_struct; + return this; + } + + public Builder setSet_map_i32_i32(final Set> set_map_i32_i32) { + this.set_map_i32_i32 = set_map_i32_i32; + return this; + } + + public Builder setSet_map_i32_struct(final Set> set_map_i32_struct) { + this.set_map_i32_struct = set_map_i32_struct; + return this; + } + + public Builder setSet_map_struct_i32(final Set> set_map_struct_i32) { + this.set_map_struct_i32 = set_map_struct_i32; + return this; + } + + public Builder setMap_i32_map_i32_i32(final Map> map_i32_map_i32_i32) { + this.map_i32_map_i32_i32 = map_i32_map_i32_i32; + return this; + } + + public Builder setMap_i32_map_struct_i32(final Map> map_i32_map_struct_i32) { + this.map_i32_map_struct_i32 = map_i32_map_struct_i32; + return this; + } + + public Builder setMap_i32_map_i32_struct(final Map> map_i32_map_i32_struct) { + this.map_i32_map_i32_struct = map_i32_map_i32_struct; + return this; + } + + public Builder setMap_i32_map_list_i32_i32(final Map>> map_i32_map_list_i32_i32) { + this.map_i32_map_list_i32_i32 = map_i32_map_list_i32_i32; + return this; + } + + public Builder setMap_i32_map_list_struct_i32(final Map>> map_i32_map_list_struct_i32) { + this.map_i32_map_list_struct_i32 = map_i32_map_list_struct_i32; + return this; + } + public Containers build() { Containers result = new Containers(); result.setStruct_list(this.struct_list); @@ -343,6 +646,25 @@ public Containers build() { result.setSet_map_2(this.set_map_2); result.setMap_map(this.map_map); result.setMap_map_2(this.map_map_2); + result.setList_list_i32(this.list_list_i32); + result.setList_list_struct(this.list_list_struct); + result.setList_set_i32(this.list_set_i32); + result.setList_set_struct(this.list_set_struct); + result.setList_map_i32_i32(this.list_map_i32_i32); + result.setList_map_i32_struct(this.list_map_i32_struct); + result.setList_map_struct_i32(this.list_map_struct_i32); + result.setSet_list_i32(this.set_list_i32); + result.setSet_list_struct(this.set_list_struct); + result.setSet_set_i32(this.set_set_i32); + result.setSet_set_struct(this.set_set_struct); + result.setSet_map_i32_i32(this.set_map_i32_i32); + result.setSet_map_i32_struct(this.set_map_i32_struct); + result.setSet_map_struct_i32(this.set_map_struct_i32); + result.setMap_i32_map_i32_i32(this.map_i32_map_i32_i32); + result.setMap_i32_map_struct_i32(this.map_i32_map_struct_i32); + result.setMap_i32_map_i32_struct(this.map_i32_map_i32_struct); + result.setMap_i32_map_list_i32_i32(this.map_i32_map_list_i32_i32); + result.setMap_i32_map_list_struct_i32(this.map_i32_map_list_struct_i32); return result; } } @@ -409,6 +731,63 @@ public Containers(Containers other) { if (other.isSetMap_map_2()) { this.map_map_2 = TBaseHelper.deepCopy(other.map_map_2); } + if (other.isSetList_list_i32()) { + this.list_list_i32 = TBaseHelper.deepCopy(other.list_list_i32); + } + if (other.isSetList_list_struct()) { + this.list_list_struct = TBaseHelper.deepCopy(other.list_list_struct); + } + if (other.isSetList_set_i32()) { + this.list_set_i32 = TBaseHelper.deepCopy(other.list_set_i32); + } + if (other.isSetList_set_struct()) { + this.list_set_struct = TBaseHelper.deepCopy(other.list_set_struct); + } + if (other.isSetList_map_i32_i32()) { + this.list_map_i32_i32 = TBaseHelper.deepCopy(other.list_map_i32_i32); + } + if (other.isSetList_map_i32_struct()) { + this.list_map_i32_struct = TBaseHelper.deepCopy(other.list_map_i32_struct); + } + if (other.isSetList_map_struct_i32()) { + this.list_map_struct_i32 = TBaseHelper.deepCopy(other.list_map_struct_i32); + } + if (other.isSetSet_list_i32()) { + this.set_list_i32 = TBaseHelper.deepCopy(other.set_list_i32); + } + if (other.isSetSet_list_struct()) { + this.set_list_struct = TBaseHelper.deepCopy(other.set_list_struct); + } + if (other.isSetSet_set_i32()) { + this.set_set_i32 = TBaseHelper.deepCopy(other.set_set_i32); + } + if (other.isSetSet_set_struct()) { + this.set_set_struct = TBaseHelper.deepCopy(other.set_set_struct); + } + if (other.isSetSet_map_i32_i32()) { + this.set_map_i32_i32 = TBaseHelper.deepCopy(other.set_map_i32_i32); + } + if (other.isSetSet_map_i32_struct()) { + this.set_map_i32_struct = TBaseHelper.deepCopy(other.set_map_i32_struct); + } + if (other.isSetSet_map_struct_i32()) { + this.set_map_struct_i32 = TBaseHelper.deepCopy(other.set_map_struct_i32); + } + if (other.isSetMap_i32_map_i32_i32()) { + this.map_i32_map_i32_i32 = TBaseHelper.deepCopy(other.map_i32_map_i32_i32); + } + if (other.isSetMap_i32_map_struct_i32()) { + this.map_i32_map_struct_i32 = TBaseHelper.deepCopy(other.map_i32_map_struct_i32); + } + if (other.isSetMap_i32_map_i32_struct()) { + this.map_i32_map_i32_struct = TBaseHelper.deepCopy(other.map_i32_map_i32_struct); + } + if (other.isSetMap_i32_map_list_i32_i32()) { + this.map_i32_map_list_i32_i32 = TBaseHelper.deepCopy(other.map_i32_map_list_i32_i32); + } + if (other.isSetMap_i32_map_list_struct_i32()) { + this.map_i32_map_list_struct_i32 = TBaseHelper.deepCopy(other.map_i32_map_list_struct_i32); + } } public Containers deepCopy() { @@ -847,336 +1226,1556 @@ public void setMap_map_2IsSet(boolean __value) { } } - @SuppressWarnings("unchecked") - public void setFieldValue(int fieldID, Object __value) { - switch (fieldID) { - case STRUCT_LIST: - if (__value == null) { - unsetStruct_list(); - } else { - setStruct_list((List)__value); - } - break; + public List> getList_list_i32() { + return this.list_list_i32; + } - case UNION_LIST: - if (__value == null) { - unsetUnion_list(); - } else { - setUnion_list((List)__value); - } - break; + public Containers setList_list_i32(List> list_list_i32) { + this.list_list_i32 = list_list_i32; + return this; + } - case ENUM_LIST: - if (__value == null) { - unsetEnum_list(); - } else { - setEnum_list((List)__value); - } - break; + public void unsetList_list_i32() { + this.list_list_i32 = null; + } - case STRUCT_SET: - if (__value == null) { - unsetStruct_set(); - } else { - setStruct_set((Set)__value); - } - break; + // Returns true if field list_list_i32 is set (has been assigned a value) and false otherwise + public boolean isSetList_list_i32() { + return this.list_list_i32 != null; + } - case UNION_SET: - if (__value == null) { - unsetUnion_set(); - } else { - setUnion_set((Set)__value); - } - break; + public void setList_list_i32IsSet(boolean __value) { + if (!__value) { + this.list_list_i32 = null; + } + } - case ENUM_SET: - if (__value == null) { - unsetEnum_set(); - } else { - setEnum_set((Set)__value); - } - break; + public List> getList_list_struct() { + return this.list_list_struct; + } - case STRUCT_MAP: - if (__value == null) { - unsetStruct_map(); - } else { - setStruct_map((Map)__value); - } - break; + public Containers setList_list_struct(List> list_list_struct) { + this.list_list_struct = list_list_struct; + return this; + } - case UNION_MAP: - if (__value == null) { - unsetUnion_map(); - } else { - setUnion_map((Map)__value); - } - break; + public void unsetList_list_struct() { + this.list_list_struct = null; + } - case ENUM_MAP: - if (__value == null) { - unsetEnum_map(); - } else { - setEnum_map((Map)__value); - } - break; + // Returns true if field list_list_struct is set (has been assigned a value) and false otherwise + public boolean isSetList_list_struct() { + return this.list_list_struct != null; + } - case STRUCT_MAP_2: - if (__value == null) { - unsetStruct_map_2(); - } else { - setStruct_map_2((Map)__value); - } - break; + public void setList_list_structIsSet(boolean __value) { + if (!__value) { + this.list_list_struct = null; + } + } - case UNION_MAP_2: - if (__value == null) { - unsetUnion_map_2(); - } else { - setUnion_map_2((Map)__value); - } - break; + public List> getList_set_i32() { + return this.list_set_i32; + } - case ENUM_MAP_2: - if (__value == null) { - unsetEnum_map_2(); - } else { - setEnum_map_2((Map)__value); - } - break; + public Containers setList_set_i32(List> list_set_i32) { + this.list_set_i32 = list_set_i32; + return this; + } - case LIST_MAP: - if (__value == null) { - unsetList_map(); - } else { - setList_map((Map,Integer>)__value); - } - break; + public void unsetList_set_i32() { + this.list_set_i32 = null; + } - case LIST_MAP_2: - if (__value == null) { - unsetList_map_2(); - } else { - setList_map_2((Map>)__value); - } - break; + // Returns true if field list_set_i32 is set (has been assigned a value) and false otherwise + public boolean isSetList_set_i32() { + return this.list_set_i32 != null; + } - case SET_MAP: - if (__value == null) { - unsetSet_map(); - } else { - setSet_map((Map,Integer>)__value); - } - break; + public void setList_set_i32IsSet(boolean __value) { + if (!__value) { + this.list_set_i32 = null; + } + } - case SET_MAP_2: - if (__value == null) { - unsetSet_map_2(); - } else { - setSet_map_2((Map>)__value); - } - break; + public List> getList_set_struct() { + return this.list_set_struct; + } - case MAP_MAP: - if (__value == null) { - unsetMap_map(); - } else { - setMap_map((Map,Integer>)__value); - } - break; + public Containers setList_set_struct(List> list_set_struct) { + this.list_set_struct = list_set_struct; + return this; + } - case MAP_MAP_2: - if (__value == null) { - unsetMap_map_2(); - } else { - setMap_map_2((Map>)__value); - } - break; + public void unsetList_set_struct() { + this.list_set_struct = null; + } - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + // Returns true if field list_set_struct is set (has been assigned a value) and false otherwise + public boolean isSetList_set_struct() { + return this.list_set_struct != null; + } + + public void setList_set_structIsSet(boolean __value) { + if (!__value) { + this.list_set_struct = null; } } - public Object getFieldValue(int fieldID) { - switch (fieldID) { - case STRUCT_LIST: - return getStruct_list(); + public List> getList_map_i32_i32() { + return this.list_map_i32_i32; + } - case UNION_LIST: - return getUnion_list(); + public Containers setList_map_i32_i32(List> list_map_i32_i32) { + this.list_map_i32_i32 = list_map_i32_i32; + return this; + } - case ENUM_LIST: - return getEnum_list(); + public void unsetList_map_i32_i32() { + this.list_map_i32_i32 = null; + } - case STRUCT_SET: - return getStruct_set(); + // Returns true if field list_map_i32_i32 is set (has been assigned a value) and false otherwise + public boolean isSetList_map_i32_i32() { + return this.list_map_i32_i32 != null; + } - case UNION_SET: - return getUnion_set(); + public void setList_map_i32_i32IsSet(boolean __value) { + if (!__value) { + this.list_map_i32_i32 = null; + } + } - case ENUM_SET: - return getEnum_set(); + public List> getList_map_i32_struct() { + return this.list_map_i32_struct; + } - case STRUCT_MAP: - return getStruct_map(); + public Containers setList_map_i32_struct(List> list_map_i32_struct) { + this.list_map_i32_struct = list_map_i32_struct; + return this; + } - case UNION_MAP: - return getUnion_map(); + public void unsetList_map_i32_struct() { + this.list_map_i32_struct = null; + } - case ENUM_MAP: - return getEnum_map(); + // Returns true if field list_map_i32_struct is set (has been assigned a value) and false otherwise + public boolean isSetList_map_i32_struct() { + return this.list_map_i32_struct != null; + } - case STRUCT_MAP_2: - return getStruct_map_2(); + public void setList_map_i32_structIsSet(boolean __value) { + if (!__value) { + this.list_map_i32_struct = null; + } + } - case UNION_MAP_2: - return getUnion_map_2(); + public List> getList_map_struct_i32() { + return this.list_map_struct_i32; + } - case ENUM_MAP_2: - return getEnum_map_2(); + public Containers setList_map_struct_i32(List> list_map_struct_i32) { + this.list_map_struct_i32 = list_map_struct_i32; + return this; + } - case LIST_MAP: - return getList_map(); + public void unsetList_map_struct_i32() { + this.list_map_struct_i32 = null; + } - case LIST_MAP_2: - return getList_map_2(); + // Returns true if field list_map_struct_i32 is set (has been assigned a value) and false otherwise + public boolean isSetList_map_struct_i32() { + return this.list_map_struct_i32 != null; + } - case SET_MAP: - return getSet_map(); + public void setList_map_struct_i32IsSet(boolean __value) { + if (!__value) { + this.list_map_struct_i32 = null; + } + } - case SET_MAP_2: - return getSet_map_2(); + public Set> getSet_list_i32() { + return this.set_list_i32; + } - case MAP_MAP: - return getMap_map(); + public Containers setSet_list_i32(Set> set_list_i32) { + this.set_list_i32 = set_list_i32; + return this; + } - case MAP_MAP_2: - return getMap_map_2(); + public void unsetSet_list_i32() { + this.set_list_i32 = null; + } - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + // Returns true if field set_list_i32 is set (has been assigned a value) and false otherwise + public boolean isSetSet_list_i32() { + return this.set_list_i32 != null; + } + + public void setSet_list_i32IsSet(boolean __value) { + if (!__value) { + this.set_list_i32 = null; } } - @Override - public boolean equals(Object _that) { - if (_that == null) - return false; - if (this == _that) - return true; - if (!(_that instanceof Containers)) - return false; - Containers that = (Containers)_that; + public Set> getSet_list_struct() { + return this.set_list_struct; + } - if (!TBaseHelper.equalsNobinary(this.isSetStruct_list(), that.isSetStruct_list(), this.struct_list, that.struct_list)) { return false; } + public Containers setSet_list_struct(Set> set_list_struct) { + this.set_list_struct = set_list_struct; + return this; + } - if (!TBaseHelper.equalsNobinary(this.isSetUnion_list(), that.isSetUnion_list(), this.union_list, that.union_list)) { return false; } + public void unsetSet_list_struct() { + this.set_list_struct = null; + } - if (!TBaseHelper.equalsNobinary(this.isSetEnum_list(), that.isSetEnum_list(), this.enum_list, that.enum_list)) { return false; } + // Returns true if field set_list_struct is set (has been assigned a value) and false otherwise + public boolean isSetSet_list_struct() { + return this.set_list_struct != null; + } - if (!TBaseHelper.equalsNobinary(this.isSetStruct_set(), that.isSetStruct_set(), this.struct_set, that.struct_set)) { return false; } + public void setSet_list_structIsSet(boolean __value) { + if (!__value) { + this.set_list_struct = null; + } + } - if (!TBaseHelper.equalsNobinary(this.isSetUnion_set(), that.isSetUnion_set(), this.union_set, that.union_set)) { return false; } + public Set> getSet_set_i32() { + return this.set_set_i32; + } - if (!TBaseHelper.equalsNobinary(this.isSetEnum_set(), that.isSetEnum_set(), this.enum_set, that.enum_set)) { return false; } + public Containers setSet_set_i32(Set> set_set_i32) { + this.set_set_i32 = set_set_i32; + return this; + } - if (!TBaseHelper.equalsNobinary(this.isSetStruct_map(), that.isSetStruct_map(), this.struct_map, that.struct_map)) { return false; } + public void unsetSet_set_i32() { + this.set_set_i32 = null; + } - if (!TBaseHelper.equalsNobinary(this.isSetUnion_map(), that.isSetUnion_map(), this.union_map, that.union_map)) { return false; } + // Returns true if field set_set_i32 is set (has been assigned a value) and false otherwise + public boolean isSetSet_set_i32() { + return this.set_set_i32 != null; + } - if (!TBaseHelper.equalsNobinary(this.isSetEnum_map(), that.isSetEnum_map(), this.enum_map, that.enum_map)) { return false; } + public void setSet_set_i32IsSet(boolean __value) { + if (!__value) { + this.set_set_i32 = null; + } + } - if (!TBaseHelper.equalsNobinary(this.isSetStruct_map_2(), that.isSetStruct_map_2(), this.struct_map_2, that.struct_map_2)) { return false; } + public Set> getSet_set_struct() { + return this.set_set_struct; + } - if (!TBaseHelper.equalsNobinary(this.isSetUnion_map_2(), that.isSetUnion_map_2(), this.union_map_2, that.union_map_2)) { return false; } + public Containers setSet_set_struct(Set> set_set_struct) { + this.set_set_struct = set_set_struct; + return this; + } - if (!TBaseHelper.equalsNobinary(this.isSetEnum_map_2(), that.isSetEnum_map_2(), this.enum_map_2, that.enum_map_2)) { return false; } + public void unsetSet_set_struct() { + this.set_set_struct = null; + } - if (!TBaseHelper.equalsNobinary(this.isSetList_map(), that.isSetList_map(), this.list_map, that.list_map)) { return false; } + // Returns true if field set_set_struct is set (has been assigned a value) and false otherwise + public boolean isSetSet_set_struct() { + return this.set_set_struct != null; + } - if (!TBaseHelper.equalsNobinary(this.isSetList_map_2(), that.isSetList_map_2(), this.list_map_2, that.list_map_2)) { return false; } + public void setSet_set_structIsSet(boolean __value) { + if (!__value) { + this.set_set_struct = null; + } + } - if (!TBaseHelper.equalsNobinary(this.isSetSet_map(), that.isSetSet_map(), this.set_map, that.set_map)) { return false; } + public Set> getSet_map_i32_i32() { + return this.set_map_i32_i32; + } - if (!TBaseHelper.equalsNobinary(this.isSetSet_map_2(), that.isSetSet_map_2(), this.set_map_2, that.set_map_2)) { return false; } + public Containers setSet_map_i32_i32(Set> set_map_i32_i32) { + this.set_map_i32_i32 = set_map_i32_i32; + return this; + } - if (!TBaseHelper.equalsNobinary(this.isSetMap_map(), that.isSetMap_map(), this.map_map, that.map_map)) { return false; } + public void unsetSet_map_i32_i32() { + this.set_map_i32_i32 = null; + } - if (!TBaseHelper.equalsNobinary(this.isSetMap_map_2(), that.isSetMap_map_2(), this.map_map_2, that.map_map_2)) { return false; } + // Returns true if field set_map_i32_i32 is set (has been assigned a value) and false otherwise + public boolean isSetSet_map_i32_i32() { + return this.set_map_i32_i32 != null; + } - return true; + public void setSet_map_i32_i32IsSet(boolean __value) { + if (!__value) { + this.set_map_i32_i32 = null; + } } - @Override - public int hashCode() { - return Arrays.deepHashCode(new Object[] {struct_list, union_list, enum_list, struct_set, union_set, enum_set, struct_map, union_map, enum_map, struct_map_2, union_map_2, enum_map_2, list_map, list_map_2, set_map, set_map_2, map_map, map_map_2}); + public Set> getSet_map_i32_struct() { + return this.set_map_i32_struct; } - public void read(TProtocol iprot) throws TException { - TField __field; - iprot.readStructBegin(metaDataMap); - while (true) - { - __field = iprot.readFieldBegin(); - if (__field.type == TType.STOP) { - break; - } - switch (__field.id) - { - case STRUCT_LIST: - if (__field.type == TType.LIST) { - { - TList _list453 = iprot.readListBegin(); - this.struct_list = new ArrayList(Math.max(0, _list453.size)); - for (int _i454 = 0; - (_list453.size < 0) ? iprot.peekList() : (_i454 < _list453.size); - ++_i454) - { - MyStruct _elem455; - _elem455 = new MyStruct(); - _elem455.read(iprot); - this.struct_list.add(_elem455); - } - iprot.readListEnd(); - } - } else { - TProtocolUtil.skip(iprot, __field.type); - } - break; - case UNION_LIST: - if (__field.type == TType.LIST) { - { - TList _list456 = iprot.readListBegin(); - this.union_list = new ArrayList(Math.max(0, _list456.size)); - for (int _i457 = 0; - (_list456.size < 0) ? iprot.peekList() : (_i457 < _list456.size); - ++_i457) - { - MyUnion _elem458; - _elem458 = new MyUnion(); - _elem458.read(iprot); - this.union_list.add(_elem458); - } - iprot.readListEnd(); - } - } else { - TProtocolUtil.skip(iprot, __field.type); - } - break; - case ENUM_LIST: - if (__field.type == TType.LIST) { - { - TList _list459 = iprot.readListBegin(); - this.enum_list = new ArrayList(Math.max(0, _list459.size)); - for (int _i460 = 0; - (_list459.size < 0) ? iprot.peekList() : (_i460 < _list459.size); - ++_i460) - { - MyEnum _elem461; - _elem461 = MyEnum.findByValue(iprot.readI32()); - this.enum_list.add(_elem461); + public Containers setSet_map_i32_struct(Set> set_map_i32_struct) { + this.set_map_i32_struct = set_map_i32_struct; + return this; + } + + public void unsetSet_map_i32_struct() { + this.set_map_i32_struct = null; + } + + // Returns true if field set_map_i32_struct is set (has been assigned a value) and false otherwise + public boolean isSetSet_map_i32_struct() { + return this.set_map_i32_struct != null; + } + + public void setSet_map_i32_structIsSet(boolean __value) { + if (!__value) { + this.set_map_i32_struct = null; + } + } + + public Set> getSet_map_struct_i32() { + return this.set_map_struct_i32; + } + + public Containers setSet_map_struct_i32(Set> set_map_struct_i32) { + this.set_map_struct_i32 = set_map_struct_i32; + return this; + } + + public void unsetSet_map_struct_i32() { + this.set_map_struct_i32 = null; + } + + // Returns true if field set_map_struct_i32 is set (has been assigned a value) and false otherwise + public boolean isSetSet_map_struct_i32() { + return this.set_map_struct_i32 != null; + } + + public void setSet_map_struct_i32IsSet(boolean __value) { + if (!__value) { + this.set_map_struct_i32 = null; + } + } + + public Map> getMap_i32_map_i32_i32() { + return this.map_i32_map_i32_i32; + } + + public Containers setMap_i32_map_i32_i32(Map> map_i32_map_i32_i32) { + this.map_i32_map_i32_i32 = map_i32_map_i32_i32; + return this; + } + + public void unsetMap_i32_map_i32_i32() { + this.map_i32_map_i32_i32 = null; + } + + // Returns true if field map_i32_map_i32_i32 is set (has been assigned a value) and false otherwise + public boolean isSetMap_i32_map_i32_i32() { + return this.map_i32_map_i32_i32 != null; + } + + public void setMap_i32_map_i32_i32IsSet(boolean __value) { + if (!__value) { + this.map_i32_map_i32_i32 = null; + } + } + + public Map> getMap_i32_map_struct_i32() { + return this.map_i32_map_struct_i32; + } + + public Containers setMap_i32_map_struct_i32(Map> map_i32_map_struct_i32) { + this.map_i32_map_struct_i32 = map_i32_map_struct_i32; + return this; + } + + public void unsetMap_i32_map_struct_i32() { + this.map_i32_map_struct_i32 = null; + } + + // Returns true if field map_i32_map_struct_i32 is set (has been assigned a value) and false otherwise + public boolean isSetMap_i32_map_struct_i32() { + return this.map_i32_map_struct_i32 != null; + } + + public void setMap_i32_map_struct_i32IsSet(boolean __value) { + if (!__value) { + this.map_i32_map_struct_i32 = null; + } + } + + public Map> getMap_i32_map_i32_struct() { + return this.map_i32_map_i32_struct; + } + + public Containers setMap_i32_map_i32_struct(Map> map_i32_map_i32_struct) { + this.map_i32_map_i32_struct = map_i32_map_i32_struct; + return this; + } + + public void unsetMap_i32_map_i32_struct() { + this.map_i32_map_i32_struct = null; + } + + // Returns true if field map_i32_map_i32_struct is set (has been assigned a value) and false otherwise + public boolean isSetMap_i32_map_i32_struct() { + return this.map_i32_map_i32_struct != null; + } + + public void setMap_i32_map_i32_structIsSet(boolean __value) { + if (!__value) { + this.map_i32_map_i32_struct = null; + } + } + + public Map>> getMap_i32_map_list_i32_i32() { + return this.map_i32_map_list_i32_i32; + } + + public Containers setMap_i32_map_list_i32_i32(Map>> map_i32_map_list_i32_i32) { + this.map_i32_map_list_i32_i32 = map_i32_map_list_i32_i32; + return this; + } + + public void unsetMap_i32_map_list_i32_i32() { + this.map_i32_map_list_i32_i32 = null; + } + + // Returns true if field map_i32_map_list_i32_i32 is set (has been assigned a value) and false otherwise + public boolean isSetMap_i32_map_list_i32_i32() { + return this.map_i32_map_list_i32_i32 != null; + } + + public void setMap_i32_map_list_i32_i32IsSet(boolean __value) { + if (!__value) { + this.map_i32_map_list_i32_i32 = null; + } + } + + public Map>> getMap_i32_map_list_struct_i32() { + return this.map_i32_map_list_struct_i32; + } + + public Containers setMap_i32_map_list_struct_i32(Map>> map_i32_map_list_struct_i32) { + this.map_i32_map_list_struct_i32 = map_i32_map_list_struct_i32; + return this; + } + + public void unsetMap_i32_map_list_struct_i32() { + this.map_i32_map_list_struct_i32 = null; + } + + // Returns true if field map_i32_map_list_struct_i32 is set (has been assigned a value) and false otherwise + public boolean isSetMap_i32_map_list_struct_i32() { + return this.map_i32_map_list_struct_i32 != null; + } + + public void setMap_i32_map_list_struct_i32IsSet(boolean __value) { + if (!__value) { + this.map_i32_map_list_struct_i32 = null; + } + } + + @SuppressWarnings("unchecked") + public void setFieldValue(int fieldID, Object __value) { + switch (fieldID) { + case STRUCT_LIST: + if (__value == null) { + unsetStruct_list(); + } else { + setStruct_list((List)__value); + } + break; + + case UNION_LIST: + if (__value == null) { + unsetUnion_list(); + } else { + setUnion_list((List)__value); + } + break; + + case ENUM_LIST: + if (__value == null) { + unsetEnum_list(); + } else { + setEnum_list((List)__value); + } + break; + + case STRUCT_SET: + if (__value == null) { + unsetStruct_set(); + } else { + setStruct_set((Set)__value); + } + break; + + case UNION_SET: + if (__value == null) { + unsetUnion_set(); + } else { + setUnion_set((Set)__value); + } + break; + + case ENUM_SET: + if (__value == null) { + unsetEnum_set(); + } else { + setEnum_set((Set)__value); + } + break; + + case STRUCT_MAP: + if (__value == null) { + unsetStruct_map(); + } else { + setStruct_map((Map)__value); + } + break; + + case UNION_MAP: + if (__value == null) { + unsetUnion_map(); + } else { + setUnion_map((Map)__value); + } + break; + + case ENUM_MAP: + if (__value == null) { + unsetEnum_map(); + } else { + setEnum_map((Map)__value); + } + break; + + case STRUCT_MAP_2: + if (__value == null) { + unsetStruct_map_2(); + } else { + setStruct_map_2((Map)__value); + } + break; + + case UNION_MAP_2: + if (__value == null) { + unsetUnion_map_2(); + } else { + setUnion_map_2((Map)__value); + } + break; + + case ENUM_MAP_2: + if (__value == null) { + unsetEnum_map_2(); + } else { + setEnum_map_2((Map)__value); + } + break; + + case LIST_MAP: + if (__value == null) { + unsetList_map(); + } else { + setList_map((Map,Integer>)__value); + } + break; + + case LIST_MAP_2: + if (__value == null) { + unsetList_map_2(); + } else { + setList_map_2((Map>)__value); + } + break; + + case SET_MAP: + if (__value == null) { + unsetSet_map(); + } else { + setSet_map((Map,Integer>)__value); + } + break; + + case SET_MAP_2: + if (__value == null) { + unsetSet_map_2(); + } else { + setSet_map_2((Map>)__value); + } + break; + + case MAP_MAP: + if (__value == null) { + unsetMap_map(); + } else { + setMap_map((Map,Integer>)__value); + } + break; + + case MAP_MAP_2: + if (__value == null) { + unsetMap_map_2(); + } else { + setMap_map_2((Map>)__value); + } + break; + + case LIST_LIST_I32: + if (__value == null) { + unsetList_list_i32(); + } else { + setList_list_i32((List>)__value); + } + break; + + case LIST_LIST_STRUCT: + if (__value == null) { + unsetList_list_struct(); + } else { + setList_list_struct((List>)__value); + } + break; + + case LIST_SET_I32: + if (__value == null) { + unsetList_set_i32(); + } else { + setList_set_i32((List>)__value); + } + break; + + case LIST_SET_STRUCT: + if (__value == null) { + unsetList_set_struct(); + } else { + setList_set_struct((List>)__value); + } + break; + + case LIST_MAP_I32_I32: + if (__value == null) { + unsetList_map_i32_i32(); + } else { + setList_map_i32_i32((List>)__value); + } + break; + + case LIST_MAP_I32_STRUCT: + if (__value == null) { + unsetList_map_i32_struct(); + } else { + setList_map_i32_struct((List>)__value); + } + break; + + case LIST_MAP_STRUCT_I32: + if (__value == null) { + unsetList_map_struct_i32(); + } else { + setList_map_struct_i32((List>)__value); + } + break; + + case SET_LIST_I32: + if (__value == null) { + unsetSet_list_i32(); + } else { + setSet_list_i32((Set>)__value); + } + break; + + case SET_LIST_STRUCT: + if (__value == null) { + unsetSet_list_struct(); + } else { + setSet_list_struct((Set>)__value); + } + break; + + case SET_SET_I32: + if (__value == null) { + unsetSet_set_i32(); + } else { + setSet_set_i32((Set>)__value); + } + break; + + case SET_SET_STRUCT: + if (__value == null) { + unsetSet_set_struct(); + } else { + setSet_set_struct((Set>)__value); + } + break; + + case SET_MAP_I32_I32: + if (__value == null) { + unsetSet_map_i32_i32(); + } else { + setSet_map_i32_i32((Set>)__value); + } + break; + + case SET_MAP_I32_STRUCT: + if (__value == null) { + unsetSet_map_i32_struct(); + } else { + setSet_map_i32_struct((Set>)__value); + } + break; + + case SET_MAP_STRUCT_I32: + if (__value == null) { + unsetSet_map_struct_i32(); + } else { + setSet_map_struct_i32((Set>)__value); + } + break; + + case MAP_I32_MAP_I32_I32: + if (__value == null) { + unsetMap_i32_map_i32_i32(); + } else { + setMap_i32_map_i32_i32((Map>)__value); + } + break; + + case MAP_I32_MAP_STRUCT_I32: + if (__value == null) { + unsetMap_i32_map_struct_i32(); + } else { + setMap_i32_map_struct_i32((Map>)__value); + } + break; + + case MAP_I32_MAP_I32_STRUCT: + if (__value == null) { + unsetMap_i32_map_i32_struct(); + } else { + setMap_i32_map_i32_struct((Map>)__value); + } + break; + + case MAP_I32_MAP_LIST_I32_I32: + if (__value == null) { + unsetMap_i32_map_list_i32_i32(); + } else { + setMap_i32_map_list_i32_i32((Map>>)__value); + } + break; + + case MAP_I32_MAP_LIST_STRUCT_I32: + if (__value == null) { + unsetMap_i32_map_list_struct_i32(); + } else { + setMap_i32_map_list_struct_i32((Map>>)__value); + } + break; + + default: + throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + } + } + + public Object getFieldValue(int fieldID) { + switch (fieldID) { + case STRUCT_LIST: + return getStruct_list(); + + case UNION_LIST: + return getUnion_list(); + + case ENUM_LIST: + return getEnum_list(); + + case STRUCT_SET: + return getStruct_set(); + + case UNION_SET: + return getUnion_set(); + + case ENUM_SET: + return getEnum_set(); + + case STRUCT_MAP: + return getStruct_map(); + + case UNION_MAP: + return getUnion_map(); + + case ENUM_MAP: + return getEnum_map(); + + case STRUCT_MAP_2: + return getStruct_map_2(); + + case UNION_MAP_2: + return getUnion_map_2(); + + case ENUM_MAP_2: + return getEnum_map_2(); + + case LIST_MAP: + return getList_map(); + + case LIST_MAP_2: + return getList_map_2(); + + case SET_MAP: + return getSet_map(); + + case SET_MAP_2: + return getSet_map_2(); + + case MAP_MAP: + return getMap_map(); + + case MAP_MAP_2: + return getMap_map_2(); + + case LIST_LIST_I32: + return getList_list_i32(); + + case LIST_LIST_STRUCT: + return getList_list_struct(); + + case LIST_SET_I32: + return getList_set_i32(); + + case LIST_SET_STRUCT: + return getList_set_struct(); + + case LIST_MAP_I32_I32: + return getList_map_i32_i32(); + + case LIST_MAP_I32_STRUCT: + return getList_map_i32_struct(); + + case LIST_MAP_STRUCT_I32: + return getList_map_struct_i32(); + + case SET_LIST_I32: + return getSet_list_i32(); + + case SET_LIST_STRUCT: + return getSet_list_struct(); + + case SET_SET_I32: + return getSet_set_i32(); + + case SET_SET_STRUCT: + return getSet_set_struct(); + + case SET_MAP_I32_I32: + return getSet_map_i32_i32(); + + case SET_MAP_I32_STRUCT: + return getSet_map_i32_struct(); + + case SET_MAP_STRUCT_I32: + return getSet_map_struct_i32(); + + case MAP_I32_MAP_I32_I32: + return getMap_i32_map_i32_i32(); + + case MAP_I32_MAP_STRUCT_I32: + return getMap_i32_map_struct_i32(); + + case MAP_I32_MAP_I32_STRUCT: + return getMap_i32_map_i32_struct(); + + case MAP_I32_MAP_LIST_I32_I32: + return getMap_i32_map_list_i32_i32(); + + case MAP_I32_MAP_LIST_STRUCT_I32: + return getMap_i32_map_list_struct_i32(); + + default: + throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + } + } + + @Override + public boolean equals(Object _that) { + if (_that == null) + return false; + if (this == _that) + return true; + if (!(_that instanceof Containers)) + return false; + Containers that = (Containers)_that; + + if (!TBaseHelper.equalsNobinary(this.isSetStruct_list(), that.isSetStruct_list(), this.struct_list, that.struct_list)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetUnion_list(), that.isSetUnion_list(), this.union_list, that.union_list)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetEnum_list(), that.isSetEnum_list(), this.enum_list, that.enum_list)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetStruct_set(), that.isSetStruct_set(), this.struct_set, that.struct_set)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetUnion_set(), that.isSetUnion_set(), this.union_set, that.union_set)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetEnum_set(), that.isSetEnum_set(), this.enum_set, that.enum_set)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetStruct_map(), that.isSetStruct_map(), this.struct_map, that.struct_map)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetUnion_map(), that.isSetUnion_map(), this.union_map, that.union_map)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetEnum_map(), that.isSetEnum_map(), this.enum_map, that.enum_map)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetStruct_map_2(), that.isSetStruct_map_2(), this.struct_map_2, that.struct_map_2)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetUnion_map_2(), that.isSetUnion_map_2(), this.union_map_2, that.union_map_2)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetEnum_map_2(), that.isSetEnum_map_2(), this.enum_map_2, that.enum_map_2)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetList_map(), that.isSetList_map(), this.list_map, that.list_map)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetList_map_2(), that.isSetList_map_2(), this.list_map_2, that.list_map_2)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetSet_map(), that.isSetSet_map(), this.set_map, that.set_map)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetSet_map_2(), that.isSetSet_map_2(), this.set_map_2, that.set_map_2)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetMap_map(), that.isSetMap_map(), this.map_map, that.map_map)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetMap_map_2(), that.isSetMap_map_2(), this.map_map_2, that.map_map_2)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetList_list_i32(), that.isSetList_list_i32(), this.list_list_i32, that.list_list_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetList_list_struct(), that.isSetList_list_struct(), this.list_list_struct, that.list_list_struct)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetList_set_i32(), that.isSetList_set_i32(), this.list_set_i32, that.list_set_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetList_set_struct(), that.isSetList_set_struct(), this.list_set_struct, that.list_set_struct)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetList_map_i32_i32(), that.isSetList_map_i32_i32(), this.list_map_i32_i32, that.list_map_i32_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetList_map_i32_struct(), that.isSetList_map_i32_struct(), this.list_map_i32_struct, that.list_map_i32_struct)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetList_map_struct_i32(), that.isSetList_map_struct_i32(), this.list_map_struct_i32, that.list_map_struct_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetSet_list_i32(), that.isSetSet_list_i32(), this.set_list_i32, that.set_list_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetSet_list_struct(), that.isSetSet_list_struct(), this.set_list_struct, that.set_list_struct)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetSet_set_i32(), that.isSetSet_set_i32(), this.set_set_i32, that.set_set_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetSet_set_struct(), that.isSetSet_set_struct(), this.set_set_struct, that.set_set_struct)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetSet_map_i32_i32(), that.isSetSet_map_i32_i32(), this.set_map_i32_i32, that.set_map_i32_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetSet_map_i32_struct(), that.isSetSet_map_i32_struct(), this.set_map_i32_struct, that.set_map_i32_struct)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetSet_map_struct_i32(), that.isSetSet_map_struct_i32(), this.set_map_struct_i32, that.set_map_struct_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetMap_i32_map_i32_i32(), that.isSetMap_i32_map_i32_i32(), this.map_i32_map_i32_i32, that.map_i32_map_i32_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetMap_i32_map_struct_i32(), that.isSetMap_i32_map_struct_i32(), this.map_i32_map_struct_i32, that.map_i32_map_struct_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetMap_i32_map_i32_struct(), that.isSetMap_i32_map_i32_struct(), this.map_i32_map_i32_struct, that.map_i32_map_i32_struct)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetMap_i32_map_list_i32_i32(), that.isSetMap_i32_map_list_i32_i32(), this.map_i32_map_list_i32_i32, that.map_i32_map_list_i32_i32)) { return false; } + + if (!TBaseHelper.equalsNobinary(this.isSetMap_i32_map_list_struct_i32(), that.isSetMap_i32_map_list_struct_i32(), this.map_i32_map_list_struct_i32, that.map_i32_map_list_struct_i32)) { return false; } + + return true; + } + + @Override + public int hashCode() { + return Arrays.deepHashCode(new Object[] {struct_list, union_list, enum_list, struct_set, union_set, enum_set, struct_map, union_map, enum_map, struct_map_2, union_map_2, enum_map_2, list_map, list_map_2, set_map, set_map_2, map_map, map_map_2, list_list_i32, list_list_struct, list_set_i32, list_set_struct, list_map_i32_i32, list_map_i32_struct, list_map_struct_i32, set_list_i32, set_list_struct, set_set_i32, set_set_struct, set_map_i32_i32, set_map_i32_struct, set_map_struct_i32, map_i32_map_i32_i32, map_i32_map_struct_i32, map_i32_map_i32_struct, map_i32_map_list_i32_i32, map_i32_map_list_struct_i32}); + } + + public void read(TProtocol iprot) throws TException { + TField __field; + iprot.readStructBegin(metaDataMap); + while (true) + { + __field = iprot.readFieldBegin(); + if (__field.type == TType.STOP) { + break; + } + switch (__field.id) + { + case STRUCT_LIST: + if (__field.type == TType.LIST) { + { + TList _list453 = iprot.readListBegin(); + this.struct_list = new ArrayList(Math.max(0, _list453.size)); + for (int _i454 = 0; + (_list453.size < 0) ? iprot.peekList() : (_i454 < _list453.size); + ++_i454) + { + MyStruct _elem455; + _elem455 = new MyStruct(); + _elem455.read(iprot); + this.struct_list.add(_elem455); + } + iprot.readListEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case UNION_LIST: + if (__field.type == TType.LIST) { + { + TList _list456 = iprot.readListBegin(); + this.union_list = new ArrayList(Math.max(0, _list456.size)); + for (int _i457 = 0; + (_list456.size < 0) ? iprot.peekList() : (_i457 < _list456.size); + ++_i457) + { + MyUnion _elem458; + _elem458 = new MyUnion(); + _elem458.read(iprot); + this.union_list.add(_elem458); + } + iprot.readListEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case ENUM_LIST: + if (__field.type == TType.LIST) { + { + TList _list459 = iprot.readListBegin(); + this.enum_list = new ArrayList(Math.max(0, _list459.size)); + for (int _i460 = 0; + (_list459.size < 0) ? iprot.peekList() : (_i460 < _list459.size); + ++_i460) + { + MyEnum _elem461; + _elem461 = MyEnum.findByValue(iprot.readI32()); + this.enum_list.add(_elem461); + } + iprot.readListEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case STRUCT_SET: + if (__field.type == TType.SET) { + { + TSet _set462 = iprot.readSetBegin(); + this.struct_set = new HashSet(Math.max(0, 2*_set462.size)); + for (int _i463 = 0; + (_set462.size < 0) ? iprot.peekSet() : (_i463 < _set462.size); + ++_i463) + { + MyStruct _elem464; + _elem464 = new MyStruct(); + _elem464.read(iprot); + this.struct_set.add(_elem464); + } + iprot.readSetEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case UNION_SET: + if (__field.type == TType.SET) { + { + TSet _set465 = iprot.readSetBegin(); + this.union_set = new HashSet(Math.max(0, 2*_set465.size)); + for (int _i466 = 0; + (_set465.size < 0) ? iprot.peekSet() : (_i466 < _set465.size); + ++_i466) + { + MyUnion _elem467; + _elem467 = new MyUnion(); + _elem467.read(iprot); + this.union_set.add(_elem467); + } + iprot.readSetEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case ENUM_SET: + if (__field.type == TType.SET) { + { + TSet _set468 = iprot.readSetBegin(); + this.enum_set = new HashSet(Math.max(0, 2*_set468.size)); + for (int _i469 = 0; + (_set468.size < 0) ? iprot.peekSet() : (_i469 < _set468.size); + ++_i469) + { + MyEnum _elem470; + _elem470 = MyEnum.findByValue(iprot.readI32()); + this.enum_set.add(_elem470); + } + iprot.readSetEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case STRUCT_MAP: + if (__field.type == TType.MAP) { + { + TMap _map471 = iprot.readMapBegin(); + this.struct_map = new HashMap(Math.max(0, 2*_map471.size)); + for (int _i472 = 0; + (_map471.size < 0) ? iprot.peekMap() : (_i472 < _map471.size); + ++_i472) + { + MyStruct _key473; + long _val474; + _key473 = new MyStruct(); + _key473.read(iprot); + _val474 = iprot.readI64(); + this.struct_map.put(_key473, _val474); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case UNION_MAP: + if (__field.type == TType.MAP) { + { + TMap _map475 = iprot.readMapBegin(); + this.union_map = new HashMap(Math.max(0, 2*_map475.size)); + for (int _i476 = 0; + (_map475.size < 0) ? iprot.peekMap() : (_i476 < _map475.size); + ++_i476) + { + MyUnion _key477; + long _val478; + _key477 = new MyUnion(); + _key477.read(iprot); + _val478 = iprot.readI64(); + this.union_map.put(_key477, _val478); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case ENUM_MAP: + if (__field.type == TType.MAP) { + { + TMap _map479 = iprot.readMapBegin(); + this.enum_map = new HashMap(Math.max(0, 2*_map479.size)); + for (int _i480 = 0; + (_map479.size < 0) ? iprot.peekMap() : (_i480 < _map479.size); + ++_i480) + { + MyEnum _key481; + long _val482; + _key481 = MyEnum.findByValue(iprot.readI32()); + _val482 = iprot.readI64(); + this.enum_map.put(_key481, _val482); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case STRUCT_MAP_2: + if (__field.type == TType.MAP) { + { + TMap _map483 = iprot.readMapBegin(); + this.struct_map_2 = new HashMap(Math.max(0, 2*_map483.size)); + for (int _i484 = 0; + (_map483.size < 0) ? iprot.peekMap() : (_i484 < _map483.size); + ++_i484) + { + int _key485; + MyStruct _val486; + _key485 = iprot.readI32(); + _val486 = new MyStruct(); + _val486.read(iprot); + this.struct_map_2.put(_key485, _val486); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case UNION_MAP_2: + if (__field.type == TType.MAP) { + { + TMap _map487 = iprot.readMapBegin(); + this.union_map_2 = new HashMap(Math.max(0, 2*_map487.size)); + for (int _i488 = 0; + (_map487.size < 0) ? iprot.peekMap() : (_i488 < _map487.size); + ++_i488) + { + int _key489; + MyUnion _val490; + _key489 = iprot.readI32(); + _val490 = new MyUnion(); + _val490.read(iprot); + this.union_map_2.put(_key489, _val490); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case ENUM_MAP_2: + if (__field.type == TType.MAP) { + { + TMap _map491 = iprot.readMapBegin(); + this.enum_map_2 = new HashMap(Math.max(0, 2*_map491.size)); + for (int _i492 = 0; + (_map491.size < 0) ? iprot.peekMap() : (_i492 < _map491.size); + ++_i492) + { + int _key493; + MyEnum _val494; + _key493 = iprot.readI32(); + _val494 = MyEnum.findByValue(iprot.readI32()); + this.enum_map_2.put(_key493, _val494); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case LIST_MAP: + if (__field.type == TType.MAP) { + { + TMap _map495 = iprot.readMapBegin(); + this.list_map = new HashMap,Integer>(Math.max(0, 2*_map495.size)); + for (int _i496 = 0; + (_map495.size < 0) ? iprot.peekMap() : (_i496 < _map495.size); + ++_i496) + { + List _key497; + int _val498; + { + TList _list499 = iprot.readListBegin(); + _key497 = new ArrayList(Math.max(0, _list499.size)); + for (int _i500 = 0; + (_list499.size < 0) ? iprot.peekList() : (_i500 < _list499.size); + ++_i500) + { + int _elem501; + _elem501 = iprot.readI32(); + _key497.add(_elem501); + } + iprot.readListEnd(); + } + _val498 = iprot.readI32(); + this.list_map.put(_key497, _val498); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case LIST_MAP_2: + if (__field.type == TType.MAP) { + { + TMap _map502 = iprot.readMapBegin(); + this.list_map_2 = new HashMap>(Math.max(0, 2*_map502.size)); + for (int _i503 = 0; + (_map502.size < 0) ? iprot.peekMap() : (_i503 < _map502.size); + ++_i503) + { + int _key504; + List _val505; + _key504 = iprot.readI32(); + { + TList _list506 = iprot.readListBegin(); + _val505 = new ArrayList(Math.max(0, _list506.size)); + for (int _i507 = 0; + (_list506.size < 0) ? iprot.peekList() : (_i507 < _list506.size); + ++_i507) + { + int _elem508; + _elem508 = iprot.readI32(); + _val505.add(_elem508); + } + iprot.readListEnd(); + } + this.list_map_2.put(_key504, _val505); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case SET_MAP: + if (__field.type == TType.MAP) { + { + TMap _map509 = iprot.readMapBegin(); + this.set_map = new HashMap,Integer>(Math.max(0, 2*_map509.size)); + for (int _i510 = 0; + (_map509.size < 0) ? iprot.peekMap() : (_i510 < _map509.size); + ++_i510) + { + Set _key511; + int _val512; + { + TSet _set513 = iprot.readSetBegin(); + _key511 = new HashSet(Math.max(0, 2*_set513.size)); + for (int _i514 = 0; + (_set513.size < 0) ? iprot.peekSet() : (_i514 < _set513.size); + ++_i514) + { + int _elem515; + _elem515 = iprot.readI32(); + _key511.add(_elem515); + } + iprot.readSetEnd(); + } + _val512 = iprot.readI32(); + this.set_map.put(_key511, _val512); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case SET_MAP_2: + if (__field.type == TType.MAP) { + { + TMap _map516 = iprot.readMapBegin(); + this.set_map_2 = new HashMap>(Math.max(0, 2*_map516.size)); + for (int _i517 = 0; + (_map516.size < 0) ? iprot.peekMap() : (_i517 < _map516.size); + ++_i517) + { + int _key518; + Set _val519; + _key518 = iprot.readI32(); + { + TSet _set520 = iprot.readSetBegin(); + _val519 = new HashSet(Math.max(0, 2*_set520.size)); + for (int _i521 = 0; + (_set520.size < 0) ? iprot.peekSet() : (_i521 < _set520.size); + ++_i521) + { + int _elem522; + _elem522 = iprot.readI32(); + _val519.add(_elem522); + } + iprot.readSetEnd(); + } + this.set_map_2.put(_key518, _val519); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case MAP_MAP: + if (__field.type == TType.MAP) { + { + TMap _map523 = iprot.readMapBegin(); + this.map_map = new HashMap,Integer>(Math.max(0, 2*_map523.size)); + for (int _i524 = 0; + (_map523.size < 0) ? iprot.peekMap() : (_i524 < _map523.size); + ++_i524) + { + Map _key525; + int _val526; + { + TMap _map527 = iprot.readMapBegin(); + _key525 = new HashMap(Math.max(0, 2*_map527.size)); + for (int _i528 = 0; + (_map527.size < 0) ? iprot.peekMap() : (_i528 < _map527.size); + ++_i528) + { + int _key529; + int _val530; + _key529 = iprot.readI32(); + _val530 = iprot.readI32(); + _key525.put(_key529, _val530); + } + iprot.readMapEnd(); + } + _val526 = iprot.readI32(); + this.map_map.put(_key525, _val526); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case MAP_MAP_2: + if (__field.type == TType.MAP) { + { + TMap _map531 = iprot.readMapBegin(); + this.map_map_2 = new HashMap>(Math.max(0, 2*_map531.size)); + for (int _i532 = 0; + (_map531.size < 0) ? iprot.peekMap() : (_i532 < _map531.size); + ++_i532) + { + int _key533; + Map _val534; + _key533 = iprot.readI32(); + { + TMap _map535 = iprot.readMapBegin(); + _val534 = new HashMap(Math.max(0, 2*_map535.size)); + for (int _i536 = 0; + (_map535.size < 0) ? iprot.peekMap() : (_i536 < _map535.size); + ++_i536) + { + int _key537; + int _val538; + _key537 = iprot.readI32(); + _val538 = iprot.readI32(); + _val534.put(_key537, _val538); + } + iprot.readMapEnd(); + } + this.map_map_2.put(_key533, _val534); + } + iprot.readMapEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case LIST_LIST_I32: + if (__field.type == TType.LIST) { + { + TList _list539 = iprot.readListBegin(); + this.list_list_i32 = new ArrayList>(Math.max(0, _list539.size)); + for (int _i540 = 0; + (_list539.size < 0) ? iprot.peekList() : (_i540 < _list539.size); + ++_i540) + { + List _elem541; + { + TList _list542 = iprot.readListBegin(); + _elem541 = new ArrayList(Math.max(0, _list542.size)); + for (int _i543 = 0; + (_list542.size < 0) ? iprot.peekList() : (_i543 < _list542.size); + ++_i543) + { + int _elem544; + _elem544 = iprot.readI32(); + _elem541.add(_elem544); + } + iprot.readListEnd(); + } + this.list_list_i32.add(_elem541); + } + iprot.readListEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case LIST_LIST_STRUCT: + if (__field.type == TType.LIST) { + { + TList _list545 = iprot.readListBegin(); + this.list_list_struct = new ArrayList>(Math.max(0, _list545.size)); + for (int _i546 = 0; + (_list545.size < 0) ? iprot.peekList() : (_i546 < _list545.size); + ++_i546) + { + List _elem547; + { + TList _list548 = iprot.readListBegin(); + _elem547 = new ArrayList(Math.max(0, _list548.size)); + for (int _i549 = 0; + (_list548.size < 0) ? iprot.peekList() : (_i549 < _list548.size); + ++_i549) + { + MyStruct _elem550; + _elem550 = new MyStruct(); + _elem550.read(iprot); + _elem547.add(_elem550); + } + iprot.readListEnd(); + } + this.list_list_struct.add(_elem547); + } + iprot.readListEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case LIST_SET_I32: + if (__field.type == TType.LIST) { + { + TList _list551 = iprot.readListBegin(); + this.list_set_i32 = new ArrayList>(Math.max(0, _list551.size)); + for (int _i552 = 0; + (_list551.size < 0) ? iprot.peekList() : (_i552 < _list551.size); + ++_i552) + { + Set _elem553; + { + TSet _set554 = iprot.readSetBegin(); + _elem553 = new HashSet(Math.max(0, 2*_set554.size)); + for (int _i555 = 0; + (_set554.size < 0) ? iprot.peekSet() : (_i555 < _set554.size); + ++_i555) + { + int _elem556; + _elem556 = iprot.readI32(); + _elem553.add(_elem556); + } + iprot.readSetEnd(); + } + this.list_set_i32.add(_elem553); + } + iprot.readListEnd(); + } + } else { + TProtocolUtil.skip(iprot, __field.type); + } + break; + case LIST_SET_STRUCT: + if (__field.type == TType.LIST) { + { + TList _list557 = iprot.readListBegin(); + this.list_set_struct = new ArrayList>(Math.max(0, _list557.size)); + for (int _i558 = 0; + (_list557.size < 0) ? iprot.peekList() : (_i558 < _list557.size); + ++_i558) + { + Set _elem559; + { + TSet _set560 = iprot.readSetBegin(); + _elem559 = new HashSet(Math.max(0, 2*_set560.size)); + for (int _i561 = 0; + (_set560.size < 0) ? iprot.peekSet() : (_i561 < _set560.size); + ++_i561) + { + MyStruct _elem562; + _elem562 = new MyStruct(); + _elem562.read(iprot); + _elem559.add(_elem562); + } + iprot.readSetEnd(); + } + this.list_set_struct.add(_elem559); } iprot.readListEnd(); } @@ -1184,254 +2783,362 @@ public void read(TProtocol iprot) throws TException { TProtocolUtil.skip(iprot, __field.type); } break; - case STRUCT_SET: - if (__field.type == TType.SET) { + case LIST_MAP_I32_I32: + if (__field.type == TType.LIST) { { - TSet _set462 = iprot.readSetBegin(); - this.struct_set = new HashSet(Math.max(0, 2*_set462.size)); - for (int _i463 = 0; - (_set462.size < 0) ? iprot.peekSet() : (_i463 < _set462.size); - ++_i463) + TList _list563 = iprot.readListBegin(); + this.list_map_i32_i32 = new ArrayList>(Math.max(0, _list563.size)); + for (int _i564 = 0; + (_list563.size < 0) ? iprot.peekList() : (_i564 < _list563.size); + ++_i564) { - MyStruct _elem464; - _elem464 = new MyStruct(); - _elem464.read(iprot); - this.struct_set.add(_elem464); + Map _elem565; + { + TMap _map566 = iprot.readMapBegin(); + _elem565 = new HashMap(Math.max(0, 2*_map566.size)); + for (int _i567 = 0; + (_map566.size < 0) ? iprot.peekMap() : (_i567 < _map566.size); + ++_i567) + { + int _key568; + int _val569; + _key568 = iprot.readI32(); + _val569 = iprot.readI32(); + _elem565.put(_key568, _val569); + } + iprot.readMapEnd(); + } + this.list_map_i32_i32.add(_elem565); } - iprot.readSetEnd(); + iprot.readListEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case UNION_SET: - if (__field.type == TType.SET) { + case LIST_MAP_I32_STRUCT: + if (__field.type == TType.LIST) { { - TSet _set465 = iprot.readSetBegin(); - this.union_set = new HashSet(Math.max(0, 2*_set465.size)); - for (int _i466 = 0; - (_set465.size < 0) ? iprot.peekSet() : (_i466 < _set465.size); - ++_i466) + TList _list570 = iprot.readListBegin(); + this.list_map_i32_struct = new ArrayList>(Math.max(0, _list570.size)); + for (int _i571 = 0; + (_list570.size < 0) ? iprot.peekList() : (_i571 < _list570.size); + ++_i571) { - MyUnion _elem467; - _elem467 = new MyUnion(); - _elem467.read(iprot); - this.union_set.add(_elem467); + Map _elem572; + { + TMap _map573 = iprot.readMapBegin(); + _elem572 = new HashMap(Math.max(0, 2*_map573.size)); + for (int _i574 = 0; + (_map573.size < 0) ? iprot.peekMap() : (_i574 < _map573.size); + ++_i574) + { + int _key575; + MyStruct _val576; + _key575 = iprot.readI32(); + _val576 = new MyStruct(); + _val576.read(iprot); + _elem572.put(_key575, _val576); + } + iprot.readMapEnd(); + } + this.list_map_i32_struct.add(_elem572); } - iprot.readSetEnd(); + iprot.readListEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case ENUM_SET: - if (__field.type == TType.SET) { + case LIST_MAP_STRUCT_I32: + if (__field.type == TType.LIST) { { - TSet _set468 = iprot.readSetBegin(); - this.enum_set = new HashSet(Math.max(0, 2*_set468.size)); - for (int _i469 = 0; - (_set468.size < 0) ? iprot.peekSet() : (_i469 < _set468.size); - ++_i469) + TList _list577 = iprot.readListBegin(); + this.list_map_struct_i32 = new ArrayList>(Math.max(0, _list577.size)); + for (int _i578 = 0; + (_list577.size < 0) ? iprot.peekList() : (_i578 < _list577.size); + ++_i578) { - MyEnum _elem470; - _elem470 = MyEnum.findByValue(iprot.readI32()); - this.enum_set.add(_elem470); + Map _elem579; + { + TMap _map580 = iprot.readMapBegin(); + _elem579 = new HashMap(Math.max(0, 2*_map580.size)); + for (int _i581 = 0; + (_map580.size < 0) ? iprot.peekMap() : (_i581 < _map580.size); + ++_i581) + { + MyStruct _key582; + int _val583; + _key582 = new MyStruct(); + _key582.read(iprot); + _val583 = iprot.readI32(); + _elem579.put(_key582, _val583); + } + iprot.readMapEnd(); + } + this.list_map_struct_i32.add(_elem579); } - iprot.readSetEnd(); + iprot.readListEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case STRUCT_MAP: - if (__field.type == TType.MAP) { + case SET_LIST_I32: + if (__field.type == TType.SET) { { - TMap _map471 = iprot.readMapBegin(); - this.struct_map = new HashMap(Math.max(0, 2*_map471.size)); - for (int _i472 = 0; - (_map471.size < 0) ? iprot.peekMap() : (_i472 < _map471.size); - ++_i472) + TSet _set584 = iprot.readSetBegin(); + this.set_list_i32 = new HashSet>(Math.max(0, 2*_set584.size)); + for (int _i585 = 0; + (_set584.size < 0) ? iprot.peekSet() : (_i585 < _set584.size); + ++_i585) { - MyStruct _key473; - long _val474; - _key473 = new MyStruct(); - _key473.read(iprot); - _val474 = iprot.readI64(); - this.struct_map.put(_key473, _val474); + List _elem586; + { + TList _list587 = iprot.readListBegin(); + _elem586 = new ArrayList(Math.max(0, _list587.size)); + for (int _i588 = 0; + (_list587.size < 0) ? iprot.peekList() : (_i588 < _list587.size); + ++_i588) + { + int _elem589; + _elem589 = iprot.readI32(); + _elem586.add(_elem589); + } + iprot.readListEnd(); + } + this.set_list_i32.add(_elem586); } - iprot.readMapEnd(); + iprot.readSetEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case UNION_MAP: - if (__field.type == TType.MAP) { + case SET_LIST_STRUCT: + if (__field.type == TType.SET) { { - TMap _map475 = iprot.readMapBegin(); - this.union_map = new HashMap(Math.max(0, 2*_map475.size)); - for (int _i476 = 0; - (_map475.size < 0) ? iprot.peekMap() : (_i476 < _map475.size); - ++_i476) + TSet _set590 = iprot.readSetBegin(); + this.set_list_struct = new HashSet>(Math.max(0, 2*_set590.size)); + for (int _i591 = 0; + (_set590.size < 0) ? iprot.peekSet() : (_i591 < _set590.size); + ++_i591) { - MyUnion _key477; - long _val478; - _key477 = new MyUnion(); - _key477.read(iprot); - _val478 = iprot.readI64(); - this.union_map.put(_key477, _val478); + List _elem592; + { + TList _list593 = iprot.readListBegin(); + _elem592 = new ArrayList(Math.max(0, _list593.size)); + for (int _i594 = 0; + (_list593.size < 0) ? iprot.peekList() : (_i594 < _list593.size); + ++_i594) + { + MyStruct _elem595; + _elem595 = new MyStruct(); + _elem595.read(iprot); + _elem592.add(_elem595); + } + iprot.readListEnd(); + } + this.set_list_struct.add(_elem592); } - iprot.readMapEnd(); + iprot.readSetEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case ENUM_MAP: - if (__field.type == TType.MAP) { + case SET_SET_I32: + if (__field.type == TType.SET) { { - TMap _map479 = iprot.readMapBegin(); - this.enum_map = new HashMap(Math.max(0, 2*_map479.size)); - for (int _i480 = 0; - (_map479.size < 0) ? iprot.peekMap() : (_i480 < _map479.size); - ++_i480) + TSet _set596 = iprot.readSetBegin(); + this.set_set_i32 = new HashSet>(Math.max(0, 2*_set596.size)); + for (int _i597 = 0; + (_set596.size < 0) ? iprot.peekSet() : (_i597 < _set596.size); + ++_i597) { - MyEnum _key481; - long _val482; - _key481 = MyEnum.findByValue(iprot.readI32()); - _val482 = iprot.readI64(); - this.enum_map.put(_key481, _val482); + Set _elem598; + { + TSet _set599 = iprot.readSetBegin(); + _elem598 = new HashSet(Math.max(0, 2*_set599.size)); + for (int _i600 = 0; + (_set599.size < 0) ? iprot.peekSet() : (_i600 < _set599.size); + ++_i600) + { + int _elem601; + _elem601 = iprot.readI32(); + _elem598.add(_elem601); + } + iprot.readSetEnd(); + } + this.set_set_i32.add(_elem598); } - iprot.readMapEnd(); + iprot.readSetEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case STRUCT_MAP_2: - if (__field.type == TType.MAP) { + case SET_SET_STRUCT: + if (__field.type == TType.SET) { { - TMap _map483 = iprot.readMapBegin(); - this.struct_map_2 = new HashMap(Math.max(0, 2*_map483.size)); - for (int _i484 = 0; - (_map483.size < 0) ? iprot.peekMap() : (_i484 < _map483.size); - ++_i484) + TSet _set602 = iprot.readSetBegin(); + this.set_set_struct = new HashSet>(Math.max(0, 2*_set602.size)); + for (int _i603 = 0; + (_set602.size < 0) ? iprot.peekSet() : (_i603 < _set602.size); + ++_i603) { - int _key485; - MyStruct _val486; - _key485 = iprot.readI32(); - _val486 = new MyStruct(); - _val486.read(iprot); - this.struct_map_2.put(_key485, _val486); + Set _elem604; + { + TSet _set605 = iprot.readSetBegin(); + _elem604 = new HashSet(Math.max(0, 2*_set605.size)); + for (int _i606 = 0; + (_set605.size < 0) ? iprot.peekSet() : (_i606 < _set605.size); + ++_i606) + { + MyStruct _elem607; + _elem607 = new MyStruct(); + _elem607.read(iprot); + _elem604.add(_elem607); + } + iprot.readSetEnd(); + } + this.set_set_struct.add(_elem604); } - iprot.readMapEnd(); + iprot.readSetEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case UNION_MAP_2: - if (__field.type == TType.MAP) { + case SET_MAP_I32_I32: + if (__field.type == TType.SET) { { - TMap _map487 = iprot.readMapBegin(); - this.union_map_2 = new HashMap(Math.max(0, 2*_map487.size)); - for (int _i488 = 0; - (_map487.size < 0) ? iprot.peekMap() : (_i488 < _map487.size); - ++_i488) + TSet _set608 = iprot.readSetBegin(); + this.set_map_i32_i32 = new HashSet>(Math.max(0, 2*_set608.size)); + for (int _i609 = 0; + (_set608.size < 0) ? iprot.peekSet() : (_i609 < _set608.size); + ++_i609) { - int _key489; - MyUnion _val490; - _key489 = iprot.readI32(); - _val490 = new MyUnion(); - _val490.read(iprot); - this.union_map_2.put(_key489, _val490); + Map _elem610; + { + TMap _map611 = iprot.readMapBegin(); + _elem610 = new HashMap(Math.max(0, 2*_map611.size)); + for (int _i612 = 0; + (_map611.size < 0) ? iprot.peekMap() : (_i612 < _map611.size); + ++_i612) + { + int _key613; + int _val614; + _key613 = iprot.readI32(); + _val614 = iprot.readI32(); + _elem610.put(_key613, _val614); + } + iprot.readMapEnd(); + } + this.set_map_i32_i32.add(_elem610); } - iprot.readMapEnd(); + iprot.readSetEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case ENUM_MAP_2: - if (__field.type == TType.MAP) { + case SET_MAP_I32_STRUCT: + if (__field.type == TType.SET) { { - TMap _map491 = iprot.readMapBegin(); - this.enum_map_2 = new HashMap(Math.max(0, 2*_map491.size)); - for (int _i492 = 0; - (_map491.size < 0) ? iprot.peekMap() : (_i492 < _map491.size); - ++_i492) + TSet _set615 = iprot.readSetBegin(); + this.set_map_i32_struct = new HashSet>(Math.max(0, 2*_set615.size)); + for (int _i616 = 0; + (_set615.size < 0) ? iprot.peekSet() : (_i616 < _set615.size); + ++_i616) { - int _key493; - MyEnum _val494; - _key493 = iprot.readI32(); - _val494 = MyEnum.findByValue(iprot.readI32()); - this.enum_map_2.put(_key493, _val494); + Map _elem617; + { + TMap _map618 = iprot.readMapBegin(); + _elem617 = new HashMap(Math.max(0, 2*_map618.size)); + for (int _i619 = 0; + (_map618.size < 0) ? iprot.peekMap() : (_i619 < _map618.size); + ++_i619) + { + int _key620; + MyStruct _val621; + _key620 = iprot.readI32(); + _val621 = new MyStruct(); + _val621.read(iprot); + _elem617.put(_key620, _val621); + } + iprot.readMapEnd(); + } + this.set_map_i32_struct.add(_elem617); } - iprot.readMapEnd(); + iprot.readSetEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case LIST_MAP: - if (__field.type == TType.MAP) { + case SET_MAP_STRUCT_I32: + if (__field.type == TType.SET) { { - TMap _map495 = iprot.readMapBegin(); - this.list_map = new HashMap,Integer>(Math.max(0, 2*_map495.size)); - for (int _i496 = 0; - (_map495.size < 0) ? iprot.peekMap() : (_i496 < _map495.size); - ++_i496) + TSet _set622 = iprot.readSetBegin(); + this.set_map_struct_i32 = new HashSet>(Math.max(0, 2*_set622.size)); + for (int _i623 = 0; + (_set622.size < 0) ? iprot.peekSet() : (_i623 < _set622.size); + ++_i623) { - List _key497; - int _val498; + Map _elem624; { - TList _list499 = iprot.readListBegin(); - _key497 = new ArrayList(Math.max(0, _list499.size)); - for (int _i500 = 0; - (_list499.size < 0) ? iprot.peekList() : (_i500 < _list499.size); - ++_i500) + TMap _map625 = iprot.readMapBegin(); + _elem624 = new HashMap(Math.max(0, 2*_map625.size)); + for (int _i626 = 0; + (_map625.size < 0) ? iprot.peekMap() : (_i626 < _map625.size); + ++_i626) { - int _elem501; - _elem501 = iprot.readI32(); - _key497.add(_elem501); + MyStruct _key627; + int _val628; + _key627 = new MyStruct(); + _key627.read(iprot); + _val628 = iprot.readI32(); + _elem624.put(_key627, _val628); } - iprot.readListEnd(); + iprot.readMapEnd(); } - _val498 = iprot.readI32(); - this.list_map.put(_key497, _val498); + this.set_map_struct_i32.add(_elem624); } - iprot.readMapEnd(); + iprot.readSetEnd(); } } else { TProtocolUtil.skip(iprot, __field.type); } break; - case LIST_MAP_2: + case MAP_I32_MAP_I32_I32: if (__field.type == TType.MAP) { { - TMap _map502 = iprot.readMapBegin(); - this.list_map_2 = new HashMap>(Math.max(0, 2*_map502.size)); - for (int _i503 = 0; - (_map502.size < 0) ? iprot.peekMap() : (_i503 < _map502.size); - ++_i503) + TMap _map629 = iprot.readMapBegin(); + this.map_i32_map_i32_i32 = new HashMap>(Math.max(0, 2*_map629.size)); + for (int _i630 = 0; + (_map629.size < 0) ? iprot.peekMap() : (_i630 < _map629.size); + ++_i630) { - int _key504; - List _val505; - _key504 = iprot.readI32(); + int _key631; + Map _val632; + _key631 = iprot.readI32(); { - TList _list506 = iprot.readListBegin(); - _val505 = new ArrayList(Math.max(0, _list506.size)); - for (int _i507 = 0; - (_list506.size < 0) ? iprot.peekList() : (_i507 < _list506.size); - ++_i507) + TMap _map633 = iprot.readMapBegin(); + _val632 = new HashMap(Math.max(0, 2*_map633.size)); + for (int _i634 = 0; + (_map633.size < 0) ? iprot.peekMap() : (_i634 < _map633.size); + ++_i634) { - int _elem508; - _elem508 = iprot.readI32(); - _val505.add(_elem508); + int _key635; + int _val636; + _key635 = iprot.readI32(); + _val636 = iprot.readI32(); + _val632.put(_key635, _val636); } - iprot.readListEnd(); + iprot.readMapEnd(); } - this.list_map_2.put(_key504, _val505); + this.map_i32_map_i32_i32.put(_key631, _val632); } iprot.readMapEnd(); } @@ -1439,32 +3146,35 @@ public void read(TProtocol iprot) throws TException { TProtocolUtil.skip(iprot, __field.type); } break; - case SET_MAP: + case MAP_I32_MAP_STRUCT_I32: if (__field.type == TType.MAP) { { - TMap _map509 = iprot.readMapBegin(); - this.set_map = new HashMap,Integer>(Math.max(0, 2*_map509.size)); - for (int _i510 = 0; - (_map509.size < 0) ? iprot.peekMap() : (_i510 < _map509.size); - ++_i510) + TMap _map637 = iprot.readMapBegin(); + this.map_i32_map_struct_i32 = new HashMap>(Math.max(0, 2*_map637.size)); + for (int _i638 = 0; + (_map637.size < 0) ? iprot.peekMap() : (_i638 < _map637.size); + ++_i638) { - Set _key511; - int _val512; + int _key639; + Map _val640; + _key639 = iprot.readI32(); { - TSet _set513 = iprot.readSetBegin(); - _key511 = new HashSet(Math.max(0, 2*_set513.size)); - for (int _i514 = 0; - (_set513.size < 0) ? iprot.peekSet() : (_i514 < _set513.size); - ++_i514) + TMap _map641 = iprot.readMapBegin(); + _val640 = new HashMap(Math.max(0, 2*_map641.size)); + for (int _i642 = 0; + (_map641.size < 0) ? iprot.peekMap() : (_i642 < _map641.size); + ++_i642) { - int _elem515; - _elem515 = iprot.readI32(); - _key511.add(_elem515); + MyStruct _key643; + int _val644; + _key643 = new MyStruct(); + _key643.read(iprot); + _val644 = iprot.readI32(); + _val640.put(_key643, _val644); } - iprot.readSetEnd(); + iprot.readMapEnd(); } - _val512 = iprot.readI32(); - this.set_map.put(_key511, _val512); + this.map_i32_map_struct_i32.put(_key639, _val640); } iprot.readMapEnd(); } @@ -1472,32 +3182,35 @@ public void read(TProtocol iprot) throws TException { TProtocolUtil.skip(iprot, __field.type); } break; - case SET_MAP_2: + case MAP_I32_MAP_I32_STRUCT: if (__field.type == TType.MAP) { { - TMap _map516 = iprot.readMapBegin(); - this.set_map_2 = new HashMap>(Math.max(0, 2*_map516.size)); - for (int _i517 = 0; - (_map516.size < 0) ? iprot.peekMap() : (_i517 < _map516.size); - ++_i517) - { - int _key518; - Set _val519; - _key518 = iprot.readI32(); + TMap _map645 = iprot.readMapBegin(); + this.map_i32_map_i32_struct = new HashMap>(Math.max(0, 2*_map645.size)); + for (int _i646 = 0; + (_map645.size < 0) ? iprot.peekMap() : (_i646 < _map645.size); + ++_i646) + { + int _key647; + Map _val648; + _key647 = iprot.readI32(); { - TSet _set520 = iprot.readSetBegin(); - _val519 = new HashSet(Math.max(0, 2*_set520.size)); - for (int _i521 = 0; - (_set520.size < 0) ? iprot.peekSet() : (_i521 < _set520.size); - ++_i521) + TMap _map649 = iprot.readMapBegin(); + _val648 = new HashMap(Math.max(0, 2*_map649.size)); + for (int _i650 = 0; + (_map649.size < 0) ? iprot.peekMap() : (_i650 < _map649.size); + ++_i650) { - int _elem522; - _elem522 = iprot.readI32(); - _val519.add(_elem522); + int _key651; + MyStruct _val652; + _key651 = iprot.readI32(); + _val652 = new MyStruct(); + _val652.read(iprot); + _val648.put(_key651, _val652); } - iprot.readSetEnd(); + iprot.readMapEnd(); } - this.set_map_2.put(_key518, _val519); + this.map_i32_map_i32_struct.put(_key647, _val648); } iprot.readMapEnd(); } @@ -1505,34 +3218,46 @@ public void read(TProtocol iprot) throws TException { TProtocolUtil.skip(iprot, __field.type); } break; - case MAP_MAP: + case MAP_I32_MAP_LIST_I32_I32: if (__field.type == TType.MAP) { { - TMap _map523 = iprot.readMapBegin(); - this.map_map = new HashMap,Integer>(Math.max(0, 2*_map523.size)); - for (int _i524 = 0; - (_map523.size < 0) ? iprot.peekMap() : (_i524 < _map523.size); - ++_i524) + TMap _map653 = iprot.readMapBegin(); + this.map_i32_map_list_i32_i32 = new HashMap>>(Math.max(0, 2*_map653.size)); + for (int _i654 = 0; + (_map653.size < 0) ? iprot.peekMap() : (_i654 < _map653.size); + ++_i654) { - Map _key525; - int _val526; + int _key655; + List> _val656; + _key655 = iprot.readI32(); { - TMap _map527 = iprot.readMapBegin(); - _key525 = new HashMap(Math.max(0, 2*_map527.size)); - for (int _i528 = 0; - (_map527.size < 0) ? iprot.peekMap() : (_i528 < _map527.size); - ++_i528) + TList _list657 = iprot.readListBegin(); + _val656 = new ArrayList>(Math.max(0, _list657.size)); + for (int _i658 = 0; + (_list657.size < 0) ? iprot.peekList() : (_i658 < _list657.size); + ++_i658) { - int _key529; - int _val530; - _key529 = iprot.readI32(); - _val530 = iprot.readI32(); - _key525.put(_key529, _val530); + Map _elem659; + { + TMap _map660 = iprot.readMapBegin(); + _elem659 = new HashMap(Math.max(0, 2*_map660.size)); + for (int _i661 = 0; + (_map660.size < 0) ? iprot.peekMap() : (_i661 < _map660.size); + ++_i661) + { + int _key662; + int _val663; + _key662 = iprot.readI32(); + _val663 = iprot.readI32(); + _elem659.put(_key662, _val663); + } + iprot.readMapEnd(); + } + _val656.add(_elem659); } - iprot.readMapEnd(); + iprot.readListEnd(); } - _val526 = iprot.readI32(); - this.map_map.put(_key525, _val526); + this.map_i32_map_list_i32_i32.put(_key655, _val656); } iprot.readMapEnd(); } @@ -1540,34 +3265,47 @@ public void read(TProtocol iprot) throws TException { TProtocolUtil.skip(iprot, __field.type); } break; - case MAP_MAP_2: + case MAP_I32_MAP_LIST_STRUCT_I32: if (__field.type == TType.MAP) { { - TMap _map531 = iprot.readMapBegin(); - this.map_map_2 = new HashMap>(Math.max(0, 2*_map531.size)); - for (int _i532 = 0; - (_map531.size < 0) ? iprot.peekMap() : (_i532 < _map531.size); - ++_i532) + TMap _map664 = iprot.readMapBegin(); + this.map_i32_map_list_struct_i32 = new HashMap>>(Math.max(0, 2*_map664.size)); + for (int _i665 = 0; + (_map664.size < 0) ? iprot.peekMap() : (_i665 < _map664.size); + ++_i665) { - int _key533; - Map _val534; - _key533 = iprot.readI32(); + int _key666; + List> _val667; + _key666 = iprot.readI32(); { - TMap _map535 = iprot.readMapBegin(); - _val534 = new HashMap(Math.max(0, 2*_map535.size)); - for (int _i536 = 0; - (_map535.size < 0) ? iprot.peekMap() : (_i536 < _map535.size); - ++_i536) + TList _list668 = iprot.readListBegin(); + _val667 = new ArrayList>(Math.max(0, _list668.size)); + for (int _i669 = 0; + (_list668.size < 0) ? iprot.peekList() : (_i669 < _list668.size); + ++_i669) { - int _key537; - int _val538; - _key537 = iprot.readI32(); - _val538 = iprot.readI32(); - _val534.put(_key537, _val538); + Map _elem670; + { + TMap _map671 = iprot.readMapBegin(); + _elem670 = new HashMap(Math.max(0, 2*_map671.size)); + for (int _i672 = 0; + (_map671.size < 0) ? iprot.peekMap() : (_i672 < _map671.size); + ++_i672) + { + MyStruct _key673; + int _val674; + _key673 = new MyStruct(); + _key673.read(iprot); + _val674 = iprot.readI32(); + _elem670.put(_key673, _val674); + } + iprot.readMapEnd(); + } + _val667.add(_elem670); } - iprot.readMapEnd(); + iprot.readListEnd(); } - this.map_map_2.put(_key533, _val534); + this.map_i32_map_list_struct_i32.put(_key666, _val667); } iprot.readMapEnd(); } @@ -1596,8 +3334,8 @@ public void write(TProtocol oprot) throws TException { oprot.writeFieldBegin(STRUCT_LIST_FIELD_DESC); { oprot.writeListBegin(new TList(TType.STRUCT, this.struct_list.size())); - for (MyStruct _iter539 : this.struct_list) { - _iter539.write(oprot); + for (MyStruct _iter675 : this.struct_list) { + _iter675.write(oprot); } oprot.writeListEnd(); } @@ -1607,8 +3345,8 @@ public void write(TProtocol oprot) throws TException { oprot.writeFieldBegin(UNION_LIST_FIELD_DESC); { oprot.writeListBegin(new TList(TType.STRUCT, this.union_list.size())); - for (MyUnion _iter540 : this.union_list) { - _iter540.write(oprot); + for (MyUnion _iter676 : this.union_list) { + _iter676.write(oprot); } oprot.writeListEnd(); } @@ -1618,8 +3356,8 @@ public void write(TProtocol oprot) throws TException { oprot.writeFieldBegin(ENUM_LIST_FIELD_DESC); { oprot.writeListBegin(new TList(TType.I32, this.enum_list.size())); - for (MyEnum _iter541 : this.enum_list) { - oprot.writeI32(_iter541 == null ? 0 : _iter541.getValue()); + for (MyEnum _iter677 : this.enum_list) { + oprot.writeI32(_iter677 == null ? 0 : _iter677.getValue()); } oprot.writeListEnd(); } @@ -1629,8 +3367,8 @@ public void write(TProtocol oprot) throws TException { oprot.writeFieldBegin(STRUCT_SET_FIELD_DESC); { oprot.writeSetBegin(new TSet(TType.STRUCT, this.struct_set.size())); - for (MyStruct _iter542 : this.struct_set) { - _iter542.write(oprot); + for (MyStruct _iter678 : this.struct_set) { + _iter678.write(oprot); } oprot.writeSetEnd(); } @@ -1640,200 +3378,551 @@ public void write(TProtocol oprot) throws TException { oprot.writeFieldBegin(UNION_SET_FIELD_DESC); { oprot.writeSetBegin(new TSet(TType.STRUCT, this.union_set.size())); - for (MyUnion _iter543 : this.union_set) { - _iter543.write(oprot); + for (MyUnion _iter679 : this.union_set) { + _iter679.write(oprot); + } + oprot.writeSetEnd(); + } + oprot.writeFieldEnd(); + } + if (this.enum_set != null) { + oprot.writeFieldBegin(ENUM_SET_FIELD_DESC); + { + oprot.writeSetBegin(new TSet(TType.I32, this.enum_set.size())); + for (MyEnum _iter680 : this.enum_set) { + oprot.writeI32(_iter680 == null ? 0 : _iter680.getValue()); + } + oprot.writeSetEnd(); + } + oprot.writeFieldEnd(); + } + if (this.struct_map != null) { + oprot.writeFieldBegin(STRUCT_MAP_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I64, this.struct_map.size())); + for (Map.Entry _iter681 : this.struct_map.entrySet()) { + _iter681.getKey().write(oprot); + oprot.writeI64(_iter681.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.union_map != null) { + oprot.writeFieldBegin(UNION_MAP_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I64, this.union_map.size())); + for (Map.Entry _iter682 : this.union_map.entrySet()) { + _iter682.getKey().write(oprot); + oprot.writeI64(_iter682.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.enum_map != null) { + oprot.writeFieldBegin(ENUM_MAP_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.I32, TType.I64, this.enum_map.size())); + for (Map.Entry _iter683 : this.enum_map.entrySet()) { + oprot.writeI32(_iter683.getKey() == null ? 0 : _iter683.getKey().getValue()); + oprot.writeI64(_iter683.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.struct_map_2 != null) { + oprot.writeFieldBegin(STRUCT_MAP_2_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, this.struct_map_2.size())); + for (Map.Entry _iter684 : this.struct_map_2.entrySet()) { + oprot.writeI32(_iter684.getKey()); + _iter684.getValue().write(oprot); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.union_map_2 != null) { + oprot.writeFieldBegin(UNION_MAP_2_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, this.union_map_2.size())); + for (Map.Entry _iter685 : this.union_map_2.entrySet()) { + oprot.writeI32(_iter685.getKey()); + _iter685.getValue().write(oprot); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.enum_map_2 != null) { + oprot.writeFieldBegin(ENUM_MAP_2_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, this.enum_map_2.size())); + for (Map.Entry _iter686 : this.enum_map_2.entrySet()) { + oprot.writeI32(_iter686.getKey()); + oprot.writeI32(_iter686.getValue() == null ? 0 : _iter686.getValue().getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.list_map != null) { + oprot.writeFieldBegin(LIST_MAP_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.LIST, TType.I32, this.list_map.size())); + for (Map.Entry, Integer> _iter687 : this.list_map.entrySet()) { + { + oprot.writeListBegin(new TList(TType.I32, _iter687.getKey().size())); + for (int _iter688 : _iter687.getKey()) { + oprot.writeI32(_iter688); + } + oprot.writeListEnd(); + } + oprot.writeI32(_iter687.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.list_map_2 != null) { + oprot.writeFieldBegin(LIST_MAP_2_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.I32, TType.LIST, this.list_map_2.size())); + for (Map.Entry> _iter689 : this.list_map_2.entrySet()) { + oprot.writeI32(_iter689.getKey()); + { + oprot.writeListBegin(new TList(TType.I32, _iter689.getValue().size())); + for (int _iter690 : _iter689.getValue()) { + oprot.writeI32(_iter690); + } + oprot.writeListEnd(); + } + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.set_map != null) { + oprot.writeFieldBegin(SET_MAP_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.SET, TType.I32, this.set_map.size())); + for (Map.Entry, Integer> _iter691 : this.set_map.entrySet()) { + { + oprot.writeSetBegin(new TSet(TType.I32, _iter691.getKey().size())); + for (int _iter692 : _iter691.getKey()) { + oprot.writeI32(_iter692); + } + oprot.writeSetEnd(); + } + oprot.writeI32(_iter691.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.set_map_2 != null) { + oprot.writeFieldBegin(SET_MAP_2_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.I32, TType.SET, this.set_map_2.size())); + for (Map.Entry> _iter693 : this.set_map_2.entrySet()) { + oprot.writeI32(_iter693.getKey()); + { + oprot.writeSetBegin(new TSet(TType.I32, _iter693.getValue().size())); + for (int _iter694 : _iter693.getValue()) { + oprot.writeI32(_iter694); + } + oprot.writeSetEnd(); + } + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.map_map != null) { + oprot.writeFieldBegin(MAP_MAP_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.MAP, TType.I32, this.map_map.size())); + for (Map.Entry, Integer> _iter695 : this.map_map.entrySet()) { + { + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter695.getKey().size())); + for (Map.Entry _iter696 : _iter695.getKey().entrySet()) { + oprot.writeI32(_iter696.getKey()); + oprot.writeI32(_iter696.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeI32(_iter695.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.map_map_2 != null) { + oprot.writeFieldBegin(MAP_MAP_2_FIELD_DESC); + { + oprot.writeMapBegin(new TMap(TType.I32, TType.MAP, this.map_map_2.size())); + for (Map.Entry> _iter697 : this.map_map_2.entrySet()) { + oprot.writeI32(_iter697.getKey()); + { + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter697.getValue().size())); + for (Map.Entry _iter698 : _iter697.getValue().entrySet()) { + oprot.writeI32(_iter698.getKey()); + oprot.writeI32(_iter698.getValue()); + } + oprot.writeMapEnd(); + } + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + if (this.list_list_i32 != null) { + oprot.writeFieldBegin(LIST_LIST_I32_FIELD_DESC); + { + oprot.writeListBegin(new TList(TType.LIST, this.list_list_i32.size())); + for (List _iter699 : this.list_list_i32) { + { + oprot.writeListBegin(new TList(TType.I32, _iter699.size())); + for (int _iter700 : _iter699) { + oprot.writeI32(_iter700); + } + oprot.writeListEnd(); + } + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + if (this.list_list_struct != null) { + oprot.writeFieldBegin(LIST_LIST_STRUCT_FIELD_DESC); + { + oprot.writeListBegin(new TList(TType.LIST, this.list_list_struct.size())); + for (List _iter701 : this.list_list_struct) { + { + oprot.writeListBegin(new TList(TType.STRUCT, _iter701.size())); + for (MyStruct _iter702 : _iter701) { + _iter702.write(oprot); + } + oprot.writeListEnd(); + } + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + if (this.list_set_i32 != null) { + oprot.writeFieldBegin(LIST_SET_I32_FIELD_DESC); + { + oprot.writeListBegin(new TList(TType.SET, this.list_set_i32.size())); + for (Set _iter703 : this.list_set_i32) { + { + oprot.writeSetBegin(new TSet(TType.I32, _iter703.size())); + for (int _iter704 : _iter703) { + oprot.writeI32(_iter704); + } + oprot.writeSetEnd(); + } + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + if (this.list_set_struct != null) { + oprot.writeFieldBegin(LIST_SET_STRUCT_FIELD_DESC); + { + oprot.writeListBegin(new TList(TType.SET, this.list_set_struct.size())); + for (Set _iter705 : this.list_set_struct) { + { + oprot.writeSetBegin(new TSet(TType.STRUCT, _iter705.size())); + for (MyStruct _iter706 : _iter705) { + _iter706.write(oprot); + } + oprot.writeSetEnd(); + } + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + if (this.list_map_i32_i32 != null) { + oprot.writeFieldBegin(LIST_MAP_I32_I32_FIELD_DESC); + { + oprot.writeListBegin(new TList(TType.MAP, this.list_map_i32_i32.size())); + for (Map _iter707 : this.list_map_i32_i32) { + { + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter707.size())); + for (Map.Entry _iter708 : _iter707.entrySet()) { + oprot.writeI32(_iter708.getKey()); + oprot.writeI32(_iter708.getValue()); + } + oprot.writeMapEnd(); + } + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + if (this.list_map_i32_struct != null) { + oprot.writeFieldBegin(LIST_MAP_I32_STRUCT_FIELD_DESC); + { + oprot.writeListBegin(new TList(TType.MAP, this.list_map_i32_struct.size())); + for (Map _iter709 : this.list_map_i32_struct) { + { + oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, _iter709.size())); + for (Map.Entry _iter710 : _iter709.entrySet()) { + oprot.writeI32(_iter710.getKey()); + _iter710.getValue().write(oprot); + } + oprot.writeMapEnd(); + } } - oprot.writeSetEnd(); + oprot.writeListEnd(); } oprot.writeFieldEnd(); } - if (this.enum_set != null) { - oprot.writeFieldBegin(ENUM_SET_FIELD_DESC); + if (this.list_map_struct_i32 != null) { + oprot.writeFieldBegin(LIST_MAP_STRUCT_I32_FIELD_DESC); { - oprot.writeSetBegin(new TSet(TType.I32, this.enum_set.size())); - for (MyEnum _iter544 : this.enum_set) { - oprot.writeI32(_iter544 == null ? 0 : _iter544.getValue()); + oprot.writeListBegin(new TList(TType.MAP, this.list_map_struct_i32.size())); + for (Map _iter711 : this.list_map_struct_i32) { + { + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I32, _iter711.size())); + for (Map.Entry _iter712 : _iter711.entrySet()) { + _iter712.getKey().write(oprot); + oprot.writeI32(_iter712.getValue()); + } + oprot.writeMapEnd(); + } } - oprot.writeSetEnd(); + oprot.writeListEnd(); } oprot.writeFieldEnd(); } - if (this.struct_map != null) { - oprot.writeFieldBegin(STRUCT_MAP_FIELD_DESC); + if (this.set_list_i32 != null) { + oprot.writeFieldBegin(SET_LIST_I32_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I64, this.struct_map.size())); - for (Map.Entry _iter545 : this.struct_map.entrySet()) { - _iter545.getKey().write(oprot); - oprot.writeI64(_iter545.getValue()); + oprot.writeSetBegin(new TSet(TType.LIST, this.set_list_i32.size())); + for (List _iter713 : this.set_list_i32) { + { + oprot.writeListBegin(new TList(TType.I32, _iter713.size())); + for (int _iter714 : _iter713) { + oprot.writeI32(_iter714); + } + oprot.writeListEnd(); + } } - oprot.writeMapEnd(); + oprot.writeSetEnd(); } oprot.writeFieldEnd(); } - if (this.union_map != null) { - oprot.writeFieldBegin(UNION_MAP_FIELD_DESC); + if (this.set_list_struct != null) { + oprot.writeFieldBegin(SET_LIST_STRUCT_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I64, this.union_map.size())); - for (Map.Entry _iter546 : this.union_map.entrySet()) { - _iter546.getKey().write(oprot); - oprot.writeI64(_iter546.getValue()); + oprot.writeSetBegin(new TSet(TType.LIST, this.set_list_struct.size())); + for (List _iter715 : this.set_list_struct) { + { + oprot.writeListBegin(new TList(TType.STRUCT, _iter715.size())); + for (MyStruct _iter716 : _iter715) { + _iter716.write(oprot); + } + oprot.writeListEnd(); + } } - oprot.writeMapEnd(); + oprot.writeSetEnd(); } oprot.writeFieldEnd(); } - if (this.enum_map != null) { - oprot.writeFieldBegin(ENUM_MAP_FIELD_DESC); + if (this.set_set_i32 != null) { + oprot.writeFieldBegin(SET_SET_I32_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.I32, TType.I64, this.enum_map.size())); - for (Map.Entry _iter547 : this.enum_map.entrySet()) { - oprot.writeI32(_iter547.getKey() == null ? 0 : _iter547.getKey().getValue()); - oprot.writeI64(_iter547.getValue()); + oprot.writeSetBegin(new TSet(TType.SET, this.set_set_i32.size())); + for (Set _iter717 : this.set_set_i32) { + { + oprot.writeSetBegin(new TSet(TType.I32, _iter717.size())); + for (int _iter718 : _iter717) { + oprot.writeI32(_iter718); + } + oprot.writeSetEnd(); + } } - oprot.writeMapEnd(); + oprot.writeSetEnd(); } oprot.writeFieldEnd(); } - if (this.struct_map_2 != null) { - oprot.writeFieldBegin(STRUCT_MAP_2_FIELD_DESC); + if (this.set_set_struct != null) { + oprot.writeFieldBegin(SET_SET_STRUCT_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, this.struct_map_2.size())); - for (Map.Entry _iter548 : this.struct_map_2.entrySet()) { - oprot.writeI32(_iter548.getKey()); - _iter548.getValue().write(oprot); + oprot.writeSetBegin(new TSet(TType.SET, this.set_set_struct.size())); + for (Set _iter719 : this.set_set_struct) { + { + oprot.writeSetBegin(new TSet(TType.STRUCT, _iter719.size())); + for (MyStruct _iter720 : _iter719) { + _iter720.write(oprot); + } + oprot.writeSetEnd(); + } } - oprot.writeMapEnd(); + oprot.writeSetEnd(); } oprot.writeFieldEnd(); } - if (this.union_map_2 != null) { - oprot.writeFieldBegin(UNION_MAP_2_FIELD_DESC); + if (this.set_map_i32_i32 != null) { + oprot.writeFieldBegin(SET_MAP_I32_I32_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, this.union_map_2.size())); - for (Map.Entry _iter549 : this.union_map_2.entrySet()) { - oprot.writeI32(_iter549.getKey()); - _iter549.getValue().write(oprot); + oprot.writeSetBegin(new TSet(TType.MAP, this.set_map_i32_i32.size())); + for (Map _iter721 : this.set_map_i32_i32) { + { + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter721.size())); + for (Map.Entry _iter722 : _iter721.entrySet()) { + oprot.writeI32(_iter722.getKey()); + oprot.writeI32(_iter722.getValue()); + } + oprot.writeMapEnd(); + } } - oprot.writeMapEnd(); + oprot.writeSetEnd(); } oprot.writeFieldEnd(); } - if (this.enum_map_2 != null) { - oprot.writeFieldBegin(ENUM_MAP_2_FIELD_DESC); + if (this.set_map_i32_struct != null) { + oprot.writeFieldBegin(SET_MAP_I32_STRUCT_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.I32, TType.I32, this.enum_map_2.size())); - for (Map.Entry _iter550 : this.enum_map_2.entrySet()) { - oprot.writeI32(_iter550.getKey()); - oprot.writeI32(_iter550.getValue() == null ? 0 : _iter550.getValue().getValue()); + oprot.writeSetBegin(new TSet(TType.MAP, this.set_map_i32_struct.size())); + for (Map _iter723 : this.set_map_i32_struct) { + { + oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, _iter723.size())); + for (Map.Entry _iter724 : _iter723.entrySet()) { + oprot.writeI32(_iter724.getKey()); + _iter724.getValue().write(oprot); + } + oprot.writeMapEnd(); + } } - oprot.writeMapEnd(); + oprot.writeSetEnd(); } oprot.writeFieldEnd(); } - if (this.list_map != null) { - oprot.writeFieldBegin(LIST_MAP_FIELD_DESC); + if (this.set_map_struct_i32 != null) { + oprot.writeFieldBegin(SET_MAP_STRUCT_I32_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.LIST, TType.I32, this.list_map.size())); - for (Map.Entry, Integer> _iter551 : this.list_map.entrySet()) { + oprot.writeSetBegin(new TSet(TType.MAP, this.set_map_struct_i32.size())); + for (Map _iter725 : this.set_map_struct_i32) { { - oprot.writeListBegin(new TList(TType.I32, _iter551.getKey().size())); - for (int _iter552 : _iter551.getKey()) { - oprot.writeI32(_iter552); + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I32, _iter725.size())); + for (Map.Entry _iter726 : _iter725.entrySet()) { + _iter726.getKey().write(oprot); + oprot.writeI32(_iter726.getValue()); } - oprot.writeListEnd(); + oprot.writeMapEnd(); } - oprot.writeI32(_iter551.getValue()); } - oprot.writeMapEnd(); + oprot.writeSetEnd(); } oprot.writeFieldEnd(); } - if (this.list_map_2 != null) { - oprot.writeFieldBegin(LIST_MAP_2_FIELD_DESC); + if (this.map_i32_map_i32_i32 != null) { + oprot.writeFieldBegin(MAP_I32_MAP_I32_I32_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.I32, TType.LIST, this.list_map_2.size())); - for (Map.Entry> _iter553 : this.list_map_2.entrySet()) { - oprot.writeI32(_iter553.getKey()); + oprot.writeMapBegin(new TMap(TType.I32, TType.MAP, this.map_i32_map_i32_i32.size())); + for (Map.Entry> _iter727 : this.map_i32_map_i32_i32.entrySet()) { + oprot.writeI32(_iter727.getKey()); { - oprot.writeListBegin(new TList(TType.I32, _iter553.getValue().size())); - for (int _iter554 : _iter553.getValue()) { - oprot.writeI32(_iter554); + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter727.getValue().size())); + for (Map.Entry _iter728 : _iter727.getValue().entrySet()) { + oprot.writeI32(_iter728.getKey()); + oprot.writeI32(_iter728.getValue()); } - oprot.writeListEnd(); + oprot.writeMapEnd(); } } oprot.writeMapEnd(); } oprot.writeFieldEnd(); } - if (this.set_map != null) { - oprot.writeFieldBegin(SET_MAP_FIELD_DESC); + if (this.map_i32_map_struct_i32 != null) { + oprot.writeFieldBegin(MAP_I32_MAP_STRUCT_I32_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.SET, TType.I32, this.set_map.size())); - for (Map.Entry, Integer> _iter555 : this.set_map.entrySet()) { + oprot.writeMapBegin(new TMap(TType.I32, TType.MAP, this.map_i32_map_struct_i32.size())); + for (Map.Entry> _iter729 : this.map_i32_map_struct_i32.entrySet()) { + oprot.writeI32(_iter729.getKey()); { - oprot.writeSetBegin(new TSet(TType.I32, _iter555.getKey().size())); - for (int _iter556 : _iter555.getKey()) { - oprot.writeI32(_iter556); + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I32, _iter729.getValue().size())); + for (Map.Entry _iter730 : _iter729.getValue().entrySet()) { + _iter730.getKey().write(oprot); + oprot.writeI32(_iter730.getValue()); } - oprot.writeSetEnd(); + oprot.writeMapEnd(); } - oprot.writeI32(_iter555.getValue()); } oprot.writeMapEnd(); } oprot.writeFieldEnd(); } - if (this.set_map_2 != null) { - oprot.writeFieldBegin(SET_MAP_2_FIELD_DESC); + if (this.map_i32_map_i32_struct != null) { + oprot.writeFieldBegin(MAP_I32_MAP_I32_STRUCT_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.I32, TType.SET, this.set_map_2.size())); - for (Map.Entry> _iter557 : this.set_map_2.entrySet()) { - oprot.writeI32(_iter557.getKey()); + oprot.writeMapBegin(new TMap(TType.I32, TType.MAP, this.map_i32_map_i32_struct.size())); + for (Map.Entry> _iter731 : this.map_i32_map_i32_struct.entrySet()) { + oprot.writeI32(_iter731.getKey()); { - oprot.writeSetBegin(new TSet(TType.I32, _iter557.getValue().size())); - for (int _iter558 : _iter557.getValue()) { - oprot.writeI32(_iter558); + oprot.writeMapBegin(new TMap(TType.I32, TType.STRUCT, _iter731.getValue().size())); + for (Map.Entry _iter732 : _iter731.getValue().entrySet()) { + oprot.writeI32(_iter732.getKey()); + _iter732.getValue().write(oprot); } - oprot.writeSetEnd(); + oprot.writeMapEnd(); } } oprot.writeMapEnd(); } oprot.writeFieldEnd(); } - if (this.map_map != null) { - oprot.writeFieldBegin(MAP_MAP_FIELD_DESC); + if (this.map_i32_map_list_i32_i32 != null) { + oprot.writeFieldBegin(MAP_I32_MAP_LIST_I32_I32_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.MAP, TType.I32, this.map_map.size())); - for (Map.Entry, Integer> _iter559 : this.map_map.entrySet()) { + oprot.writeMapBegin(new TMap(TType.I32, TType.LIST, this.map_i32_map_list_i32_i32.size())); + for (Map.Entry>> _iter733 : this.map_i32_map_list_i32_i32.entrySet()) { + oprot.writeI32(_iter733.getKey()); { - oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter559.getKey().size())); - for (Map.Entry _iter560 : _iter559.getKey().entrySet()) { - oprot.writeI32(_iter560.getKey()); - oprot.writeI32(_iter560.getValue()); + oprot.writeListBegin(new TList(TType.MAP, _iter733.getValue().size())); + for (Map _iter734 : _iter733.getValue()) { + { + oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter734.size())); + for (Map.Entry _iter735 : _iter734.entrySet()) { + oprot.writeI32(_iter735.getKey()); + oprot.writeI32(_iter735.getValue()); + } + oprot.writeMapEnd(); + } } - oprot.writeMapEnd(); + oprot.writeListEnd(); } - oprot.writeI32(_iter559.getValue()); } oprot.writeMapEnd(); } oprot.writeFieldEnd(); } - if (this.map_map_2 != null) { - oprot.writeFieldBegin(MAP_MAP_2_FIELD_DESC); + if (this.map_i32_map_list_struct_i32 != null) { + oprot.writeFieldBegin(MAP_I32_MAP_LIST_STRUCT_I32_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.I32, TType.MAP, this.map_map_2.size())); - for (Map.Entry> _iter561 : this.map_map_2.entrySet()) { - oprot.writeI32(_iter561.getKey()); + oprot.writeMapBegin(new TMap(TType.I32, TType.LIST, this.map_i32_map_list_struct_i32.size())); + for (Map.Entry>> _iter736 : this.map_i32_map_list_struct_i32.entrySet()) { + oprot.writeI32(_iter736.getKey()); { - oprot.writeMapBegin(new TMap(TType.I32, TType.I32, _iter561.getValue().size())); - for (Map.Entry _iter562 : _iter561.getValue().entrySet()) { - oprot.writeI32(_iter562.getKey()); - oprot.writeI32(_iter562.getValue()); + oprot.writeListBegin(new TList(TType.MAP, _iter736.getValue().size())); + for (Map _iter737 : _iter736.getValue()) { + { + oprot.writeMapBegin(new TMap(TType.STRUCT, TType.I32, _iter737.size())); + for (Map.Entry _iter738 : _iter737.entrySet()) { + _iter738.getKey().write(oprot); + oprot.writeI32(_iter738.getValue()); + } + oprot.writeMapEnd(); + } } - oprot.writeMapEnd(); + oprot.writeListEnd(); } } oprot.writeMapEnd(); @@ -2057,6 +4146,215 @@ public String toString(int indent, boolean prettyPrint) { sb.append(TBaseHelper.toString(this.getMap_map_2(), indent + 1, prettyPrint)); } first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("list_list_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getList_list_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getList_list_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("list_list_struct"); + sb.append(space); + sb.append(":").append(space); + if (this.getList_list_struct() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getList_list_struct(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("list_set_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getList_set_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getList_set_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("list_set_struct"); + sb.append(space); + sb.append(":").append(space); + if (this.getList_set_struct() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getList_set_struct(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("list_map_i32_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getList_map_i32_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getList_map_i32_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("list_map_i32_struct"); + sb.append(space); + sb.append(":").append(space); + if (this.getList_map_i32_struct() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getList_map_i32_struct(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("list_map_struct_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getList_map_struct_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getList_map_struct_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("set_list_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getSet_list_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getSet_list_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("set_list_struct"); + sb.append(space); + sb.append(":").append(space); + if (this.getSet_list_struct() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getSet_list_struct(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("set_set_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getSet_set_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getSet_set_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("set_set_struct"); + sb.append(space); + sb.append(":").append(space); + if (this.getSet_set_struct() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getSet_set_struct(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("set_map_i32_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getSet_map_i32_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getSet_map_i32_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("set_map_i32_struct"); + sb.append(space); + sb.append(":").append(space); + if (this.getSet_map_i32_struct() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getSet_map_i32_struct(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("set_map_struct_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getSet_map_struct_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getSet_map_struct_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("map_i32_map_i32_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getMap_i32_map_i32_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getMap_i32_map_i32_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("map_i32_map_struct_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getMap_i32_map_struct_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getMap_i32_map_struct_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("map_i32_map_i32_struct"); + sb.append(space); + sb.append(":").append(space); + if (this.getMap_i32_map_i32_struct() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getMap_i32_map_i32_struct(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("map_i32_map_list_i32_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getMap_i32_map_list_i32_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getMap_i32_map_list_i32_i32(), indent + 1, prettyPrint)); + } + first = false; + if (!first) sb.append("," + newLine); + sb.append(indentStr); + sb.append("map_i32_map_list_struct_i32"); + sb.append(space); + sb.append(":").append(space); + if (this.getMap_i32_map_list_struct_i32() == null) { + sb.append("null"); + } else { + sb.append(TBaseHelper.toString(this.getMap_i32_map_list_struct_i32(), indent + 1, prettyPrint)); + } + first = false; sb.append(newLine + TBaseHelper.reduceIndent(indentStr)); sb.append(")"); return sb.toString(); diff --git a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_abstract_types.py b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_abstract_types.py index c54c79ccbf8..97bca95ffb8 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_abstract_types.py +++ b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_abstract_types.py @@ -524,6 +524,63 @@ def set_map_2(self) -> _typing.Mapping[int, _typing.AbstractSet[int]]: ... @_fbthrift_property @_abc.abstractmethod def map_map_2(self) -> _typing.Mapping[int, _typing.Mapping[int, int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def list_list_i32(self) -> _typing.Sequence[_typing.Sequence[int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def list_list_struct(self) -> _typing.Sequence[_typing.Sequence[_fbthrift_MyStruct]]: ... + @_fbthrift_property + @_abc.abstractmethod + def list_set_i32(self) -> _typing.Sequence[_typing.AbstractSet[int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def list_set_struct(self) -> _typing.Sequence[_typing.AbstractSet[_fbthrift_MyStruct]]: ... + @_fbthrift_property + @_abc.abstractmethod + def list_map_i32_i32(self) -> _typing.Sequence[_typing.Mapping[int, int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def list_map_i32_struct(self) -> _typing.Sequence[_typing.Mapping[int, _fbthrift_MyStruct]]: ... + @_fbthrift_property + @_abc.abstractmethod + def list_map_struct_i32(self) -> _typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def set_list_i32(self) -> _typing.AbstractSet[_typing.Sequence[int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def set_list_struct(self) -> _typing.AbstractSet[_typing.Sequence[_fbthrift_MyStruct]]: ... + @_fbthrift_property + @_abc.abstractmethod + def set_set_i32(self) -> _typing.AbstractSet[_typing.AbstractSet[int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def set_set_struct(self) -> _typing.AbstractSet[_typing.AbstractSet[_fbthrift_MyStruct]]: ... + @_fbthrift_property + @_abc.abstractmethod + def set_map_i32_i32(self) -> _typing.AbstractSet[_typing.Mapping[int, int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def set_map_i32_struct(self) -> _typing.AbstractSet[_typing.Mapping[int, _fbthrift_MyStruct]]: ... + @_fbthrift_property + @_abc.abstractmethod + def set_map_struct_i32(self) -> _typing.AbstractSet[_typing.Mapping[_fbthrift_MyStruct, int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def map_i32_map_i32_i32(self) -> _typing.Mapping[int, _typing.Mapping[int, int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def map_i32_map_struct_i32(self) -> _typing.Mapping[int, _typing.Mapping[_fbthrift_MyStruct, int]]: ... + @_fbthrift_property + @_abc.abstractmethod + def map_i32_map_i32_struct(self) -> _typing.Mapping[int, _typing.Mapping[int, _fbthrift_MyStruct]]: ... + @_fbthrift_property + @_abc.abstractmethod + def map_i32_map_list_i32_i32(self) -> _typing.Mapping[int, _typing.Sequence[_typing.Mapping[int, int]]]: ... + @_fbthrift_property + @_abc.abstractmethod + def map_i32_map_list_struct_i32(self) -> _typing.Mapping[int, _typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]]]: ... @_abc.abstractmethod def _to_mutable_python(self) -> "module.thrift_mutable_types.Containers": ... # type: ignore @_abc.abstractmethod diff --git a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_metadata.py b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_metadata.py index 8772b7e9e61..980bdeaa68d 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_metadata.py +++ b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_metadata.py @@ -736,6 +736,44 @@ def _fbthrift_gen_metadata_struct_Containers(metadata_struct: _fbthrift_metadata ]), _fbthrift_metadata.ThriftField(id=18, type=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="map_map_2", is_optional=False, structured_annotations=[ ]), + _fbthrift_metadata.ThriftField(id=19, type=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="list_list_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=20, type=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")))))), name="list_list_struct", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=21, type=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="list_set_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=22, type=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")))))), name="list_set_struct", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=23, type=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="list_map_i32_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=24, type=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")))))), name="list_map_i32_struct", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=25, type=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")),valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="list_map_struct_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=26, type=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="set_list_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=27, type=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")))))), name="set_list_struct", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=28, type=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="set_set_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=29, type=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")))))), name="set_set_struct", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=30, type=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="set_map_i32_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=31, type=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")))))), name="set_map_i32_struct", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=32, type=_fbthrift_metadata.ThriftType(t_set=_fbthrift_metadata.ThriftSetType(valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")),valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="set_map_struct_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=33, type=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="map_i32_map_i32_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=34, type=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")),valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))), name="map_i32_map_struct_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=35, type=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")))))), name="map_i32_map_i32_struct", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=36, type=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))))), name="map_i32_map_list_i32_i32", is_optional=False, structured_annotations=[ + ]), + _fbthrift_metadata.ThriftField(id=37, type=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE),valueType=_fbthrift_metadata.ThriftType(t_list=_fbthrift_metadata.ThriftListType(valueType=_fbthrift_metadata.ThriftType(t_map=_fbthrift_metadata.ThriftMapType(keyType=_fbthrift_metadata.ThriftType(t_struct=_fbthrift_metadata.ThriftStructType(name="module.MyStruct")),valueType=_fbthrift_metadata.ThriftType(t_primitive=_fbthrift_metadata.ThriftPrimitiveType.THRIFT_I32_TYPE))))))), name="map_i32_map_list_struct_i32", is_optional=False, structured_annotations=[ + ]), ] struct_dict = dict(metadata_struct.structs) struct_dict[qualified_name] = _fbthrift_metadata.ThriftStruct(name=qualified_name, fields=fields, @@ -776,6 +814,41 @@ def _fbthrift_gen_metadata_struct_Containers(metadata_struct: _fbthrift_metadata # val # map_map_2 # key # key + # val # val # list_list_i32 + # list_list_struct + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # list_set_i32 + # list_set_struct + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # list_map_i32_i32 + # key + # val # list_map_i32_struct + # key + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # val # list_map_struct_i32 + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # key + # val # set_list_i32 + # set_list_struct + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # set_set_i32 + # set_set_struct + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # set_map_i32_i32 + # key + # val # set_map_i32_struct + # key + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # val # set_map_struct_i32 + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # key + # val # map_i32_map_i32_i32 + # key + # key + # val # val # map_i32_map_struct_i32 + # key + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # key + # val # val # map_i32_map_i32_struct + # key + # key + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # val # val # map_i32_map_list_i32_i32 + # key + # key + # val # val # map_i32_map_list_struct_i32 + # key + new_struct = _fbthrift_gen_metadata_struct_MyStruct(new_struct) # key # val # val return new_struct def gen_metadata_struct_Containers() -> _fbthrift_metadata.ThriftMetadata: diff --git a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_mutable_types.py b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_mutable_types.py index d751b32bef0..60bfa911c5d 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_mutable_types.py +++ b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_mutable_types.py @@ -2109,6 +2109,215 @@ class Containers(metaclass=_fbthrift_python_mutable_types.MutableStructMeta): False, # field type is primitive 16, # IDL type (see BaseTypeEnum) ), + _fbthrift_python_types.FieldInfo( + 19, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_list_i32", # name + "list_list_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 20, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_list_struct", # name + "list_list_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 21, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_set_i32", # name + "list_set_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 22, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_set_struct", # name + "list_set_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 23, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_map_i32_i32", # name + "list_map_i32_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 24, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_map_i32_struct", # name + "list_map_i32_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 25, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_map_struct_i32", # name + "list_map_struct_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct), _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 26, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_list_i32", # name + "set_list_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 27, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_list_struct", # name + "set_list_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 28, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_set_i32", # name + "set_set_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 29, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_set_struct", # name + "set_set_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 30, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_map_i32_i32", # name + "set_map_i32_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 31, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_map_i32_struct", # name + "set_map_i32_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 32, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_map_struct_i32", # name + "set_map_struct_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableSetTypeInfo(_fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct), _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 33, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_i32_i32", # name + "map_i32_map_i32_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 34, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_struct_i32", # name + "map_i32_map_struct_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct), _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 35, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_i32_struct", # name + "map_i32_map_i32_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 36, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_list_i32_i32", # name + "map_i32_map_list_i32_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.typeinfo_i32))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 37, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_list_struct_i32", # name + "map_i32_map_list_struct_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_mutable_typeinfos.MutableListTypeInfo(_fbthrift_python_mutable_typeinfos.MutableMapTypeInfo(_fbthrift_python_mutable_typeinfos.MutableStructTypeInfo(MyStruct), _fbthrift_python_types.typeinfo_i32))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), ) @staticmethod diff --git a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_mutable_types.pyi b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_mutable_types.pyi index 785cfb7cb3e..d5713a0d717 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_mutable_types.pyi +++ b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_mutable_types.pyi @@ -1291,6 +1291,120 @@ class Containers(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compati @map_map_2.setter def map_map_2(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper) -> None: ... + + @property + def list_list_i32(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[int]]: ... + @list_list_i32.setter + def list_list_i32(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftListWrapper) -> None: ... + + + @property + def list_list_struct(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_MyStruct]]: ... + @list_list_struct.setter + def list_list_struct(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper) -> None: ... + + + @property + def list_set_i32(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[int]]: ... + @list_set_i32.setter + def list_set_i32(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[int]] | _fbthrift_python_mutable_types._ThriftListWrapper) -> None: ... + + + @property + def list_set_struct(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyStruct]]: ... + @list_set_struct.setter + def list_set_struct(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper) -> None: ... + + + @property + def list_map_i32_i32(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]]: ... + @list_map_i32_i32.setter + def list_map_i32_i32(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper) -> None: ... + + + @property + def list_map_i32_struct(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct]]: ... + @list_map_i32_struct.setter + def list_map_i32_struct(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper) -> None: ... + + + @property + def list_map_struct_i32(self) -> _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]]: ... + @list_map_struct_i32.setter + def list_map_struct_i32(self, value: _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]] | _fbthrift_python_mutable_types._ThriftListWrapper) -> None: ... + + + @property + def set_list_i32(self) -> _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]]: ... + @set_list_i32.setter + def set_list_i32(self, value: _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftSetWrapper) -> None: ... + + + @property + def set_list_struct(self) -> _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[_fbthrift_MyStruct]]: ... + @set_list_struct.setter + def set_list_struct(self, value: _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[_fbthrift_MyStruct]] | _fbthrift_python_mutable_types._ThriftSetWrapper) -> None: ... + + + @property + def set_set_i32(self) -> _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]]: ... + @set_set_i32.setter + def set_set_i32(self, value: _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]] | _fbthrift_python_mutable_types._ThriftSetWrapper) -> None: ... + + + @property + def set_set_struct(self) -> _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyStruct]]: ... + @set_set_struct.setter + def set_set_struct(self, value: _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyStruct]] | _fbthrift_python_mutable_types._ThriftSetWrapper) -> None: ... + + + @property + def set_map_i32_i32(self) -> _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, int]]: ... + @set_map_i32_i32.setter + def set_map_i32_i32(self, value: _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftSetWrapper) -> None: ... + + + @property + def set_map_i32_struct(self) -> _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct]]: ... + @set_map_i32_struct.setter + def set_map_i32_struct(self, value: _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct]] | _fbthrift_python_mutable_types._ThriftSetWrapper) -> None: ... + + + @property + def set_map_struct_i32(self) -> _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]]: ... + @set_map_struct_i32.setter + def set_map_struct_i32(self, value: _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]] | _fbthrift_python_mutable_types._ThriftSetWrapper) -> None: ... + + + @property + def map_i32_map_i32_i32(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]]: ... + @map_i32_map_i32_i32.setter + def map_i32_map_i32_i32(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper) -> None: ... + + + @property + def map_i32_map_struct_i32(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]]: ... + @map_i32_map_struct_i32.setter + def map_i32_map_struct_i32(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper) -> None: ... + + + @property + def map_i32_map_i32_struct(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct]]: ... + @map_i32_map_i32_struct.setter + def map_i32_map_i32_struct(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper) -> None: ... + + + @property + def map_i32_map_list_i32_i32(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]]]: ... + @map_i32_map_list_i32_i32.setter + def map_i32_map_list_i32_i32(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]]] | _fbthrift_python_mutable_types._ThriftMapWrapper) -> None: ... + + + @property + def map_i32_map_list_struct_i32(self) -> _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]]]: ... + @map_i32_map_list_struct_i32.setter + def map_i32_map_list_struct_i32(self, value: _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]]] | _fbthrift_python_mutable_types._ThriftMapWrapper) -> None: ... + def __init__( self, *, struct_list: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., @@ -1310,7 +1424,26 @@ class Containers(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compati set_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[int], int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., set_map_2: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableSet[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., map_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, int], int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., - map_map_2: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... + map_map_2: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + list_list_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_list_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_set_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_set_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_map_i32_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_map_i32_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_map_struct_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + set_list_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_list_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_set_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_set_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_map_i32_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_map_i32_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_map_struct_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + map_i32_map_i32_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_i32_map_struct_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_i32_map_i32_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_i32_map_list_i32_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_i32_map_list_struct_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> None: ... def __call__( @@ -1332,9 +1465,28 @@ class Containers(_fbthrift_python_mutable_types.MutableStruct, _fbthrift_compati set_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[int], int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., set_map_2: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableSet[int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., map_map: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, int], int] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., - map_map_2: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... + map_map_2: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + list_list_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_list_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_set_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_set_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_map_i32_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_map_i32_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + list_map_struct_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]] | _fbthrift_python_mutable_types._ThriftListWrapper]=..., + set_list_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_list_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_set_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_set_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_map_i32_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_map_i32_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + set_map_struct_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]] | _fbthrift_python_mutable_types._ThriftSetWrapper]=..., + map_i32_map_i32_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_i32_map_struct_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_i32_map_i32_struct: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_compatible_with_MyStruct]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_i32_map_list_i32_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=..., + map_i32_map_list_struct_i32: _typing.Optional[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]]] | _fbthrift_python_mutable_types._ThriftMapWrapper]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableList[_fbthrift_MyStruct], _fbthrift_python_mutable_containers.MutableList[_fbthrift_MyUnion], _fbthrift_python_mutable_containers.MutableList[_fbthrift_MyEnum], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyStruct], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyUnion], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyEnum], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyUnion, int], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyEnum, int], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyUnion], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyEnum], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], int], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[int], int], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableSet[int]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, int], int], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_fbthrift_python_mutable_containers.MutableList[_fbthrift_MyStruct], _fbthrift_python_mutable_containers.MutableList[_fbthrift_MyUnion], _fbthrift_python_mutable_containers.MutableList[_fbthrift_MyEnum], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyStruct], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyUnion], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyEnum], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyUnion, int], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyEnum, int], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyUnion], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyEnum], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableList[int], int], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableSet[int], int], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableSet[int]], _fbthrift_python_mutable_containers.MutableMap[_fbthrift_python_mutable_containers.MutableMap[int, int], int], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableList[_fbthrift_MyStruct]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[int]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyStruct]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct]], _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[int]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableList[_fbthrift_MyStruct]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[int]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableSet[_fbthrift_MyStruct]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, int]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct]], _fbthrift_python_mutable_containers.MutableSet[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, int]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_MyStruct]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[int, int]]], _fbthrift_python_mutable_containers.MutableMap[int, _fbthrift_python_mutable_containers.MutableList[_fbthrift_python_mutable_containers.MutableMap[_fbthrift_MyStruct, int]]]]]]: ... def _to_python(self) -> "module.thrift_types.Containers": ... # type: ignore def _to_mutable_python(self) -> _typing.Self: ... def _to_py3(self) -> "module.types.Containers": ... # type: ignore diff --git a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_types.py b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_types.py index 4a7c6f6d9aa..cf60b6151b4 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_types.py +++ b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_types.py @@ -2091,6 +2091,215 @@ class Containers(metaclass=_fbthrift_python_types.StructMeta): False, # field type is primitive 16, # IDL type (see BaseTypeEnum) ), + _fbthrift_python_types.FieldInfo( + 19, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_list_i32", # name + "list_list_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 20, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_list_struct", # name + "list_list_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.StructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 21, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_set_i32", # name + "list_set_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 22, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_set_struct", # name + "list_set_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.StructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 23, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_map_i32_i32", # name + "list_map_i32_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 24, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_map_i32_struct", # name + "list_map_i32_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.StructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 25, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "list_map_struct_i32", # name + "list_map_struct_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.StructTypeInfo(MyStruct), _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 14, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 26, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_list_i32", # name + "set_list_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 27, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_list_struct", # name + "set_list_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.StructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 28, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_set_i32", # name + "set_set_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 29, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_set_struct", # name + "set_set_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.StructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 30, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_map_i32_i32", # name + "set_map_i32_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 31, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_map_i32_struct", # name + "set_map_i32_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.StructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 32, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "set_map_struct_i32", # name + "set_map_struct_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.SetTypeInfo(_fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.StructTypeInfo(MyStruct), _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 15, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 33, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_i32_i32", # name + "map_i32_map_i32_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 34, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_struct_i32", # name + "map_i32_map_struct_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.StructTypeInfo(MyStruct), _fbthrift_python_types.typeinfo_i32)), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 35, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_i32_struct", # name + "map_i32_map_i32_struct", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.StructTypeInfo(MyStruct))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 36, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_list_i32_i32", # name + "map_i32_map_list_i32_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.typeinfo_i32))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), + _fbthrift_python_types.FieldInfo( + 37, # id + _fbthrift_python_types.FieldQualifier.Unqualified, # qualifier + "map_i32_map_list_struct_i32", # name + "map_i32_map_list_struct_i32", # python name (from @python.Name annotation) + lambda: _fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.typeinfo_i32, _fbthrift_python_types.ListTypeInfo(_fbthrift_python_types.MapTypeInfo(_fbthrift_python_types.StructTypeInfo(MyStruct), _fbthrift_python_types.typeinfo_i32))), # typeinfo + None, # default value + None, # adapter info + False, # field type is primitive + 16, # IDL type (see BaseTypeEnum) + ), ) @staticmethod diff --git a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_types.pyi b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_types.pyi index 5743828a607..b72dbb7cdb9 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_types.pyi +++ b/thrift/compiler/test/fixtures/complex-struct/out/python/gen-python/module/thrift_types.pyi @@ -666,6 +666,25 @@ class Containers(_fbthrift_python_types.Struct, _fbthrift_compatible_with_Contai set_map_2: _typing.Final[_typing.Mapping[int, _typing.AbstractSet[int]]] = ... map_map: _typing.Final[_typing.Mapping[_typing.Mapping[int, int], int]] = ... map_map_2: _typing.Final[_typing.Mapping[int, _typing.Mapping[int, int]]] = ... + list_list_i32: _typing.Final[_typing.Sequence[_typing.Sequence[int]]] = ... + list_list_struct: _typing.Final[_typing.Sequence[_typing.Sequence[_fbthrift_MyStruct]]] = ... + list_set_i32: _typing.Final[_typing.Sequence[_typing.AbstractSet[int]]] = ... + list_set_struct: _typing.Final[_typing.Sequence[_typing.AbstractSet[_fbthrift_MyStruct]]] = ... + list_map_i32_i32: _typing.Final[_typing.Sequence[_typing.Mapping[int, int]]] = ... + list_map_i32_struct: _typing.Final[_typing.Sequence[_typing.Mapping[int, _fbthrift_MyStruct]]] = ... + list_map_struct_i32: _typing.Final[_typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]]] = ... + set_list_i32: _typing.Final[_typing.AbstractSet[_typing.Sequence[int]]] = ... + set_list_struct: _typing.Final[_typing.AbstractSet[_typing.Sequence[_fbthrift_MyStruct]]] = ... + set_set_i32: _typing.Final[_typing.AbstractSet[_typing.AbstractSet[int]]] = ... + set_set_struct: _typing.Final[_typing.AbstractSet[_typing.AbstractSet[_fbthrift_MyStruct]]] = ... + set_map_i32_i32: _typing.Final[_typing.AbstractSet[_typing.Mapping[int, int]]] = ... + set_map_i32_struct: _typing.Final[_typing.AbstractSet[_typing.Mapping[int, _fbthrift_MyStruct]]] = ... + set_map_struct_i32: _typing.Final[_typing.AbstractSet[_typing.Mapping[_fbthrift_MyStruct, int]]] = ... + map_i32_map_i32_i32: _typing.Final[_typing.Mapping[int, _typing.Mapping[int, int]]] = ... + map_i32_map_struct_i32: _typing.Final[_typing.Mapping[int, _typing.Mapping[_fbthrift_MyStruct, int]]] = ... + map_i32_map_i32_struct: _typing.Final[_typing.Mapping[int, _typing.Mapping[int, _fbthrift_MyStruct]]] = ... + map_i32_map_list_i32_i32: _typing.Final[_typing.Mapping[int, _typing.Sequence[_typing.Mapping[int, int]]]] = ... + map_i32_map_list_struct_i32: _typing.Final[_typing.Mapping[int, _typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]]]] = ... def __init__( self, *, struct_list: _typing.Optional[_typing.Sequence[_fbthrift_compatible_with_MyStruct]]=..., @@ -685,7 +704,26 @@ class Containers(_fbthrift_python_types.Struct, _fbthrift_compatible_with_Contai set_map: _typing.Optional[_typing.Mapping[_typing.AbstractSet[int], int]]=..., set_map_2: _typing.Optional[_typing.Mapping[int, _typing.AbstractSet[int]]]=..., map_map: _typing.Optional[_typing.Mapping[_typing.Mapping[int, int], int]]=..., - map_map_2: _typing.Optional[_typing.Mapping[int, _typing.Mapping[int, int]]]=... + map_map_2: _typing.Optional[_typing.Mapping[int, _typing.Mapping[int, int]]]=..., + list_list_i32: _typing.Optional[_typing.Sequence[_typing.Sequence[int]]]=..., + list_list_struct: _typing.Optional[_typing.Sequence[_typing.Sequence[_fbthrift_compatible_with_MyStruct]]]=..., + list_set_i32: _typing.Optional[_typing.Sequence[_typing.AbstractSet[int]]]=..., + list_set_struct: _typing.Optional[_typing.Sequence[_typing.AbstractSet[_fbthrift_compatible_with_MyStruct]]]=..., + list_map_i32_i32: _typing.Optional[_typing.Sequence[_typing.Mapping[int, int]]]=..., + list_map_i32_struct: _typing.Optional[_typing.Sequence[_typing.Mapping[int, _fbthrift_compatible_with_MyStruct]]]=..., + list_map_struct_i32: _typing.Optional[_typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]]]=..., + set_list_i32: _typing.Optional[_typing.AbstractSet[_typing.Sequence[int]]]=..., + set_list_struct: _typing.Optional[_typing.AbstractSet[_typing.Sequence[_fbthrift_compatible_with_MyStruct]]]=..., + set_set_i32: _typing.Optional[_typing.AbstractSet[_typing.AbstractSet[int]]]=..., + set_set_struct: _typing.Optional[_typing.AbstractSet[_typing.AbstractSet[_fbthrift_compatible_with_MyStruct]]]=..., + set_map_i32_i32: _typing.Optional[_typing.AbstractSet[_typing.Mapping[int, int]]]=..., + set_map_i32_struct: _typing.Optional[_typing.AbstractSet[_typing.Mapping[int, _fbthrift_compatible_with_MyStruct]]]=..., + set_map_struct_i32: _typing.Optional[_typing.AbstractSet[_typing.Mapping[_fbthrift_MyStruct, int]]]=..., + map_i32_map_i32_i32: _typing.Optional[_typing.Mapping[int, _typing.Mapping[int, int]]]=..., + map_i32_map_struct_i32: _typing.Optional[_typing.Mapping[int, _typing.Mapping[_fbthrift_MyStruct, int]]]=..., + map_i32_map_i32_struct: _typing.Optional[_typing.Mapping[int, _typing.Mapping[int, _fbthrift_compatible_with_MyStruct]]]=..., + map_i32_map_list_i32_i32: _typing.Optional[_typing.Mapping[int, _typing.Sequence[_typing.Mapping[int, int]]]]=..., + map_i32_map_list_struct_i32: _typing.Optional[_typing.Mapping[int, _typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]]]]=... ) -> None: ... def __call__( @@ -707,9 +745,28 @@ class Containers(_fbthrift_python_types.Struct, _fbthrift_compatible_with_Contai set_map: _typing.Optional[_typing.Mapping[_typing.AbstractSet[int], int]]=..., set_map_2: _typing.Optional[_typing.Mapping[int, _typing.AbstractSet[int]]]=..., map_map: _typing.Optional[_typing.Mapping[_typing.Mapping[int, int], int]]=..., - map_map_2: _typing.Optional[_typing.Mapping[int, _typing.Mapping[int, int]]]=... + map_map_2: _typing.Optional[_typing.Mapping[int, _typing.Mapping[int, int]]]=..., + list_list_i32: _typing.Optional[_typing.Sequence[_typing.Sequence[int]]]=..., + list_list_struct: _typing.Optional[_typing.Sequence[_typing.Sequence[_fbthrift_compatible_with_MyStruct]]]=..., + list_set_i32: _typing.Optional[_typing.Sequence[_typing.AbstractSet[int]]]=..., + list_set_struct: _typing.Optional[_typing.Sequence[_typing.AbstractSet[_fbthrift_compatible_with_MyStruct]]]=..., + list_map_i32_i32: _typing.Optional[_typing.Sequence[_typing.Mapping[int, int]]]=..., + list_map_i32_struct: _typing.Optional[_typing.Sequence[_typing.Mapping[int, _fbthrift_compatible_with_MyStruct]]]=..., + list_map_struct_i32: _typing.Optional[_typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]]]=..., + set_list_i32: _typing.Optional[_typing.AbstractSet[_typing.Sequence[int]]]=..., + set_list_struct: _typing.Optional[_typing.AbstractSet[_typing.Sequence[_fbthrift_compatible_with_MyStruct]]]=..., + set_set_i32: _typing.Optional[_typing.AbstractSet[_typing.AbstractSet[int]]]=..., + set_set_struct: _typing.Optional[_typing.AbstractSet[_typing.AbstractSet[_fbthrift_compatible_with_MyStruct]]]=..., + set_map_i32_i32: _typing.Optional[_typing.AbstractSet[_typing.Mapping[int, int]]]=..., + set_map_i32_struct: _typing.Optional[_typing.AbstractSet[_typing.Mapping[int, _fbthrift_compatible_with_MyStruct]]]=..., + set_map_struct_i32: _typing.Optional[_typing.AbstractSet[_typing.Mapping[_fbthrift_MyStruct, int]]]=..., + map_i32_map_i32_i32: _typing.Optional[_typing.Mapping[int, _typing.Mapping[int, int]]]=..., + map_i32_map_struct_i32: _typing.Optional[_typing.Mapping[int, _typing.Mapping[_fbthrift_MyStruct, int]]]=..., + map_i32_map_i32_struct: _typing.Optional[_typing.Mapping[int, _typing.Mapping[int, _fbthrift_compatible_with_MyStruct]]]=..., + map_i32_map_list_i32_i32: _typing.Optional[_typing.Mapping[int, _typing.Sequence[_typing.Mapping[int, int]]]]=..., + map_i32_map_list_struct_i32: _typing.Optional[_typing.Mapping[int, _typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]]]]=... ) -> _typing.Self: ... - def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_typing.Sequence[_fbthrift_MyStruct], _typing.Sequence[_fbthrift_MyUnion], _typing.Sequence[_fbthrift_MyEnum], _typing.AbstractSet[_fbthrift_MyStruct], _typing.AbstractSet[_fbthrift_MyUnion], _typing.AbstractSet[_fbthrift_MyEnum], _typing.Mapping[_fbthrift_MyStruct, int], _typing.Mapping[_fbthrift_MyUnion, int], _typing.Mapping[_fbthrift_MyEnum, int], _typing.Mapping[int, _fbthrift_MyStruct], _typing.Mapping[int, _fbthrift_MyUnion], _typing.Mapping[int, _fbthrift_MyEnum], _typing.Mapping[_typing.Sequence[int], int], _typing.Mapping[int, _typing.Sequence[int]], _typing.Mapping[_typing.AbstractSet[int], int], _typing.Mapping[int, _typing.AbstractSet[int]], _typing.Mapping[_typing.Mapping[int, int], int], _typing.Mapping[int, _typing.Mapping[int, int]]]]]: ... + def __iter__(self) -> _typing.Iterator[_typing.Tuple[str, _typing.Union[_typing.Sequence[_fbthrift_MyStruct], _typing.Sequence[_fbthrift_MyUnion], _typing.Sequence[_fbthrift_MyEnum], _typing.AbstractSet[_fbthrift_MyStruct], _typing.AbstractSet[_fbthrift_MyUnion], _typing.AbstractSet[_fbthrift_MyEnum], _typing.Mapping[_fbthrift_MyStruct, int], _typing.Mapping[_fbthrift_MyUnion, int], _typing.Mapping[_fbthrift_MyEnum, int], _typing.Mapping[int, _fbthrift_MyStruct], _typing.Mapping[int, _fbthrift_MyUnion], _typing.Mapping[int, _fbthrift_MyEnum], _typing.Mapping[_typing.Sequence[int], int], _typing.Mapping[int, _typing.Sequence[int]], _typing.Mapping[_typing.AbstractSet[int], int], _typing.Mapping[int, _typing.AbstractSet[int]], _typing.Mapping[_typing.Mapping[int, int], int], _typing.Mapping[int, _typing.Mapping[int, int]], _typing.Sequence[_typing.Sequence[int]], _typing.Sequence[_typing.Sequence[_fbthrift_MyStruct]], _typing.Sequence[_typing.AbstractSet[int]], _typing.Sequence[_typing.AbstractSet[_fbthrift_MyStruct]], _typing.Sequence[_typing.Mapping[int, int]], _typing.Sequence[_typing.Mapping[int, _fbthrift_MyStruct]], _typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]], _typing.AbstractSet[_typing.Sequence[int]], _typing.AbstractSet[_typing.Sequence[_fbthrift_MyStruct]], _typing.AbstractSet[_typing.AbstractSet[int]], _typing.AbstractSet[_typing.AbstractSet[_fbthrift_MyStruct]], _typing.AbstractSet[_typing.Mapping[int, int]], _typing.AbstractSet[_typing.Mapping[int, _fbthrift_MyStruct]], _typing.AbstractSet[_typing.Mapping[_fbthrift_MyStruct, int]], _typing.Mapping[int, _typing.Mapping[int, int]], _typing.Mapping[int, _typing.Mapping[_fbthrift_MyStruct, int]], _typing.Mapping[int, _typing.Mapping[int, _fbthrift_MyStruct]], _typing.Mapping[int, _typing.Sequence[_typing.Mapping[int, int]]], _typing.Mapping[int, _typing.Sequence[_typing.Mapping[_fbthrift_MyStruct, int]]]]]]: ... def _to_python(self) -> _typing.Self: ... def _to_mutable_python(self) -> "module.thrift_mutable_types.Containers": ... # type: ignore def _to_py3(self) -> "module.types.Containers": ... # type: ignore diff --git a/thrift/compiler/test/fixtures/complex-struct/out/python_capi/gen-python-capi/module/thrift_types_capi.cpp b/thrift/compiler/test/fixtures/complex-struct/out/python_capi/gen-python-capi/module/thrift_types_capi.cpp index a89641ba8e6..fb12cb95786 100644 --- a/thrift/compiler/test/fixtures/complex-struct/out/python_capi/gen-python-capi/module/thrift_types_capi.cpp +++ b/thrift/compiler/test/fixtures/complex-struct/out/python_capi/gen-python-capi/module/thrift_types_capi.cpp @@ -58,8 +58,8 @@ bool ensure_module_imported() { static constexpr std::int16_t _fbthrift__complexException__tuple_pos[6] = { 1, 2, 3, 4, 5, 6 }; - static constexpr std::int16_t _fbthrift__Containers__tuple_pos[18] = { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 + static constexpr std::int16_t _fbthrift__Containers__tuple_pos[37] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37 }; } // namespace @@ -2653,6 +2653,82 @@ Extractor<::apache::thrift::python::capi::ComposedStruct< cpp.map_map_2_ref(), PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[17]), error); + Extractor>>{}.extractInto( + cpp.list_list_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[18]), + error); + Extractor>>>{}.extractInto( + cpp.list_list_struct_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[19]), + error); + Extractor>>{}.extractInto( + cpp.list_set_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[20]), + error); + Extractor>>>{}.extractInto( + cpp.list_set_struct_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[21]), + error); + Extractor>>{}.extractInto( + cpp.list_map_i32_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[22]), + error); + Extractor>>>{}.extractInto( + cpp.list_map_i32_struct_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[23]), + error); + Extractor, int32_t>>>{}.extractInto( + cpp.list_map_struct_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[24]), + error); + Extractor>>{}.extractInto( + cpp.set_list_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[25]), + error); + Extractor>>>{}.extractInto( + cpp.set_list_struct_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[26]), + error); + Extractor>>{}.extractInto( + cpp.set_set_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[27]), + error); + Extractor>>>{}.extractInto( + cpp.set_set_struct_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[28]), + error); + Extractor>>{}.extractInto( + cpp.set_map_i32_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[29]), + error); + Extractor>>>{}.extractInto( + cpp.set_map_i32_struct_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[30]), + error); + Extractor, int32_t>>>{}.extractInto( + cpp.set_map_struct_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[31]), + error); + Extractor>>{}.extractInto( + cpp.map_i32_map_i32_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[32]), + error); + Extractor, int32_t>>>{}.extractInto( + cpp.map_i32_map_struct_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[33]), + error); + Extractor>>>{}.extractInto( + cpp.map_i32_map_i32_struct_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[34]), + error); + Extractor>>>{}.extractInto( + cpp.map_i32_map_list_i32_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[35]), + error); + Extractor, int32_t>>>>{}.extractInto( + cpp.map_i32_map_list_struct_i32_ref(), + PyTuple_GET_ITEM(fbThriftData, _fbthrift__Containers__tuple_pos[36]), + error); if (error) { return folly::makeUnexpected(*error); } @@ -2693,7 +2769,7 @@ PyObject* Constructor<::cpp2::Containers>::operator()( PyObject* Constructor<::apache::thrift::python::capi::ComposedStruct< ::cpp2::Containers>>::operator()( [[maybe_unused]] const ::cpp2::Containers& val) { - StrongRef fbthrift_data(createStructTuple(18)); + StrongRef fbthrift_data(createStructTuple(37)); StrongRef _fbthrift__struct_list( Constructor>>{} .constructFrom(val.struct_list_ref())); @@ -2874,6 +2950,196 @@ PyObject* Constructor<::apache::thrift::python::capi::ComposedStruct< *_fbthrift__map_map_2) == -1) { return nullptr; } + StrongRef _fbthrift__list_list_i32( + Constructor>>{} + .constructFrom(val.list_list_i32_ref())); + if (!_fbthrift__list_list_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[18], + *_fbthrift__list_list_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__list_list_struct( + Constructor>>>{} + .constructFrom(val.list_list_struct_ref())); + if (!_fbthrift__list_list_struct || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[19], + *_fbthrift__list_list_struct) == -1) { + return nullptr; + } + StrongRef _fbthrift__list_set_i32( + Constructor>>{} + .constructFrom(val.list_set_i32_ref())); + if (!_fbthrift__list_set_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[20], + *_fbthrift__list_set_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__list_set_struct( + Constructor>>>{} + .constructFrom(val.list_set_struct_ref())); + if (!_fbthrift__list_set_struct || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[21], + *_fbthrift__list_set_struct) == -1) { + return nullptr; + } + StrongRef _fbthrift__list_map_i32_i32( + Constructor>>{} + .constructFrom(val.list_map_i32_i32_ref())); + if (!_fbthrift__list_map_i32_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[22], + *_fbthrift__list_map_i32_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__list_map_i32_struct( + Constructor>>>{} + .constructFrom(val.list_map_i32_struct_ref())); + if (!_fbthrift__list_map_i32_struct || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[23], + *_fbthrift__list_map_i32_struct) == -1) { + return nullptr; + } + StrongRef _fbthrift__list_map_struct_i32( + Constructor, int32_t>>>{} + .constructFrom(val.list_map_struct_i32_ref())); + if (!_fbthrift__list_map_struct_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[24], + *_fbthrift__list_map_struct_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__set_list_i32( + Constructor>>{} + .constructFrom(val.set_list_i32_ref())); + if (!_fbthrift__set_list_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[25], + *_fbthrift__set_list_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__set_list_struct( + Constructor>>>{} + .constructFrom(val.set_list_struct_ref())); + if (!_fbthrift__set_list_struct || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[26], + *_fbthrift__set_list_struct) == -1) { + return nullptr; + } + StrongRef _fbthrift__set_set_i32( + Constructor>>{} + .constructFrom(val.set_set_i32_ref())); + if (!_fbthrift__set_set_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[27], + *_fbthrift__set_set_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__set_set_struct( + Constructor>>>{} + .constructFrom(val.set_set_struct_ref())); + if (!_fbthrift__set_set_struct || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[28], + *_fbthrift__set_set_struct) == -1) { + return nullptr; + } + StrongRef _fbthrift__set_map_i32_i32( + Constructor>>{} + .constructFrom(val.set_map_i32_i32_ref())); + if (!_fbthrift__set_map_i32_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[29], + *_fbthrift__set_map_i32_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__set_map_i32_struct( + Constructor>>>{} + .constructFrom(val.set_map_i32_struct_ref())); + if (!_fbthrift__set_map_i32_struct || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[30], + *_fbthrift__set_map_i32_struct) == -1) { + return nullptr; + } + StrongRef _fbthrift__set_map_struct_i32( + Constructor, int32_t>>>{} + .constructFrom(val.set_map_struct_i32_ref())); + if (!_fbthrift__set_map_struct_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[31], + *_fbthrift__set_map_struct_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__map_i32_map_i32_i32( + Constructor>>{} + .constructFrom(val.map_i32_map_i32_i32_ref())); + if (!_fbthrift__map_i32_map_i32_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[32], + *_fbthrift__map_i32_map_i32_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__map_i32_map_struct_i32( + Constructor, int32_t>>>{} + .constructFrom(val.map_i32_map_struct_i32_ref())); + if (!_fbthrift__map_i32_map_struct_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[33], + *_fbthrift__map_i32_map_struct_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__map_i32_map_i32_struct( + Constructor>>>{} + .constructFrom(val.map_i32_map_i32_struct_ref())); + if (!_fbthrift__map_i32_map_i32_struct || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[34], + *_fbthrift__map_i32_map_i32_struct) == -1) { + return nullptr; + } + StrongRef _fbthrift__map_i32_map_list_i32_i32( + Constructor>>>{} + .constructFrom(val.map_i32_map_list_i32_i32_ref())); + if (!_fbthrift__map_i32_map_list_i32_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[35], + *_fbthrift__map_i32_map_list_i32_i32) == -1) { + return nullptr; + } + StrongRef _fbthrift__map_i32_map_list_struct_i32( + Constructor, int32_t>>>>{} + .constructFrom(val.map_i32_map_list_struct_i32_ref())); + if (!_fbthrift__map_i32_map_list_struct_i32 || + setStructField( + *fbthrift_data, + _fbthrift__Containers__tuple_pos[36], + *_fbthrift__map_i32_map_list_struct_i32) == -1) { + return nullptr; + } return std::move(fbthrift_data).release(); } diff --git a/thrift/compiler/test/fixtures/complex-struct/src/module.thrift b/thrift/compiler/test/fixtures/complex-struct/src/module.thrift index 5dc5f67a2b9..2d5628f9592 100644 --- a/thrift/compiler/test/fixtures/complex-struct/src/module.thrift +++ b/thrift/compiler/test/fixtures/complex-struct/src/module.thrift @@ -239,4 +239,26 @@ struct Containers { 17: map, i32> map_map; 18: map> map_map_2; + + 19: list> list_list_i32; + 20: list> list_list_struct; + 21: list> list_set_i32; + 22: list> list_set_struct; + 23: list> list_map_i32_i32; + 24: list> list_map_i32_struct; + 25: list> list_map_struct_i32; + + 26: set> set_list_i32; + 27: set> set_list_struct; + 28: set> set_set_i32; + 29: set> set_set_struct; + 30: set> set_map_i32_i32; + 31: set> set_map_i32_struct; + 32: set> set_map_struct_i32; + + 33: map> map_i32_map_i32_i32; + 34: map> map_i32_map_struct_i32; + 35: map> map_i32_map_i32_struct; + 36: map>> map_i32_map_list_i32_i32; + 37: map>> map_i32_map_list_struct_i32; }