google-protobuf 4.36.2-java → 4.37.0.rc.1-java

data/ext/google/protobuf_c/shared_message.c

@@ -16,6 +16,10 @@
 uint64_t shared_Message_Hash(const upb_Message* msg, const upb_MessageDef* m,
                              uint64_t seed, upb_Status* status) {
   upb_Arena* arena = upb_Arena_New();
+  if (!arena) {
+    upb_Status_SetErrorMessage(status, "Out of memory");
+    return 0;
+  }
   char* data;
   size_t size;
 
@@ -32,6 +36,10 @@ uint64_t shared_Message_Hash(const upb_Message* msg, const upb_MessageDef* m,
   }
 
   upb_Arena_Free(arena);
-  upb_Status_SetErrorMessage(status, "Error calculating hash");
+  if (encode_status == kUpb_EncodeStatus_OutOfMemory) {
+    upb_Status_SetErrorMessage(status, "Out of memory");
+  } else {
+    upb_Status_SetErrorMessage(status, "Error calculating hash");
+  }
   return 0;
 }

data/lib/google/protobuf/ffi/internal/convert.rb

@@ -190,9 +190,31 @@ module Google
           end
         end
 
-        def to_h_internal(msg, message_descriptor)
+        def to_h_internal(msg, message_descriptor, emit_defaults = false)
           return nil if msg.nil? or msg.null?
           hash = {}
+
+          if emit_defaults
+            message_descriptor.each do |field_descriptor|
+              next if field_descriptor.has_presence? &&
+                      !Google::Protobuf::FFI.get_message_has(msg, field_descriptor)
+
+              message_value = Google::Protobuf::FFI.get_message_value(msg, field_descriptor)
+
+              if field_descriptor.map?
+                hash_entry = map_create_hash(message_value[:map_val], field_descriptor, emit_defaults)
+              elsif field_descriptor.repeated?
+                hash_entry = repeated_field_create_array(message_value[:array_val], field_descriptor, field_descriptor.type, emit_defaults)
+              else
+                hash_entry = scalar_create_hash(message_value, field_descriptor.type, field_descriptor: field_descriptor, emit_defaults: emit_defaults)
+              end
+
+              hash[field_descriptor.name.to_sym] = hash_entry
+            end
+
+            return hash
+          end
+
           iter = ::FFI::MemoryPointer.new(:size_t, 1)
           iter.write(:size_t, Google::Protobuf::FFI::Upb_Message_Begin)
           message_value = Google::Protobuf::FFI::MessageValue.new
@@ -202,11 +224,11 @@ module Google
             field_descriptor = FieldDescriptor.from_native field_def_ptr.get_pointer(0)
 
             if field_descriptor.map?
-              hash_entry = map_create_hash(message_value[:map_val], field_descriptor)
+              hash_entry = map_create_hash(message_value[:map_val], field_descriptor, emit_defaults)
             elsif field_descriptor.repeated?
-              hash_entry = repeated_field_create_array(message_value[:array_val], field_descriptor, field_descriptor.type)
+              hash_entry = repeated_field_create_array(message_value[:array_val], field_descriptor, field_descriptor.type, emit_defaults)
             else
-              hash_entry = scalar_create_hash(message_value, field_descriptor.type, field_descriptor: field_descriptor)
+              hash_entry = scalar_create_hash(message_value, field_descriptor.type, field_descriptor: field_descriptor, emit_defaults: emit_defaults)
             end
 
             hash[field_descriptor.name.to_sym] = hash_entry
@@ -215,7 +237,7 @@ module Google
           hash
         end
 
-        def map_create_hash(map_ptr, field_descriptor)
+        def map_create_hash(map_ptr, field_descriptor, emit_defaults = false)
           return {} if map_ptr.nil? or map_ptr.null?
           return_value = {}
 
@@ -233,24 +255,24 @@ module Google
             key_message_value = Google::Protobuf::FFI.map_key(map_ptr, iter_size_t)
             value_message_value = Google::Protobuf::FFI.map_value(map_ptr, iter_size_t)
             hash_key = convert_upb_to_ruby(key_message_value, key_field_type)
