omq-rfc-zstd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3cb484a523975a0cb8d80b5270f89e98f536169fbe11e1a7af3b36b9529ffc5
-  data.tar.gz: 11e6f5671d24f0e7585aa9ca2055cbaa6a1a79e6dcd36070360d3b3823cbec78
+  metadata.gz: 141f24afe8fac939ca1518c76d62bc45d8d15d456fa415be3c8dc5343af33447
+  data.tar.gz: 2e16e4ce5413d0b181e2b293d8b9b5203133bb114527726936c466464754e8dd
 SHA512:
-  metadata.gz: ff90b8650aa506957fad84948dbe5f1d4731c5958d6ca28d135726fdd9a403a31d744f50bae0ed8acfacb38cae4d085ca6853d1b0b6e439452621e60a9ddfac2
-  data.tar.gz: 7537425c8a88ff2cdb55029f62c494eff1ab77bb858ff3ed493276af55428983c850378663ba2631ee9f1e6eb45d546c4eef5a953901a91270bf524de85ad91d
+  metadata.gz: d181d5b3e6c463537599491667287603479d3928b9d2f4991e7c4e48b1ded8e15a730e3a825a059cdf384ded81b5f83e094093d9424341126e103ab3049a3723
+  data.tar.gz: efd7e9cb3caa37d11ed5cdb6ec374f3f85efd32ce2cfc0525552840d9dce92a0460302e8a315d73ae4b7a5bf34ce597296cf1f60a2d0083e750887635bf633f6

data/lib/omq/rfc/zstd/compression.rb

@@ -199,9 +199,15 @@ module OMQ
           return if @training_done
           return if plaintext.bytesize >= AUTO_DICT_MAX_SAMPLE_LEN
 
+          # OMQ's Writable mixin already hands us frozen binary Strings
+          # (frozen_binary + parts.freeze), so in the common case we
+          # can stash the caller's reference without a `.b` copy. Only
+          # coerce when the encoding/frozen invariants don't hold.
+          sample = plaintext.frozen? && plaintext.encoding == Encoding::BINARY ? plaintext : plaintext.b
+
           @training_mutex.synchronize do
             return if @training_done
-            @samples << plaintext.b
+            @samples << sample
             @samples_bytes += plaintext.bytesize
             @samples_count += 1
             maybe_train!

data/lib/omq/rfc/zstd/connection.rb

@@ -52,6 +52,11 @@ module OMQ
           @dict_sent        = false
           @last_wire_size_out = nil
           @last_wire_size_in  = nil
+
+          # Cached once: is the send side an auto-training compression
+          # that still needs samples? Flipped false the moment training
+          # completes, so #encode_parts drops the per-message branch.
+          @auto_sampling = send_compression.is_a?(Compression) && send_compression.auto?
         end
 
 
@@ -65,13 +70,18 @@ module OMQ
         attr_reader :last_wire_size_in
 
 
-        # Disables fan-out byte-sharing. See class docs.
+        # Hides +#write_wire+ from callers so
+        # +OMQ::Routing::FanOut+ falls back to per-connection
+        # +write_message+ -- see class docs for the rationale.
         def respond_to?(name, include_private = false)
           return false if name == :write_wire
           super
         end
 
 
+        # Compresses +parts+ and forwards the encoded payload through
+        # the underlying connection's synchronous send path (acquires
+        # the write mutex and flushes).
         def send_message(parts)
           encoded = encode_parts(parts)
           ship_auto_dict_if_ready
@@ -79,6 +89,9 @@ module OMQ
         end
 
 
+        # Compresses +parts+ and forwards to the underlying
+        # +#write_message+ (writes to the buffer without flushing --
+        # the send pump batches and flushes at the end of the cycle).
         def write_message(parts)
           encoded = encode_parts(parts)
           ship_auto_dict_if_ready
@@ -86,6 +99,9 @@ module OMQ
         end
 
 
+        # Compresses each message in +messages+ and forwards the
+        # batch to the underlying +#write_messages+. Used by the
+        # send pump's batched-flush path.
         def write_messages(messages)
           encoded = messages.map { |parts| encode_parts(parts) }
           ship_auto_dict_if_ready
@@ -93,6 +109,9 @@ module OMQ
         end
 
 
+        # Reads one message via the underlying connection, intercepts
+        # ZMTP-Zstd command frames (e.g. ZDICT) via the frame block,
+        # and returns the decoded plaintext parts.
         def receive_message
           parts = super do |frame|
             handle_command_frame(frame)
@@ -143,11 +162,17 @@ module OMQ
 
         def encode_parts(parts)
           return parts if @send_compression.nil?
-          if @send_compression.respond_to?(:auto?) && @send_compression.auto? && !@send_compression.trained?
-            parts.each { |p| @send_compression.add_sample(p) }
+
+          if @auto_sampling
+            if @send_compression.trained?
+              @auto_sampling = false
+            else
+              parts.each { |p| @send_compression.add_sample(p) }
+            end
           end
+
           encoded = parts.map { |p| Codec.encode_part(p, @send_compression) }
-          @last_wire_size_out = encoded.sum(&:bytesize)
+          @last_wire_size_out = encoded.sum { |p| p.bytesize }
           encoded
         end
 
@@ -161,7 +186,7 @@ module OMQ
 
         def decode_parts(parts)
           return parts if @recv_compression.nil?
-          @last_wire_size_in = parts.sum(&:bytesize)
+          @last_wire_size_in = parts.sum { |p| p.bytesize }
           budget_remaining = @max_message_size
           parts.map do |p|
             plaintext = Codec.decode_part(p, @recv_compression, budget_remaining: budget_remaining)

data/lib/omq/rfc/zstd/version.rb

@@ -3,7 +3,7 @@
 module OMQ
   module RFC
     module Zstd
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq-rfc-zstd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Patrik Wenger
@@ -15,42 +15,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.3
 - !ruby/object:Gem::Dependency
   name: protocol-zmtp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rzstd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 description: Negotiated, transparent per-frame Zstd compression with optional shared
   dictionary for the OMQ pure-Ruby ZeroMQ library.
 email: