google-protobuf 4.26.0.rc.3-java → 4.27.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a40b5480b11181630f843f412dd28eb46796077f2aeebc7db0e7d68607652be
-  data.tar.gz: a05a1efea5df38e95b3c4f8de9939c8d4af62d30a3c5908576ee4b998c5bcc59
+  metadata.gz: a53819b4e615517631da1abd89555acefb1d1ba571709061d42080c9ff7a1e37
+  data.tar.gz: a8177f2888434b932786c5981612cfcc47787fe3580e8ffcb719072dd85179c2
 SHA512:
-  metadata.gz: 2eeaefb61dd7b625f1b2deb17dcdf5eb547e9ce397ab548edadb40756daa23b336817ada0c055cbed81fe2337bf3ad58ba8447385db061533b56ef17b2e65be0
-  data.tar.gz: e6113d3dbc36fa50a7fe34feef7c8b016cb6f975c3c041896ab67307bccb12cef0a141f10d07e5e5a41da955bfba0af5943f43a1e61dd71ce37d5c42a6763cb2
+  metadata.gz: 900be1864118fed9ee6ac72dca513c3d412b64f46dceeb9ba40820b9583e66f843417eaf55ca8f9b53001b40a4d93b8a7fccf117f02b15c12409ef358510cf9b
+  data.tar.gz: 137280660d4d30f266938c291d6c681c342816770cb3751027acb25bceb77139d856e824281fbcb3f45f5f2e8c1fbfc378ca08152b4e332664635f0903a0990f

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);