simplify Struct.__call__

Summary:
We can remove some duplicate code and make `__call__` faster by feeding `kwargs` to `_initStructTupleWithValues`. The deleted section in the `else` of `__call__` duplicates the logic in `_initStructTupleWithValues`.

In the new flow, we have 3 cases:
- `kwarg` specified as None -> `_initStructTupleWithValues` sets to default value
- `kwarg is non-`None` -> `_initStructTupleWithValues` sets to new value
- `kwarg` not specified -> `__call__` borrows a new reference to old value

Reviewed By: prakashgayasen, createdbysk

Differential Revision: D74365485

fbshipit-source-id: b25226de15cb7da1b68cb660fa058d8065bee3f0

Author: ahilger

third-party/thrift/src/thrift/lib/python/types.pyx

@@ -1106,42 +1106,22 @@ cdef class Struct(StructOrUnion):
             return self
         cdef StructInfo struct_info = self._fbthrift_struct_info
         klass = type(self)
-        # NB: optimization opportunity here: pass **kwargs to fbthrift_new
-        cdef Struct new_inst = klass._fbthrift_new()
+        # note this puts the set kwargs into new_inst._fbthrift_data
+        cdef Struct new_inst = klass._fbthrift_new(**kwargs)
         not_found = object()
         isset_flags = self._fbthrift_data[0]
 
         for field_name, field_index in struct_info.name_to_index.items():
             value = kwargs.pop(field_name, not_found)
             if value is None:  # reset to default value, no change needed
                 continue
-            if value is not_found:  # copy the old value if needed
+            if value is not_found:  # borrow ref to old value
                 if isset_flags[field_index] == 0:
                     # old field not set, so keep default
                     continue
-                value_to_copy = self._fbthrift_data[field_index + 1]
-            else:  # new assigned value
-                try:
-                    field_spec = struct_info.fields[field_index]
-                    adapter_info = field_spec.adapter_info
-                    if adapter_info:
-                        adapter_class, transitive_annotation = adapter_info
-                        field_id = field_spec.id
-                        value = adapter_class.to_thrift_field(
-                            value,
-                            field_id,
-                            self,
-                            transitive_annotation=transitive_annotation(),
-                        )
-                    value_to_copy = (
-                        <TypeInfoBase>struct_info.type_infos[field_index]
-                    ).to_internal_data(value)
-                except Exception as exc:
-                    raise type(exc)(
-                        f"{type(self)}: error updating Thrift struct field "
-                        f"'{field_spec.py_name}': {exc}"
-                    ) from exc
-            set_struct_field(new_inst._fbthrift_data, field_index, value_to_copy)
+                borrowed_value = self._fbthrift_data[field_index + 1]
+                set_struct_field(new_inst._fbthrift_data, field_index, borrowed_value)
+
         if kwargs:
             raise TypeError(
                 f"'{type(self).__name__}' object does not have attribute(s): "

third-party/thrift/src/thrift/test/thrift-python/struct_test.py

@@ -165,7 +165,7 @@ def test_call(self) -> None:
         with self.assertRaisesRegex(
             TypeError,
             (
-                "error updating Thrift struct field 'unqualified_string': Cannot create "
+                "error .* Thrift struct field 'unqualified_string': Cannot create "
                 "internal string data representation. Expected type <class 'str'>, got: "
                 "<class 'int'>."
             ),
@@ -429,7 +429,7 @@ def test_adapted_types(self) -> None:
         with self.assertRaisesRegex(
             AttributeError,
             (
-                "error updating Thrift struct field "
+                "error .* Thrift struct field "
                 "'unqualified_adapted_i32_to_datetime': 'int' object has no attribute "
                 "'timestamp'"
             ),