-            hash_value = scalar_create_hash(value_message_value, value_field_type, msg_or_enum_descriptor: value_field_def.subtype)
+            hash_value = scalar_create_hash(value_message_value, value_field_type, msg_or_enum_descriptor: value_field_def.subtype, emit_defaults: emit_defaults)
             return_value[hash_key] = hash_value
           end
           return_value
         end
 
-        def repeated_field_create_array(array, field_descriptor, type)
+        def repeated_field_create_array(array, field_descriptor, type, emit_defaults = false)
           return_value = []
           n = (array.nil? || array.null?) ? 0 : Google::Protobuf::FFI.array_size(array)
           0.upto(n - 1) do |i|
             message_value = Google::Protobuf::FFI.get_msgval_at(array, i)
-            return_value << scalar_create_hash(message_value, type, field_descriptor: field_descriptor)
+            return_value << scalar_create_hash(message_value, type, field_descriptor: field_descriptor, emit_defaults: emit_defaults)
           end
           return_value
         end
 
         # @param field_descriptor [FieldDescriptor] Descriptor of the field to convert to a hash.
-        def scalar_create_hash(message_value, type, field_descriptor: nil, msg_or_enum_descriptor: nil)
+        def scalar_create_hash(message_value, type, field_descriptor: nil, msg_or_enum_descriptor: nil, emit_defaults: false)
           if [:message, :enum].include? type
             if field_descriptor.nil?
               if msg_or_enum_descriptor.nil?
@@ -260,7 +282,7 @@ module Google
               msg_or_enum_descriptor = field_descriptor.subtype
             end
             if type == :message
-              to_h_internal(message_value[:msg_val], msg_or_enum_descriptor)
+              to_h_internal(message_value[:msg_val], msg_or_enum_descriptor, emit_defaults)
             elsif type == :enum
               convert_upb_to_ruby message_value, type, msg_or_enum_descriptor
             end

data/lib/google/protobuf/ffi/map.rb

@@ -20,7 +20,6 @@ module Google
 
       # MapIterator
       attach_function :map_next,    :upb_MapIterator_Next,  [:Map, :pointer], :bool
-      attach_function :map_done,    :upb_MapIterator_Done,  [:Map, :size_t], :bool
       attach_function :map_key,     :upb_MapIterator_Key,   [:Map, :size_t], MessageValue.by_value
       attach_function :map_value,   :upb_MapIterator_Value, [:Map, :size_t], MessageValue.by_value
     end

data/lib/google/protobuf/ffi/message.rb

@@ -137,8 +137,16 @@ module Google
             encoding.read(:pointer).read_string(size_ptr.read(:size_t)).hash
           end
 
-          def to_h
-            to_h_internal @msg, self.class.descriptor
+          ##
+          # call-seq:
+          #     Message.to_h(emit_defaults: false) => hash
+          #
+          # Returns the message as a Ruby Hash object, with keys as symbols. With
+          # emit_defaults: true, fields that have no presence are also included with
+          # their default values. Fields that have presence (message fields, oneof
+          # fields and fields with explicit presence) are included only when set.
+          def to_h(emit_defaults: false)
+            to_h_internal @msg, self.class.descriptor, emit_defaults
           end
 
           ##

data/lib/google/protobuf/ffi/repeated_field.rb

@@ -67,8 +67,14 @@ module Google
       # also includes Enumerable; combined with this method, the repeated field thus
       # acts like an ordinary Ruby sequence.
       def each &block
-        each_msg_val do |element|
+        # The length is re-read every iteration: the block can clear or shrink
+        # the field, and a cached length would then read past the end of the
+        # upb array.
+        i = 0
+        while i < length
+          element = Google::Protobuf::FFI.get_msgval_at(array, i)
           yield(convert_upb_to_ruby(element, type, descriptor, arena))
+          i += 1
         end
         self
       end
