Using CopyFrom to set protobuf message fields (instead of `MergeFro…

…m`). (googleapis#3612) Fixes googleapis#3571.
landrito · Aug 22, 2017 · 1c0a4af · 1c0a4af
1 parent 1016b28
commit 1c0a4af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bigtable/google/cloud/bigtable/table.py b/bigtable/google/cloud/bigtable/table.py
@@ -200,7 +200,7 @@ def create(self, initial_split_keys=None, column_families=()):
             table_pb = table_v2_pb2.Table()
             for col_fam in column_families:
                 curr_id = col_fam.column_family_id
-                table_pb.column_families[curr_id].MergeFrom(col_fam.to_pb())
+                table_pb.column_families[curr_id].CopyFrom(col_fam.to_pb())
 
         request_pb = table_admin_messages_v2_pb2.CreateTableRequest(
             initial_splits=initial_split_keys or [],

diff --git a/bigtable/tests/unit/test_table.py b/bigtable/tests/unit/test_table.py
@@ -255,7 +255,7 @@ def _create_test_helper(self, initial_split_keys, column_families=()):
             for cf in column_families:
                 cf_pb = table_pb.column_families[cf.column_family_id]
                 if cf.gc_rule is not None:
-                    cf_pb.gc_rule.MergeFrom(cf.gc_rule.to_pb())
+                    cf_pb.gc_rule.CopyFrom(cf.gc_rule.to_pb())
         request_pb = _CreateTableRequestPB(
             initial_splits=splits_pb,
             parent=self.INSTANCE_NAME,