protobuf 3.8.5 → 3.9.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a2d88c4a85786eaf517ad597ebfb70b91f1569bbef3e6f84dbae3c133faafb5
-  data.tar.gz: cf7ff4963a35ce8d0cf3c8f67320aa8cbc05387f04c378d1d28b3dac49126978
+  metadata.gz: a0644d2a9a19095bc50b2c0eb970b2037dd85cb339e62507bda428c71ef83940
+  data.tar.gz: 7791374dff01001a27eb34d66a7e474344e2d97b5c02b49b69bb37d79aa1569b
 SHA512:
-  metadata.gz: 40d09f68f221fc5d8793904dad243dbcfc7396c8c6618f09c5cceada2f1507aa20042f6fb27c7fa0871c4bfffd7ed03f8e01ade0e0cf5fb7af95279b20b526b5
-  data.tar.gz: 4aa8f7c8cb11ad68333d451fae4b1fd85bd9e62a928159491e868ada2be9a30436747a9842f8dffff799026a5480f1da465b915a9fa9dfd50c33a9513a8e98a5
+  metadata.gz: c5d8304f1bd3e709594582d227899044c936d287bf406ff8171345d9ed0574a5f683494668ecc08cd432d6fe8c9b6b509650fef5d8d8006080b98ffa4a3ee188
+  data.tar.gz: 7e655f51518aae671afb0b9e2c6436a995ce8027ebd00471956f37a4a374439e871a33ce4c26e47af5bd58ba000f8655948213d6a7f06c8160a51e780c955d41

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
   DisplayCopNames: true
   Exclude:
     - 'spec/support/protos/*.pb.rb'
+    - 'varint_prof.rb'
 
 Lint/EndAlignment:
   AlignWith: keyword

data/.travis.yml

@@ -11,8 +11,6 @@ before_install:
   - java -Xmx1g -version
   - javac -J-Xmx1g -version
   - export JRUBY_OPTS=-J-Xmx1g
-  # Required for rainbow installation issue, https://github.com/sickill/rainbow/issues/44
-  - gem update --system
   - gem update bundler
 language: ruby
 rvm:
@@ -20,10 +18,11 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
-  - 2.2.2
   - 2.3
   - 2.4
-  - jruby-9.1.7.0
+  - 2.5
+  - jruby-9.1.17.0
+  - jruby-9.2.5.0
   - rbx-2
 env:
   - PROTOBUF_VERSION=2.6.1

data/lib/protobuf.rb

@@ -9,6 +9,20 @@ require 'active_support/core_ext/object/try'
 require 'active_support/inflector'
 require 'active_support/json'
 require 'active_support/notifications'
+# Under MRI, this optimizes proto decoding by around 15% in tests.
+# When unavailable, we fall to pure Ruby.
+# rubocop:disable Lint/HandleExceptions
+begin
+  require 'varint/varint'
+rescue LoadError
+end
+# rubocop:enable Lint/HandleExceptions
+# rubocop:disable Lint/HandleExceptions
+begin
+  require 'protobuf_java_helpers'
+rescue LoadError
+end
+# rubocop:enable Lint/HandleExceptions
 
 # All top-level run time code requires, ordered by necessity
 require 'protobuf/wire_type'

data/lib/protobuf/code_generator.rb

@@ -50,6 +50,35 @@ module Protobuf
     end
 
     Protobuf::Field::BaseField.module_eval do
+      def define_set_method!
+      end
+
+      def set_without_options(message_instance, bytes)
+        return message_instance[name] = decode(bytes) unless repeated?
+
+        if map?
+          hash = message_instance[name]
+          entry = decode(bytes)
+          # decoded value could be nil for an
+          # enum value that is not recognized
+          hash[entry.key] = entry.value unless entry.value.nil?
+          return hash[entry.key]
+        end
+
+        return message_instance[name] << decode(bytes) unless packed?
+
+        array = message_instance[name]
+        stream = StringIO.new(bytes)
+
+        if wire_type == ::Protobuf::WireType::VARINT
+          array << decode(Varint.decode(stream)) until stream.eof?
+        elsif wire_type == ::Protobuf::WireType::FIXED64
+          array << decode(stream.read(8)) until stream.eof?
+        elsif wire_type == ::Protobuf::WireType::FIXED32
+          array << decode(stream.read(4)) until stream.eof?
+        end
+      end
+
       # Sets a MessageField that is known to be an option.
       # We must allow fields to be set one at a time, as option syntax allows us to
       # set each field within the option using a separate "option" line.
@@ -72,6 +101,7 @@ module Protobuf
 
         set_without_options(message_instance, bytes)
       end
+      alias_method :set, :set_with_options
 
       def option_set(message_field, subfield, subvalue)
         return unless yield
@@ -85,9 +115,6 @@ module Protobuf
           message_field[subfield.tag] = subvalue
         end
       end
-
-      alias_method :set_without_options, :set
-      alias_method :set, :set_with_options
     end
   end
 end

data/lib/protobuf/encoder.rb

@@ -2,18 +2,7 @@ module Protobuf
   class Encoder
     def self.encode(message, stream)
       message.each_field_for_serialization do |field, value|
-        if field.repeated?
-          if field.packed?
-            packed_value = value.map { |val| field.encode(val) }.join
-            stream << "#{field.tag_encoded}#{::Protobuf::Field::VarintField.encode(packed_value.size)}#{packed_value}"
-          else
-            value.each do |val|
-              field.encode_to_stream(val, stream)
-            end
-          end
-        else
-          field.encode_to_stream(value, stream)
-        end
+        field.encode_to_stream(value, stream)
       end
 
       stream

data/lib/protobuf/enum.rb

@@ -58,6 +58,7 @@ module Protobuf
       # to be incorrect; reset them
       @mapped_enums = @values = nil
       const_set(name, enum)
+      mapped_enums
     end
 
     # Internal: A mapping of enum number -> enums defined
@@ -132,6 +133,10 @@ module Protobuf
       tag && (mapped_enums[tag.to_i] || []).first
     end
 
+    def self.enum_for_tag_integer(tag)
+      (@mapped_enums[tag] || []).first
+    end
+
     # Public: Get an Enum by a variety of type-checking mechanisms.
     #
     # candidate - An Enum, Numeric, String, or Symbol object.
@@ -153,7 +158,7 @@ module Protobuf
     # Returns an Enum object or nil.
     #
     def self.fetch(candidate)
-      return enum_for_tag(candidate) if candidate.is_a?(::Integer)
+      return enum_for_tag_integer(candidate) if candidate.is_a?(::Integer)
 
       case candidate
       when self
@@ -308,10 +313,6 @@ module Protobuf
       "\#<Protobuf::Enum(#{parent_class})::#{name}=#{tag}>"
     end
 
-    def to_i
-      tag
-    end
-
     def to_int
       tag.to_int
     end
@@ -352,12 +353,13 @@ module Protobuf
       end
     end
 
-    ::Protobuf.deprecator.define_deprecated_methods(self, :value => :to_i)
-
     ##
     # Instance Aliases
     #
-    alias :to_hash_value to_i
-    alias :to_json_hash_value to_i
+    alias :to_i tag
+    alias :to_hash_value tag
+    alias :to_json_hash_value tag
+
+    ::Protobuf.deprecator.define_deprecated_methods(self, :value => :to_i)
   end
 end

data/lib/protobuf/field/base_field.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/hash/slice'
 require 'protobuf/field/field_array'
 require 'protobuf/field/field_hash'
+require 'protobuf/field/base_field_object_definitions'
 
 module Protobuf
   module Field
@@ -11,7 +12,7 @@ module Protobuf
       ##
       # Constants
       #
-
+      OBJECT_MODULE = ::Protobuf::Field::BaseFieldObjectDefinitions
       PACKED_TYPES = [
         ::Protobuf::WireType::VARINT,
         ::Protobuf::WireType::FIXED32,
@@ -21,7 +22,7 @@ module Protobuf
       ##
       # Attributes
       #
-      attr_reader :message_class, :name, :fully_qualified_name, :options, :rule, :tag, :type_class
+      attr_reader :default_value, :message_class, :name, :fully_qualified_name, :options, :rule, :tag, :type_class
 
       ##
       # Class Methods
@@ -58,7 +59,27 @@ module Protobuf
 
         validate_packed_field if packed?
         define_accessor(simple_name, fully_qualified_name) if simple_name
-        tag_encoded
+        set_repeated_message!
+        set_map!
+        @value_from_values = nil
+        @value_from_values_for_serialization = nil
+        @field_predicate = nil
+        @field_and_present_predicate = nil
+        @set_field = nil
+        @set_method = nil
+        @to_message_hash = nil
+        @to_message_hash_string_keys = nil
+        @encode_to_stream = nil
+
+        define_value_from_values!
+        define_value_from_values_for_serialization!
+        define_field_predicate!
+        define_field_and_present_predicate!
+        define_set_field!
+        define_set_method!
+        define_to_message_hash!
+        define_encode_to_stream!
+        set_default_value!
       end
 
       ##
@@ -81,7 +102,7 @@ module Protobuf
         options[:default]
       end
 
-      def default_value
+      def set_default_value!
         @default_value ||= if optional? || required?
                              typed_default_value
                            elsif map?
@@ -93,6 +114,122 @@ module Protobuf
                            end
       end
 
+      def define_encode_to_stream!
+        @encode_to_stream = if repeated? && packed?
+                              OBJECT_MODULE::RepeatedPackedEncodeToStream.new(self)
+                            elsif repeated?
+                              OBJECT_MODULE::RepeatedNotPackedEncodeToStream.new(self)
+                            elsif message? || type_class == ::Protobuf::Field::BytesField
+                              OBJECT_MODULE::BytesEncodeToStream.new(self)
+                            elsif type_class == ::Protobuf::Field::StringField
+                              OBJECT_MODULE::StringEncodeToStream.new(self)
+                            else
+                              OBJECT_MODULE::BaseEncodeToStream.new(self)
+                            end
+      end
+
+      def encode_to_stream(value, stream)
+        @encode_to_stream.call(value, stream)
+      end
+
+      def define_field_predicate!
+        @field_predicate = if repeated?
+                             OBJECT_MODULE::RepeatedFieldPredicate.new(self)
+                           else
+                             OBJECT_MODULE::BaseFieldPredicate.new(self)
+                           end
+      end
+
+      def field?(values)
+        @field_predicate.call(values)
+      end
+
+      def define_field_and_present_predicate!
+        @field_and_present_predicate = if type_class == ::Protobuf::Field::BoolField # boolean present check
+                                         OBJECT_MODULE::BoolFieldAndPresentPredicate.new(self)
+                                       else
+                                         OBJECT_MODULE::BaseFieldAndPresentPredicate.new(self)
+                                       end
+      end
+
+      def field_and_present?(values)
+        @field_and_present_predicate.call(values)
+      end
+
+      def define_value_from_values!
+        @value_from_values = if map?
+                               OBJECT_MODULE::MapValueFromValues.new(self)
+                             elsif repeated?
+                               OBJECT_MODULE::RepeatedFieldValueFromValues.new(self)
+                             elsif type_class == ::Protobuf::Field::BoolField # boolean present check
+                               OBJECT_MODULE::BoolFieldValueFromValues.new(self)
+                             else
+                               OBJECT_MODULE::BaseFieldValueFromValues.new(self)
+                             end
+      end
+
+      def value_from_values(values)
+        @value_from_values.call(values)
+      end
+
+      def define_value_from_values_for_serialization!
+        @value_from_values_for_serialization = if map?
+                                                 OBJECT_MODULE::MapValueFromValuesForSerialization.new(self)
+                                               elsif repeated?
+                                                 OBJECT_MODULE::RepeatedFieldValueFromValuesForSerialization.new(self)
+                                               elsif type_class == ::Protobuf::Field::BoolField # boolean present check
+                                                 OBJECT_MODULE::BoolFieldValueFromValuesForSerialization.new(self)
+                                               else
+                                                 OBJECT_MODULE::BaseFieldValueFromValuesForSerialization.new(self)
+                                               end
+      end
+
+      def value_from_values_for_serialization(values)
+        @value_from_values_for_serialization.call(values)
+      end
+
+      def define_set_field!
+        @set_field = if map? && required?
+                       OBJECT_MODULE::RequiredMapSetField.new(self)
+                     elsif repeated? && required?
+                       OBJECT_MODULE::RequiredRepeatedSetField.new(self)
+                     elsif type_class == ::Protobuf::Field::StringField && required?
+                       OBJECT_MODULE::RequiredStringSetField.new(self)
+                     elsif required?
+                       OBJECT_MODULE::RequiredBaseSetField.new(self)
+                     elsif map?
+                       OBJECT_MODULE::MapSetField.new(self)
+                     elsif repeated?
+                       OBJECT_MODULE::RepeatedSetField.new(self)
+                     elsif type_class == ::Protobuf::Field::StringField
+                       OBJECT_MODULE::StringSetField.new(self)
+                     else
+                       OBJECT_MODULE::BaseSetField.new(self)
+                     end
+      end
+
+      def set_field(values, value, ignore_nil_for_repeated, message_instance)
+        @set_field.call(values, value, ignore_nil_for_repeated, message_instance)
+      end
+
+      def define_to_message_hash!
+        if message? || enum? || repeated? || map?
+          @to_message_hash = OBJECT_MODULE::ToHashValueToMessageHash.new(self)
+          @to_message_hash_string_keys = OBJECT_MODULE::ToHashValueToMessageHashWithStringKey.new(self)
+        else
+          @to_message_hash = OBJECT_MODULE::BaseToMessageHash.new(self)
+          @to_message_hash_string_keys = OBJECT_MODULE::BaseToMessageHashWithStringKey.new(self)
+        end
+      end
+
+      def to_message_hash(values, result)
+        @to_message_hash.call(values, result)
+      end
+
+      def to_message_hash_with_string_key(values, result)
+        @to_message_hash_string_keys.call(values, result)
+      end
+
       def deprecated?
         @deprecated
       end
@@ -101,10 +238,6 @@ module Protobuf
         fail NotImplementedError, "#{self.class.name}##{__method__}"
       end
 
-      def encode_to_stream(value, stream)
-        stream << tag_encoded << encode(value)
-      end
-
       def extension?
         @extension
       end
@@ -117,8 +250,13 @@ module Protobuf
         false
       end
 
+      def set_map!
+        set_repeated_message!
+        @is_map = repeated_message? && type_class.get_option!(:map_entry)
+      end
+
       def map?
-        @is_map ||= repeated_message? && type_class.get_option(:map_entry)
+        @is_map
       end
 
       def optional?
@@ -133,39 +271,32 @@ module Protobuf
         @repeated
       end
 
+      def set_repeated_message!
+        @repeated_message = repeated? && message?
+      end
+
       def repeated_message?
-        repeated? && message?
+        @repeated_message
       end
 
       def required?
         @required
       end
 
-      # FIXME: need to cleanup (rename) this warthog of a method.
-      def set(message_instance, bytes)
-        return message_instance[name] = decode(bytes) unless repeated?
-
-        if map?
-          hash = message_instance[name]
-          entry = decode(bytes)
-          # decoded value could be nil for an
-          # enum value that is not recognized
-          hash[entry.key] = entry.value unless entry.value.nil?
-          return hash[entry.key]
-        end
-
-        return message_instance[name] << decode(bytes) unless packed?
-
-        array = message_instance[name]
-        stream = StringIO.new(bytes)
+      def define_set_method!
+        @set_method = if map?
+                        OBJECT_MODULE::MapSetMethod.new(self)
+                      elsif repeated? && packed?
+                        OBJECT_MODULE::RepeatedPackedSetMethod.new(self)
+                      elsif repeated?
+                        OBJECT_MODULE::RepeatedNotPackedSetMethod.new(self)
+                      else
+                        OBJECT_MODULE::BaseSetMethod.new(self)
+                      end
+      end
 
-        if wire_type == ::Protobuf::WireType::VARINT
-          array << decode(Varint.decode(stream)) until stream.eof?
-        elsif wire_type == ::Protobuf::WireType::FIXED64
-          array << decode(stream.read(8)) until stream.eof?
-        elsif wire_type == ::Protobuf::WireType::FIXED32
-          array << decode(stream.read(4)) until stream.eof?
-        end
+      def set(message_instance, bytes)
+        @set_method.call(message_instance, bytes)
       end
 
       def tag_encoded
@@ -192,6 +323,18 @@ module Protobuf
 
       def fully_qualified_name_only!
         @name = @fully_qualified_name
+
+        ##
+        # Recreate all of the meta methods as they may have used the original `name` value
+        #
+        define_value_from_values!
+        define_value_from_values_for_serialization!
+        define_field_predicate!
+        define_field_and_present_predicate!
+        define_set_field!
+        define_set_method!
+        define_to_message_hash!
+        define_encode_to_stream!
       end
 
       private