@@ -222,6 +228,8 @@ module Google
         return true if other.object_id == object_id
         if other.is_a? RepeatedField
           return false unless other.length == length
+          return true if length == 0
+          return false if type != other.send(:type) or descriptor != other.send(:descriptor)
           each_msg_val_with_index do |msg_val, i|
             other_msg_val = Google::Protobuf::FFI.get_msgval_at(other.send(:array), i)
             unless Google::Protobuf::FFI.message_value_equal(msg_val, other_msg_val, type, descriptor)

data/lib/google/protobuf/json_enumvalue_options_pb.rb

@@ -7,7 +7,7 @@ require 'google/protobuf'
 require 'google/protobuf/descriptor_pb'
 
 
-descriptor_data = "\n,google/protobuf/json_enumvalue_options.proto\x12\x0cpb.enumvalue\x1a google/protobuf/descriptor.proto\"(\n\x14JsonEnumValueOptions\x12\x0e\n\x06string\x18\x01 \x01(\tX\x01:\\\n\x04json\x12!.google.protobuf.EnumValueOptions\x18\xe6\x07 \x01(\x0b\x32\".pb.enumvalue.JsonEnumValueOptionsB\x06\xb2\x01\x03\x08\xea\x07\x42\x1a\n\x18\x63om.google.protobuf.utilb\x08\x65\x64itionsp\xe9\x07"
+descriptor_data = "\n,google/protobuf/json_enumvalue_options.proto\x12\x0cpb.enumvalue\x1a google/protobuf/descriptor.proto\"(\n\x14JsonEnumValueOptions\x12\x0e\n\x06string\x18\x01 \x01(\tX\x01:\\\n\x04json\x12!.google.protobuf.EnumValueOptions\x18\xe6\x07 \x01(\x0b\x32\".pb.enumvalue.JsonEnumValueOptionsB\x06\xb2\x01\x03\x08\xea\x07\x42J\n\x18\x63om.google.protobuf.utilZ.google.golang.org/protobuf/types/jsonoptionspbb\x08\x65\x64itionsp\xe9\x07"
 
 pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)

data/lib/google/protobuf/json_options_pb.rb

@@ -7,7 +7,7 @@ require 'google/protobuf'
 require 'google/protobuf/json_enumvalue_options_pb'
 
 
-descriptor_data = "\n\"google/protobuf/json_options.proto\x12\x02pb\x1a,google/protobuf/json_enumvalue_options.protoB\x1a\n\x18\x63om.google.protobuf.utilP\x00\x62\x08\x65\x64itionsp\xe9\x07"
+descriptor_data = "\n\"google/protobuf/json_options.proto\x12\x02pb\x1a,google/protobuf/json_enumvalue_options.protoBJ\n\x18\x63om.google.protobuf.utilZ.google.golang.org/protobuf/types/jsonoptionspbP\x00\x62\x08\x65\x64itionsp\xe9\x07"
 
 pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)

data/lib/google/protobuf/repeated_field.rb

@@ -52,7 +52,8 @@ module Google
         :pack, :permutation, :product, :pretty_print, :pretty_print_cycle,
         :rassoc, :repeated_combination, :repeated_permutation, :reverse,
         :rindex, :rotate, :sample, :shuffle, :shelljoin,
-        :to_s, :transpose, :union, :uniq, :|
+        :to_s, :transpose, :union, :uniq, :|,
+        :values_at
 
 
       def first(n=nil)
@@ -95,7 +96,6 @@ module Google
 
       # array aliases into enumerable
       alias_method :slice, :[]
-      alias_method :values_at, :select
       alias_method :map, :collect
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 4.36.2
+  version: 4.37.0.rc.1
 platform: java
 authors:
 - Protobuf Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-17 00:00:00.000000000 Z
+date: 2026-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: bigdecimal
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -136,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: bigdecimal
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Protocol Buffers are Google's data interchange format.
 email: protobuf@googlegroups.com
 executables: []
@@ -204,7 +204,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.36.2/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v37.0-rc1/ruby
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -216,9 +216,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.26
 signing_key: