google-protobuf 3.24.4-java → 3.25.0-java

data/lib/google/protobuf/repeated_field.rb

@@ -1,32 +1,9 @@
 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
 
 require 'forwardable'
 

data/lib/google/protobuf/source_context_pb.rb

@@ -11,7 +11,7 @@ pool = Google::Protobuf::DescriptorPool.generated_pool
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)

data/lib/google/protobuf/struct_pb.rb

@@ -11,7 +11,7 @@ pool = Google::Protobuf::DescriptorPool.generated_pool
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)

data/lib/google/protobuf/timestamp_pb.rb

@@ -11,7 +11,7 @@ pool = Google::Protobuf::DescriptorPool.generated_pool
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)

data/lib/google/protobuf/type_pb.rb

@@ -14,7 +14,7 @@ pool = Google::Protobuf::DescriptorPool.generated_pool
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)

data/lib/google/protobuf/well_known_types.rb

@@ -1,33 +1,10 @@
 #!/usr/bin/ruby
 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
 
 require 'google/protobuf/any_pb'
 require 'google/protobuf/duration_pb'

data/lib/google/protobuf/wrappers_pb.rb

@@ -11,7 +11,7 @@ pool = Google::Protobuf::DescriptorPool.generated_pool
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)

data/lib/google/protobuf.rb

@@ -1,32 +1,9 @@
 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
 
 # require mixins before we hook them into the java & c code
 require 'google/protobuf/message_exts'
@@ -39,26 +16,16 @@ module Google
     class Error < StandardError; end
     class ParseError < Error; end
     class TypeError < ::TypeError; end
-  end
-end
-
-if RUBY_PLATFORM == "java"
-  require 'json'
-  require 'google/protobuf_java'
-else
-  begin
-    require "google/#{RUBY_VERSION.sub(/\.\d+$/, '')}/protobuf_c"
-  rescue LoadError
-    require 'google/protobuf_c'
-  end
 
-end
-
-require 'google/protobuf/descriptor_dsl'
-require 'google/protobuf/repeated_field'
-
-module Google
-  module Protobuf
+    PREFER_FFI = case ENV['PROTOCOL_BUFFERS_RUBY_IMPLEMENTATION']
+                 when nil, "", /^native$/i
+                   false
+                 when /^ffi$/i
+                   true
+                 else
+                   warn "Unexpected value `#{ENV['PROTOCOL_BUFFERS_RUBY_IMPLEMENTATION']}` for environment variable `PROTOCOL_BUFFERS_RUBY_IMPLEMENTATION`. Should be either \"FFI\", \"NATIVE\"."
+                   false
+                 end
 
     def self.encode(msg, options = {})
       msg.to_proto(options)
@@ -76,5 +43,19 @@ module Google
       klass.decode_json(json, options)
     end
 
+    IMPLEMENTATION = if PREFER_FFI
+      begin
+        require 'google/protobuf_ffi'
+        :FFI
+      rescue LoadError
+        warn "Caught exception `#{$!.message}` while loading FFI implementation of google/protobuf."
+        warn "Falling back to native implementation."
+        require 'google/protobuf_native'
+        :NATIVE
+      end
+    else
+      require 'google/protobuf_native'
+      :NATIVE
+    end
   end
 end

data/lib/google/protobuf_ffi.rb

@@ -0,0 +1,50 @@
+# Protocol Buffers - Google's data interchange format
+# Copyright 2023 Google Inc.  All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+require 'ffi-compiler/loader'
+require 'google/protobuf/ffi/ffi'
+require 'google/protobuf/ffi/internal/type_safety'
+require 'google/protobuf/ffi/internal/pointer_helper'
+require 'google/protobuf/ffi/internal/arena'
+require 'google/protobuf/ffi/internal/convert'
+require 'google/protobuf/ffi/descriptor'
+require 'google/protobuf/ffi/enum_descriptor'
+require 'google/protobuf/ffi/field_descriptor'
+require 'google/protobuf/ffi/oneof_descriptor'
+require 'google/protobuf/ffi/descriptor_pool'
+require 'google/protobuf/ffi/file_descriptor'
+require 'google/protobuf/ffi/map'
+require 'google/protobuf/ffi/object_cache'
+require 'google/protobuf/ffi/repeated_field'
+require 'google/protobuf/ffi/message'
+require 'google/protobuf/descriptor_dsl'
+
+module Google
+  module Protobuf
+    def self.deep_copy(object)
+      case object
+      when RepeatedField
+        RepeatedField.send(:deep_copy, object)
+      when Google::Protobuf::Map
+        Google::Protobuf::Map.deep_copy(object)
+      when Google::Protobuf::MessageExts
+        object.class.send(:deep_copy, object.instance_variable_get(:@msg))
+      else
+        raise NotImplementedError
+      end
+    end
+
+    def self.discard_unknown(message)
+      raise FrozenError if message.frozen?
+      raise ArgumentError.new "Expected message, got #{message.class} instead." if message.instance_variable_get(:@msg).nil?
+      unless Google::Protobuf::FFI.message_discard_unknown(message.instance_variable_get(:@msg), message.class.descriptor, 128)
+        raise RuntimeError.new "Messages nested too deeply."
+      end
+      nil
+    end
+  end
+end

data/lib/google/protobuf_native.rb

@@ -0,0 +1,20 @@
+# Protocol Buffers - Google's data interchange format
+# Copyright 2023 Google Inc.  All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+if RUBY_PLATFORM == "java"
+  require 'json'
+  require 'google/protobuf_java'
+else
+  begin
+    require "google/#{RUBY_VERSION.sub(/\.\d+$/, '')}/protobuf_c"
+  rescue LoadError
+    require 'google/protobuf_c'
+  end
+end
+
+require 'google/protobuf/descriptor_dsl'
+require 'google/protobuf/repeated_field'

data/lib/google/tasks/ffi.rake

@@ -0,0 +1,102 @@
+# # @param task [FFI::Compiler::CompileTask] task to configure
+def configure_common_compile_task(task)
+  if FileUtils.pwd.include? 'ext'
+    src_dir = '.'
+    third_party_path = 'third_party/utf8_range'
+  else
+    src_dir = 'ext/google/protobuf_c'
+    third_party_path = 'ext/google/protobuf_c/third_party/utf8_range'
+  end
+
+  task.add_include_path third_party_path
+  task.add_define 'NDEBUG'
+  task.cflags << "-std=gnu99 -O3"
+  [
+    :convert, :defs, :map, :message, :protobuf, :repeated_field, :wrap_memcpy
+  ].each { |file| task.exclude << "/#{file}.c" }
+  task.ext_dir = src_dir
+  task.source_dirs = [src_dir]
+  if RbConfig::CONFIG['target_os'] =~ /darwin|linux/
+    task.cflags << "-Wall -Wsign-compare -Wno-declaration-after-statement"
+  end
+end
+
+# FFI::CompilerTask's constructor walks the filesystem at task definition time
+# to create subtasks for each source file, so files from third_party must be
+# copied into place before the task is defined for it to work correctly.
+# TODO Is there a sane way to check for generated protos under lib too?
+def with_generated_files
+  expected_path = FileUtils.pwd.include?('ext') ? 'third_party/utf8_range' : 'ext/google/protobuf_c/third_party/utf8_range'
+  if File.directory?(expected_path)
+    yield
+  else
+    task :default do
+      # It is possible, especially in cases like the first invocation of
+      # `rake test` following `rake clean` or a fresh checkout that the
+      # `copy_third_party` task has been executed since initial task definition.
+      # If so, run the task definition block now and invoke it explicitly.
+      if File.directory?(expected_path)
+        yield
+        Rake::Task[:default].invoke
+      else
+        raise "Missing directory #{File.absolute_path(expected_path)}." +
+                " Did you forget to run `rake copy_third_party` before building" +
+                " native extensions?"
+      end
+    end
+  end
+end
+
+begin
+  require "ffi-compiler/compile_task"
+
+  desc "Compile Protobuf library for FFI"
+  namespace "ffi-protobuf" do
+    with_generated_files do
+      # Compile Ruby UPB separately in order to limit use of -DUPB_BUILD_API to one
+      # compilation unit.
+      desc "Compile UPB library for FFI"
+      namespace "ffi-upb" do
+        with_generated_files do
+          FFI::Compiler::CompileTask.new('ruby-upb') do |c|
+            configure_common_compile_task c
+            c.add_define "UPB_BUILD_API"
+            c.exclude << "/glue.c"
+            c.exclude << "/shared_message.c"
+            c.exclude << "/shared_convert.c"
+            if RbConfig::CONFIG['target_os'] =~ /darwin|linux/
+              c.cflags << "-fvisibility=hidden"
+            end
+          end
+        end
+      end
+
+      FFI::Compiler::CompileTask.new 'protobuf_c_ffi' do |c|
+        configure_common_compile_task c
+        # Ruby UPB was already compiled with different flags.
+        c.exclude << "/range2-neon.c"
+        c.exclude << "/range2-sse.c"
+        c.exclude << "/naive.c"
+        c.exclude << "/ruby-upb.c"
+      end
+
+      # Setup dependencies so that the .o files generated by building ffi-upb are
+      # available to link here.
+      # TODO Can this be simplified? Can the single shared library be used
+      # instead of the object files?
+      protobuf_c_task = Rake::Task[:default]
+      protobuf_c_shared_lib_task = Rake::Task[protobuf_c_task.prereqs.last]
+      ruby_upb_shared_lib_task = Rake::Task[:"ffi-upb:default"].prereqs.first
+      Rake::Task[ruby_upb_shared_lib_task].prereqs.each do |dependency|
+        protobuf_c_shared_lib_task.prereqs.prepend dependency
+      end
+    end
+  end
+rescue LoadError
+  desc "Compile Protobuf library for FFI"
+  namespace "ffi-protobuf" do
+    task :default do
+      warn "Skipping build of FFI; `gem install ffi-compiler` to enable."
+    end
+  end
+end

metadata

@@ -1,15 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.24.4
+  version: 3.25.0
 platform: java
 authors:
 - Protobuf Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  name: ffi
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  name: ffi-compiler
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
+  name: rake
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  name: ffi
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  name: ffi-compiler
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -47,9 +117,27 @@ dependencies:
 description: Protocol Buffers are Google's data interchange format.
 email: protobuf@googlegroups.com
 executables: []
-extensions: []
+extensions:
+- ext/google/protobuf_c/Rakefile
 extra_rdoc_files: []
 files:
+- ext/google/protobuf_c/Rakefile
+- ext/google/protobuf_c/glue.c
+- ext/google/protobuf_c/message.c
+- ext/google/protobuf_c/message.h
+- ext/google/protobuf_c/protobuf.c
+- ext/google/protobuf_c/protobuf.h
+- ext/google/protobuf_c/ruby-upb.c
+- ext/google/protobuf_c/ruby-upb.h
+- ext/google/protobuf_c/shared_convert.c
+- ext/google/protobuf_c/shared_convert.h
+- ext/google/protobuf_c/shared_message.c
+- ext/google/protobuf_c/shared_message.h
+- ext/google/protobuf_c/third_party/utf8_range/LICENSE
+- ext/google/protobuf_c/third_party/utf8_range/naive.c
+- ext/google/protobuf_c/third_party/utf8_range/range2-neon.c
+- ext/google/protobuf_c/third_party/utf8_range/range2-sse.c
+- ext/google/protobuf_c/third_party/utf8_range/utf8_range.h
 - lib/google/protobuf.rb
 - lib/google/protobuf/any_pb.rb
 - lib/google/protobuf/api_pb.rb
@@ -57,6 +145,21 @@ files:
 - lib/google/protobuf/descriptor_pb.rb
 - lib/google/protobuf/duration_pb.rb
 - lib/google/protobuf/empty_pb.rb
+- lib/google/protobuf/ffi/descriptor.rb
+- lib/google/protobuf/ffi/descriptor_pool.rb
+- lib/google/protobuf/ffi/enum_descriptor.rb
+- lib/google/protobuf/ffi/ffi.rb
+- lib/google/protobuf/ffi/field_descriptor.rb
+- lib/google/protobuf/ffi/file_descriptor.rb
+- lib/google/protobuf/ffi/internal/arena.rb
+- lib/google/protobuf/ffi/internal/convert.rb
+- lib/google/protobuf/ffi/internal/pointer_helper.rb
+- lib/google/protobuf/ffi/internal/type_safety.rb
+- lib/google/protobuf/ffi/map.rb
+- lib/google/protobuf/ffi/message.rb
+- lib/google/protobuf/ffi/object_cache.rb
+- lib/google/protobuf/ffi/oneof_descriptor.rb
+- lib/google/protobuf/ffi/repeated_field.rb
 - lib/google/protobuf/field_mask_pb.rb
 - lib/google/protobuf/message_exts.rb
 - lib/google/protobuf/object_cache.rb
@@ -68,12 +171,15 @@ files:
 - lib/google/protobuf/type_pb.rb
 - lib/google/protobuf/well_known_types.rb
 - lib/google/protobuf/wrappers_pb.rb
+- lib/google/protobuf_ffi.rb
 - lib/google/protobuf_java.jar
+- lib/google/protobuf_native.rb
+- lib/google/tasks/ffi.rake
 homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.24.4/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.25.0/ruby
 post_install_message:
 rdoc_options: []
 require_paths: