dalli 5.0.12 → 5.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 237c6d61c07c784fab08e871f5ec95e05a56f280a738bd2a060176ea49885198
-  data.tar.gz: 846bb56b3ce9e7a7c1b9c2bfd91faa907c5b8974e686a0767d4437343dadd2b3
+  metadata.gz: 1b52725fdd6dd9e4e890f506cca29a520e12e5458b29d9e315b6bb8805d749c7
+  data.tar.gz: 504b5d320f3802d5aeb98608ffbc1ff629a89c76ba48957440b3403b40a5a69e
 SHA512:
-  metadata.gz: 8ef4bca995d5ed6d1d0d47b460a21f9ac99db727d3a60fe60f168760b11e7b1c2e139903b5d2b3b8d8ce0869ff252b5b77acdf422db8d07456301e83e87e9e94
-  data.tar.gz: 5b272117c00c7ce7e077ad5137a708a9ce06a842408b75f8efd1248c72a29b3fc739cfe7347dd475229158c3cd0869989c89b57f51d91bc8794c277a4324a0a9
+  metadata.gz: 1d258b16c57f90309b60867fac9e1aa03fd9ae6a67607d04f2cfd76c205e5f096e8322c532ecf4404d74895dd8a6deca766fac2ca3bb5fff17b646e321e6962f
+  data.tar.gz: 430cc33100948d985f373247848122dc79c6ab6cfc1fa295c7fe8fbcc1463cf91e26a17a93d91145ef9c06d57e887aad592d2a437ccc79868886f7b4a40a0cd5

data/CHANGELOG.md

@@ -4,6 +4,20 @@ Dalli Changelog
 Unreleased
 ==========
 
+5.0.14
+==========
+
+Bug fixes:
+
+- Raw values in an encoding that isn't ASCII-compatible, such as UTF-16, raised `Encoding::CompatibilityError` from `set`, `add`, `replace`, `append`, `prepend` and `set_multi`, as did a single-server `set_multi` mixing non-ASCII UTF-8 values with binary ones (such as raw Strings of both kinds, or with a JSON serializer, a value containing `é` next to a compressed one). The error also closed the connection, so in a `quiet` block, or within one server's part of a multi-server `set_multi`, writes buffered before it were silently lost. Values are now sent as their bytes, which is what memcached stores (#1269)
+
+5.0.13
+==========
+
+Bug fixes:
+
+- `set_multi` across more than one server stored `nil` for a Symbol key or a key over 250 bytes, in place of the value given
+
 5.0.12
 ==========
 

data/lib/dalli/pipelined_setter.rb

@@ -41,9 +41,12 @@ module Dalli
 
     private
 
+    # Values are looked up by each key as sent. The caller's key can't be
+    # rebuilt from it: a long key is digested, and a Symbol becomes a String.
     def setup_requests(hash, ttl, req_options)
-      groups = groups_for_keys(hash.keys)
-      make_set_requests(groups, hash, ttl, req_options)
+      pairs = hash.transform_keys { |k| @key_manager.validate_key(k.to_s) }
+      groups = groups_for_keys(pairs.keys)
+      make_set_requests(groups, pairs, ttl, req_options)
       groups.keys
     end
 
@@ -51,12 +54,10 @@ module Dalli
     # Loop through the server-grouped sets of keys, writing
     # the corresponding quiet set requests to the appropriate servers
     ##
-    def make_set_requests(groups, hash, ttl, req_options)
+    def make_set_requests(groups, pairs, ttl, req_options)
       groups.each do |server, keys_for_server|
         keys_for_server.each do |key|
-          original_key = @key_manager.key_without_namespace(key)
-          value = hash[original_key]
-          server.request(:pipelined_set, key, value, ttl, req_options)
+          server.request(:pipelined_set, key, pairs[key], ttl, req_options)
         rescue Dalli::MarshalError, Dalli::ValueOverMaxSize => e
           # Nothing was written for this key, so the server's other keys are
           # unaffected; raised by #process once the batch is complete
@@ -81,8 +82,7 @@ module Dalli
     end
 
     def groups_for_keys(keys)
-      validated_keys = keys.map { |k| @key_manager.validate_key(k.to_s) }
-      groups = @ring.keys_grouped_by_server(validated_keys)
+      groups = @ring.keys_grouped_by_server(keys)
 
       if (unfound_keys = groups.delete(nil))
         Dalli.logger.debug do

data/lib/dalli/protocol/meta.rb

@@ -138,7 +138,7 @@ module Dalli
         req = RequestFormatter.meta_set(key: key, value: value,
                                         bitflags: bitflags, cas: cas,
                                         ttl: ttl, mode: mode, quiet: quiet)
-        write("#{req}#{value}#{TERMINATOR}")
+        write(request_with_value(req, value))
         @connection_manager.flush unless quiet
       end
       # rubocop:enable Metrics/ParameterLists
@@ -158,10 +158,20 @@ module Dalli
         ttl = TtlSanitizer.sanitize(ttl) if ttl
         req = RequestFormatter.meta_set(key: key, value: value,
                                         cas: cas, ttl: ttl, mode: mode, quiet: quiet?)
-        write("#{req}#{value}#{TERMINATOR}")
+        write(request_with_value(req, value))
         @connection_manager.flush unless quiet?
       end
 
+      # Ruby refuses to join Strings whose encodings clash, such as a raw
+      # UTF-16 value next to the ASCII request line. memcached stores bytes,
+      # so join the bytes then. Joining the Strings first keeps the common
+      # case free of extra checks.
+      def request_with_value(req, value)
+        "#{req}#{value}#{TERMINATOR}"
+      rescue Encoding::CompatibilityError
+        "#{req.b}#{value.b}#{TERMINATOR}"
+      end
+
       # Delete Commands
       def delete(key, cas)
         req = RequestFormatter.meta_delete(key: key, cas: cas, quiet: quiet?)

data/lib/dalli/protocol/request_formatter.rb

@@ -95,11 +95,29 @@ module Dalli
             buffer << ' b' if base64
             buffer << " F#{bitflags}" if bitflags
             buffer << " T#{ttl}" if ttl
-            buffer << ' MS q' << TERMINATOR << value << TERMINATOR
+            buffer << ' MS q' << TERMINATOR
+            append_bytes(buffer, value)
+            buffer << TERMINATOR
           end
           buffer << META_NOOP
         end
 
+        # Values are appended as bytes. One batch can hold UTF-8 and binary
+        # values, which String#<< refuses to combine, and a raw value can be in
+        # an encoding that isn't ASCII-compatible, such as UTF-16.
+        # Don't chain on the result: TruffleRuby's append_as_bytes returns its
+        # arguments rather than the buffer.
+        if String.method_defined?(:append_as_bytes)
+          def append_bytes(buffer, value)
+            buffer.append_as_bytes(value)
+          end
+        else
+          def append_bytes(buffer, value)
+            buffer << (value.encoding == Encoding::BINARY ? value : value.b)
+          end
+        end
+        private :append_bytes
+
         # Thundering herd protection flag:
         # - stale (I flag): Instead of deleting the item, mark it as stale. Other clients
         #   using N/R flags will see the X flag and know the item is being regenerated.

data/lib/dalli/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Dalli
-  VERSION = '5.0.12'
+  VERSION = '5.0.14'
 
   MIN_SUPPORTED_MEMCACHED_VERSION = '1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 5.0.12
+  version: 5.0.14
 platform: ruby
 authors:
 - Peter M. Goldstein