google-protobuf 3.21.12 → 3.22.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0b23be5be98bd61dc232a5ffb1eb6d7b11d38e21bf088140e79af252ad06fa4
-  data.tar.gz: 88fd35d071aa35107fe11dc3c4acbd07e437fdfa57bca40990c5c4961df58374
+  metadata.gz: ac38bcf7bc64e0fde46bfba2380e62f02ea262ea7ff2102e76ddce083385e1e4
+  data.tar.gz: a20bf4b6e63e0b96a1a1c079584eb665ffcdd75b3226a342a7010a59530ffeff
 SHA512:
-  metadata.gz: fb39de679d089a3ca3ce3b7bb4cb2bbb9085431f2530d6128e10b3d4b1153e6cb51ad4632449b9d458d0f4c9a71435f76f009ce6cbc3341bc22be8d28bb3f8fc
-  data.tar.gz: 154463a7fdc6fc8e0977253b2a6ed8493f515e014c4fd2ba60d5bf22f6711f0b6f6dd3bb816710c1ef2c66e212fd29edd8b90f6a98b0bd584b265d14a7ef72e4
+  metadata.gz: f72368247b7e3d2ae9ceb0172ea43f79659562ac32dc205aef156e60addda1ce07898df2b9c5aa9ac15bbdceaf692e7fde2bc570c40f0e0bf285bb60cb1f127a
+  data.tar.gz: '04359f464dc8570a9c1b9d36f13b9b8e65fcb4cce295844500d094ee13a87a0d18bd7a32bb7477cda98563de24890f15d47bccab38818a53b736a9a5ade0071b'

data/ext/google/protobuf_c/defs.c

@@ -811,7 +811,7 @@ static VALUE FieldDescriptor_has(VALUE _self, VALUE msg_rb) {
     rb_raise(rb_eArgError, "does not track presence");
   }
 
-  return upb_Message_Has(msg, self->fielddef) ? Qtrue : Qfalse;
+  return upb_Message_HasFieldByDef(msg, self->fielddef) ? Qtrue : Qfalse;
 }
 
 /*
@@ -829,7 +829,7 @@ static VALUE FieldDescriptor_clear(VALUE _self, VALUE msg_rb) {
     rb_raise(cTypeError, "has method called on wrong message type");
   }
 
-  upb_Message_ClearField(msg, self->fielddef);
+  upb_Message_ClearFieldByDef(msg, self->fielddef);
   return Qnil;
 }
 
@@ -854,7 +854,7 @@ static VALUE FieldDescriptor_set(VALUE _self, VALUE msg_rb, VALUE value) {
 
   msgval = Convert_RubyToUpb(value, upb_FieldDef_Name(self->fielddef),
                              TypeInfo_get(self->fielddef), arena);
-  upb_Message_Set(msg, self->fielddef, msgval, arena);
+  upb_Message_SetFieldByDef(msg, self->fielddef, msgval, arena);
   return Qnil;
 }
 

data/ext/google/protobuf_c/extconf.rb

@@ -6,8 +6,8 @@ ext_name = "google/protobuf_c"
 
 dir_config(ext_name)
 
-if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
+if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ || RUBY_PLATFORM =~ /freebsd/
+  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement -I$(srcdir)/third_party/utf8_range"
 else
   $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"
 end

data/ext/google/protobuf_c/map.c

@@ -133,14 +133,13 @@ static upb_Map* Map_GetMutable(VALUE _self) {
 VALUE Map_CreateHash(const upb_Map* map, upb_CType key_type,
                      TypeInfo val_info) {
   VALUE hash = rb_hash_new();
-  size_t iter = kUpb_Map_Begin;
   TypeInfo key_info = TypeInfo_from_type(key_type);
 
   if (!map) return hash;
 
-  while (upb_MapIterator_Next(map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(map, iter);
+  size_t iter = kUpb_Map_Begin;
+  upb_MessageValue key, val;
+  while (upb_Map_Next(map, &key, &val, &iter)) {
     VALUE key_val = Convert_UpbToRuby(key, key_info, Qnil);
     VALUE val_val = Scalar_CreateHash(val, val_info);
     rb_hash_aset(hash, key_val, val_val);
@@ -156,9 +155,8 @@ VALUE Map_deep_copy(VALUE obj) {
   upb_Map* new_map =
       upb_Map_New(arena, self->key_type, self->value_type_info.type);
   size_t iter = kUpb_Map_Begin;
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
+  upb_MessageValue key, val;
+  while (upb_Map_Next(self->map, &key, &val, &iter)) {
     upb_MessageValue val_copy =
         Msgval_DeepCopy(val, self->value_type_info, arena);
     upb_Map_Set(new_map, key, val_copy, arena);
@@ -202,9 +200,8 @@ void Map_Inspect(StringBuilder* b, const upb_Map* map, upb_CType key_type,
   StringBuilder_Printf(b, "{");
   if (map) {
     size_t iter = kUpb_Map_Begin;
-    while (upb_MapIterator_Next(map, &iter)) {
-      upb_MessageValue key = upb_MapIterator_Key(map, iter);
-      upb_MessageValue val = upb_MapIterator_Value(map, iter);
+    upb_MessageValue key, val;
+    while (upb_Map_Next(map, &key, &val, &iter)) {
       if (first) {
         first = false;
       } else {
@@ -239,7 +236,6 @@ static VALUE Map_merge_into_self(VALUE _self, VALUE hashmap) {
     Map* other = ruby_to_Map(hashmap);
     upb_Arena* arena = Arena_get(self->arena);
     upb_Message* self_msg = Map_GetMutable(_self);
-    size_t iter = kUpb_Map_Begin;
 
     Arena_fuse(other->arena, arena);
 
@@ -249,9 +245,9 @@ static VALUE Map_merge_into_self(VALUE _self, VALUE hashmap) {
       rb_raise(rb_eArgError, "Attempt to merge Map with mismatching types");
     }
 
-    while (upb_MapIterator_Next(other->map, &iter)) {
-      upb_MessageValue key = upb_MapIterator_Key(other->map, iter);
-      upb_MessageValue val = upb_MapIterator_Value(other->map, iter);
+    size_t iter = kUpb_Map_Begin;
+    upb_MessageValue key, val;
+    while (upb_Map_Next(other->map, &key, &val, &iter)) {
       upb_Map_Set(self_msg, key, val, arena);
     }
   } else {
@@ -343,10 +339,9 @@ static VALUE Map_init(int argc, VALUE* argv, VALUE _self) {
 static VALUE Map_each(VALUE _self) {
   Map* self = ruby_to_Map(_self);
   size_t iter = kUpb_Map_Begin;
+  upb_MessageValue key, val;
 
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
+  while (upb_Map_Next(self->map, &key, &val, &iter)) {
     VALUE key_val = Convert_UpbToRuby(key, Map_keyinfo(self), self->arena);
     VALUE val_val = Convert_UpbToRuby(val, self->value_type_info, self->arena);
     rb_yield_values(2, key_val, val_val);
@@ -365,9 +360,9 @@ static VALUE Map_keys(VALUE _self) {
   Map* self = ruby_to_Map(_self);
   size_t iter = kUpb_Map_Begin;
   VALUE ret = rb_ary_new();
+  upb_MessageValue key, val;
 
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
+  while (upb_Map_Next(self->map, &key, &val, &iter)) {
     VALUE key_val = Convert_UpbToRuby(key, Map_keyinfo(self), self->arena);
     rb_ary_push(ret, key_val);
   }
@@ -385,9 +380,9 @@ static VALUE Map_values(VALUE _self) {
   Map* self = ruby_to_Map(_self);
   size_t iter = kUpb_Map_Begin;
   VALUE ret = rb_ary_new();
+  upb_MessageValue key, val;
 
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
+  while (upb_Map_Next(self->map, &key, &val, &iter)) {
     VALUE val_val = Convert_UpbToRuby(val, self->value_type_info, self->arena);
     rb_ary_push(ret, val_val);
   }
@@ -464,24 +459,17 @@ static VALUE Map_has_key(VALUE _self, VALUE key) {
  */
 static VALUE Map_delete(VALUE _self, VALUE key) {
   Map* self = ruby_to_Map(_self);
+  rb_check_frozen(_self);
+
   upb_MessageValue key_upb =
       Convert_RubyToUpb(key, "", Map_keyinfo(self), NULL);
   upb_MessageValue val_upb;
-  VALUE ret;
 
-  rb_check_frozen(_self);
-
-  // TODO(haberman): make upb_Map_Delete() also capable of returning the deleted
-  // value.
-  if (upb_Map_Get(self->map, key_upb, &val_upb)) {
-    ret = Convert_UpbToRuby(val_upb, self->value_type_info, self->arena);
+  if (upb_Map_Delete(self->map, key_upb, &val_upb)) {
+    return Convert_UpbToRuby(val_upb, self->value_type_info, self->arena);
   } else {
-    ret = Qnil;
+    return Qnil;
   }
-
-  upb_Map_Delete(Map_GetMutable(_self), key_upb);
-
-  return ret;
 }
 
 /*
@@ -523,9 +511,8 @@ static VALUE Map_dup(VALUE _self) {
 
   Arena_fuse(self->arena, arena);
 
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
+  upb_MessageValue key, val;
+  while (upb_Map_Next(self->map, &key, &val, &iter)) {
     upb_Map_Set(new_map, key, val, arena);
   }
 
@@ -574,9 +561,8 @@ VALUE Map_eq(VALUE _self, VALUE _other) {
   // For each member of self, check that an equal member exists at the same key
   // in other.
   size_t iter = kUpb_Map_Begin;
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
+  upb_MessageValue key, val;
+  while (upb_Map_Next(self->map, &key, &val, &iter)) {
     upb_MessageValue other_val;
     if (!upb_Map_Get(other->map, key, &other_val)) {
       // Not present in other map.
@@ -619,9 +605,8 @@ VALUE Map_hash(VALUE _self) {
 
   size_t iter = kUpb_Map_Begin;
   TypeInfo key_info = {self->key_type};
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
+  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);
   }