google-protobuf 4.30.2 → 4.31.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5125cc8af8296e8ccc158044588e8aa997acb0a4dfc12b8f70207c4b6e0e312
-  data.tar.gz: 9aaaeb8e9c9b0ced47d7c14a5d3d2da37e43c6b12fd32177d87fa055b59426d0
+  metadata.gz: 1c728a95a5054361b417600c7447dfede237cc5bf78e35534f38d7468d080a4f
+  data.tar.gz: '099be6e67378db1cd5e30f201f4e31baca66a95fa009c64ebecbff259db829c8'
 SHA512:
-  metadata.gz: cc4490fe009fdf955ac03163cde61170975faba127c6987819321d6c45ef9d20823f44d25b883881c5bb2faab630c01e8a0519a20466abc624d018a759a73b33
-  data.tar.gz: 7b2364e5c5a7056df7684eed5be81b03f4806a53e8f8f9e381f879b8c11e640e191ab72e1abbf7db56f1aae8e299d4f260b2138367f657911542ad87174f031a
+  metadata.gz: 8b852417b182818d483ee2e45338a9f03a5dca07cefe4ad0d3c0d707ce1c4d517f7875cf06c20e554fb11d1e8d118973d2946d0f1cf53a9bf151f890b8b2f90c
+  data.tar.gz: b2105d206dcdb3d3c5e857da99e643ec6f57759310a519051be1be48ebcf739a3e24b429298fd415199a31eb4c0fa54367f7391333489ad31dab9b8e710e0107

data/ext/google/protobuf_c/defs.c

@@ -156,6 +156,7 @@ static VALUE DescriptorPool_lookup(VALUE _self, VALUE name) {
   const upb_EnumDef* enumdef;
   const upb_FieldDef* fielddef;
   const upb_ServiceDef* servicedef;
+  const upb_FileDef* filedef;
 
   msgdef = upb_DefPool_FindMessageByName(self->symtab, name_str);
   if (msgdef) {
@@ -177,6 +178,11 @@ static VALUE DescriptorPool_lookup(VALUE _self, VALUE name) {
     return get_servicedef_obj(_self, servicedef);
   }
 
+  filedef = upb_DefPool_FindFileByName(self->symtab, name_str);
+  if (filedef) {
+    return get_filedef_obj(_self, filedef);
+  }
+
   return Qnil;
 }
 
@@ -792,6 +798,28 @@ static VALUE FieldDescriptor_has_presence(VALUE _self) {
   return upb_FieldDef_HasPresence(self->fielddef) ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq:
+ *     FieldDescriptor.required? => bool
+ *
+ * Returns whether this is a required field.
+ */
+static VALUE FieldDescriptor_is_required(VALUE _self) {
+  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
+  return upb_FieldDef_IsRequired(self->fielddef) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *     FieldDescriptor.repeated? => bool
+ *
+ * Returns whether this is a repeated field.
+ */
+static VALUE FieldDescriptor_is_repeated(VALUE _self) {
+  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
+  return upb_FieldDef_IsRepeated(self->fielddef) ? Qtrue : Qfalse;
+}
+
 /*
  * call-seq:
  *     FieldDescriptor.is_packed? => bool
@@ -817,6 +845,8 @@ static VALUE FieldDescriptor_json_name(VALUE _self) {
 }
 
 /*
+ * DEPRECATED: Use repeated? or required? instead.
+ *
  * call-seq:
  *     FieldDescriptor.label => label
  *
@@ -1032,6 +1062,8 @@ static void FieldDescriptor_register(VALUE module) {
   rb_define_method(klass, "type", FieldDescriptor__type, 0);
   rb_define_method(klass, "default", FieldDescriptor_default, 0);
   rb_define_method(klass, "has_presence?", FieldDescriptor_has_presence, 0);
+  rb_define_method(klass, "required?", FieldDescriptor_is_required, 0);
+  rb_define_method(klass, "repeated?", FieldDescriptor_is_repeated, 0);
   rb_define_method(klass, "is_packed?", FieldDescriptor_is_packed, 0);
   rb_define_method(klass, "json_name", FieldDescriptor_json_name, 0);
   rb_define_method(klass, "label", FieldDescriptor_label, 0);

data/ext/google/protobuf_c/extconf.rb

@@ -18,10 +18,14 @@ if ENV["LD"]
   RbConfig::CONFIG["LD"] = RbConfig::MAKEFILE_CONFIG["LD"] = ENV["LD"]
 end
 
+debug_enabled = ENV["PROTOBUF_CONFIG"] == "dbg"
+
+additional_c_flags = debug_enabled ? "-O0 -fno-omit-frame-pointer -fvisibility=default -g" : "-O3 -DNDEBUG -fvisibility=hidden"
+
 if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ || RUBY_PLATFORM =~ /freebsd/
-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
+  $CFLAGS += " -std=gnu99 -Wall -Wsign-compare -Wno-declaration-after-statement #{additional_c_flags}"
 else
-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"
+  $CFLAGS += " -std=gnu99 #{additional_c_flags}"
 end
 
 if RUBY_PLATFORM =~ /linux/

data/ext/google/protobuf_c/map.c

@@ -650,8 +650,8 @@ VALUE Map_hash(VALUE _self) {
   TypeInfo key_info = {self->key_type};
   upb_MessageValue key, val;
   while (upb_Map_Next(self->map, &key, &val, &iter)) {
-    hash = Msgval_GetHash(key, key_info, hash);
-    hash = Msgval_GetHash(val, self->value_type_info, hash);
+    hash += Msgval_GetHash(key, key_info, 0);
+    hash += Msgval_GetHash(val, self->value_type_info, 0);
   }
 
   return LL2NUM(hash);

data/ext/google/protobuf_c/message.c

@@ -398,7 +398,7 @@ static VALUE Message_field_accessor(VALUE _self, const upb_FieldDef* f,
       upb_MessageValue msgval =
           upb_Message_GetFieldByDef(Message_Get(_self, NULL), f);
 
-      if (upb_FieldDef_Label(f) == kUpb_Label_Repeated) {
+      if (upb_FieldDef_IsRepeated(f)) {
         // Map repeated fields to a new type with ints
         VALUE arr = rb_ary_new();
         size_t i, n = upb_Array_Size(msgval.array_val);
@@ -592,7 +592,7 @@ static void Message_InitFieldFromValue(upb_Message* msg, const upb_FieldDef* f,
   if (upb_FieldDef_IsMap(f)) {
     upb_Map* map = upb_Message_Mutable(msg, f, arena).map;
     Map_InitFromValue(map, f, val, arena);
-  } else if (upb_FieldDef_Label(f) == kUpb_Label_Repeated) {
+  } else if (upb_FieldDef_IsRepeated(f)) {
     upb_Array* arr = upb_Message_Mutable(msg, f, arena).array;
     RepeatedField_InitFromValue(arr, f, val, arena);
   } else if (upb_FieldDef_IsSubMessage(f)) {

data/ext/google/protobuf_c/protobuf.h

@@ -16,12 +16,6 @@
 #undef NDEBUG
 #endif
 
-#include <ruby/version.h>
-
-#if RUBY_API_VERSION_CODE < 20700
-#error Protobuf requires Ruby >= 2.7
-#endif
-
 #include <assert.h>  // Must be included after the NDEBUG logic above.
 #include <ruby/encoding.h>
 #include <ruby/vm.h>