google-protobuf 4.26.1-java → 4.27.0.rc.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa7f8c83bb0d9e888fa39a83db2780ef1bebf13e83d39fb64ef55a1cc671e2bd
-  data.tar.gz: e50d3388e6ac23ea3f388ade0962afb558459858d799b2269849a987b9d932f5
+  metadata.gz: 6e4918c525971849571994d437c437c3ddbcfabca6dd9cee37d21c085715c9f9
+  data.tar.gz: 5ad3a4881e36702bb006a5345b9c75df9b717ee39334b2eba1d715b096d724ef
 SHA512:
-  metadata.gz: ae1551f41c91fa89c186efac2c2f01f9a68bd5a8f5e6b1b1a379180729826e55c83845890438acde1fd48b20659b28c10889f24c5a524b9c57bfb07a7e77a927
-  data.tar.gz: 485536037df5919ef928cd34e759fabf0f33dec2ed22e2e940b2c3cf4fe9d341100b50c0799333e544d46bce43c6190cc4a862c05a37648e6ceeb386d274ea92
+  metadata.gz: c68e6ea180cc64f94767b5d79bf78dec3bac76b147cffee1f02a451e89955b017859d9405cfdbfb3345c09e0afa01896750f812cba8bd174c7f0482c960e2c93
+  data.tar.gz: 15d91cb788ec0e5a8d3f674cc00097abf65788811eef4f77b4fa765c69961ffc40ba0ef6e2707a9871de9c365462f6fbdf1cc968ff709e4a446642a4a7021f26

data/ext/google/protobuf_c/glue.c

@@ -54,3 +54,19 @@ char* FieldDescriptor_serialized_options(const upb_FieldDef* fielddef,
   char* serialized = google_protobuf_FieldOptions_serialize(opts, arena, size);
   return serialized;
 }
+
+char* ServiceDescriptor_serialized_options(const upb_ServiceDef* servicedef,
+                                           size_t* size, upb_Arena* arena) {
+  const google_protobuf_ServiceOptions* opts =
+      upb_ServiceDef_Options(servicedef);
+  char* serialized =
+      google_protobuf_ServiceOptions_serialize(opts, arena, size);
+  return serialized;
+}
+
+char* MethodDescriptor_serialized_options(const upb_MethodDef* methoddef,
+                                          size_t* size, upb_Arena* arena) {
+  const google_protobuf_MethodOptions* opts = upb_MethodDef_Options(methoddef);
+  char* serialized = google_protobuf_MethodOptions_serialize(opts, arena, size);
+  return serialized;
+}

data/ext/google/protobuf_c/message.c

@@ -669,20 +669,6 @@ static VALUE Message_dup(VALUE _self) {
   return new_msg;
 }
 
-// Support function for Message_eq, and also used by other #eq functions.
-bool Message_Equal(const upb_Message* m1, const upb_Message* m2,
-                   const upb_MessageDef* m) {
-  upb_Status status;
-  upb_Status_Clear(&status);
-  bool return_value = shared_Message_Equal(m1, m2, m, &status);
-  if (upb_Status_IsOk(&status)) {
-    return return_value;
-  } else {
-    rb_raise(cParseError, "Message_Equal(): %s",
-             upb_Status_ErrorMessage(&status));
-  }
-}
-
 /*
  * call-seq:
  *     Message.==(other) => boolean
@@ -699,7 +685,10 @@ static VALUE Message_eq(VALUE _self, VALUE _other) {
   Message* other = ruby_to_Message(_other);
   assert(self->msgdef == other->msgdef);
 
-  return Message_Equal(self->msg, other->msg, self->msgdef) ? Qtrue : Qfalse;
+  const upb_MiniTable* m = upb_MessageDef_MiniTable(self->msgdef);
+  const int options = 0;
+  return upb_Message_IsEqual(self->msg, other->msg, m, options) ? Qtrue
+                                                                : Qfalse;
 }
 
 uint64_t Message_Hash(const upb_Message* msg, const upb_MessageDef* m,

data/ext/google/protobuf_c/message.h

@@ -54,10 +54,6 @@ uint64_t Message_Hash(const upb_Message* msg, const upb_MessageDef* m,
 upb_Message* Message_deep_copy(const upb_Message* msg, const upb_MessageDef* m,
                                upb_Arena* arena);
 
-// Returns true if these two messages are equal.
-bool Message_Equal(const upb_Message* m1, const upb_Message* m2,
-                   const upb_MessageDef* m);
-
 // Checks that this Ruby object is a message, and raises an exception if not.
 void Message_CheckClass(VALUE klass);