omq-zstd 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e725966f3527f9ad15396b9dc6b4a182a93a3cdf5b1f6916b6ccb25ba39b146
-  data.tar.gz: 4c6bc2ed5ba87c77868ff93781dc9269a8929b78df8e190097bc943e84c2c46c
+  metadata.gz: 0460be7b61085b54ba2e2de90033ed296524f08bfd56db2385ba3c69284713f1
+  data.tar.gz: 0061e9188f071929d68a19415fcd3207fae5f929cdddf80bd022e127007302e3
 SHA512:
-  metadata.gz: fa50d84a5d8a53a0a0bad2c5df4cee8d9435f04612f260082d02a226740f438d91f33702e29c3b974fda0ef6302080ab96d61a4e804e0abb409b2892a7f24e92
-  data.tar.gz: 74119b06fa29d1dc339803c153fe2571c9d401d638a6fdc36cf1b5c64e28f2ba951e935ebbe7203475332d58c1e3a4be2622fb2acd5ac5da9ff713122f10d53b
+  metadata.gz: 6730b00146a3ce45053466f14496b792b6cf619557555dafaed72debcd667c3dedf6a06200036114afb7adda81183c276d6212f42652a03b40ac62f13d2fa947
+  data.tar.gz: 46519bf5bf3e3f3f944404aa174591a49faa240946acce52f743cf0fcb5263a7a3a609d26667eb6bd2f1f38f406be22779c26ffad81e5f9c6f122f3379474536

data/DESIGN.md

@@ -151,7 +151,6 @@ individual parts are within bounds.
 ## Constants
 
 ```
-MAX_DECOMPRESSED_SIZE  = 16 MiB   (absolute cap per frame)
 MAX_DICT_SIZE          = 64 KiB   (reject oversized dicts)
 DICT_CAPACITY          = 8 KiB    (training target size)
 TRAIN_MAX_SAMPLES      = 1000

data/RFC.md

@@ -435,7 +435,6 @@ DEFAULT_LEVEL           = -3
 MIN_COMPRESS_NO_DICT    = 512 bytes
 MIN_COMPRESS_WITH_DICT  = 64 bytes
 
-MAX_DECOMPRESSED_SIZE   = 16 MiB        (absolute cap per frame)
 MAX_DICT_SIZE           = 64 KiB
 
 TRAIN_MAX_SAMPLES       = 1000

data/lib/omq/transport/zstd_tcp/codec.rb

@@ -26,7 +26,12 @@ module OMQ
           @level            = level
           @max_message_size = max_message_size
 
-          @send_dict       = nil
+          # Start with a no-dict FrameCodec. Once a dict is configured
+          # (either via the `dict:` kwarg or via auto-training), this is
+          # replaced with a fresh dict-bound FrameCodec — per rzstd 0.4,
+          # dict is a permanent property of the codec, so swapping dicts
+          # means constructing a new one.
+          @send_codec      = RZstd::FrameCodec.new(level: @level)
           @send_dict_bytes = nil
 
           @training      = dict.nil?
@@ -108,7 +113,7 @@ module OMQ
           @training = false
           @train_samples = nil
 
-          patched = patch_auto_dict_id(trained)
+          patched = patch_auto_dict_id(trained.bytes)
           install_send_dict(patched)
         end
 
@@ -130,22 +135,20 @@ module OMQ
             raise ProtocolError, "dict exceeds #{MAX_DICT_SIZE} bytes"
           end
 
-          @send_dict       = RZstd::Dictionary.new(bytes, level: @level)
+          # Replace the no-dict send codec with a fresh dict-bound one;
+          # the old codec is GC'd. rzstd 0.4 treats dict as a permanent
+          # codec property, so install-time is always a fresh build.
+          @send_codec      = RZstd::FrameCodec.new(dict: bytes, level: @level)
           @send_dict_bytes = bytes
         end
 
 
         def compress_or_plain(part)
           bytes = part.is_a?(String) && part.encoding == Encoding::BINARY ? part : part.to_s.b
-          threshold = @send_dict ? MIN_COMPRESS_WITH_DICT : MIN_COMPRESS_NO_DICT
+          threshold = @send_dict_bytes ? MIN_COMPRESS_WITH_DICT : MIN_COMPRESS_NO_DICT
           return plain(bytes) if bytes.bytesize < threshold
 
-          compressed =
-            if @send_dict
-              @send_dict.compress(bytes)
-            else
-              RZstd.compress(bytes, level: @level)
-            end
+          compressed = @send_codec.compress(bytes)
 
           return plain(bytes) if compressed.bytesize >= bytes.bytesize - 4
 

data/lib/omq/transport/zstd_tcp/connection.rb

@@ -15,7 +15,13 @@ module OMQ
           super(conn)
           @codec              = codec
           @dict_shipped       = false
-          @recv_dict          = nil
+          # rzstd 0.4: FrameCodec is the decoder. Starts no-dict; when a
+          # dict shipment arrives on this direction, we build a fresh
+          # dict-bound FrameCodec and replace this one. Level is a
+          # compression parameter only — not consulted on decompress —
+          # so we don't carry the send-side level through to recv.
+          @recv_codec         = RZstd::FrameCodec.new
+          @recv_dict_bytes    = nil
           @last_wire_size_in  = nil
         end
 
@@ -122,11 +128,7 @@ module OMQ
 
           decompress_opts = budget ? { max_output_size: budget } : {}
 
-          if @recv_dict
-            @recv_dict.decompress(wire, **decompress_opts)
-          else
-            RZstd.decompress(wire, **decompress_opts)
-          end
+          @recv_codec.decompress(wire, **decompress_opts)
         rescue RZstd::DecompressError => e
           raise ProtocolError, "decompression failed: #{e.message}"
         rescue RZstd::MissingContentSizeError => e
@@ -145,7 +147,11 @@ module OMQ
             raise ProtocolError, "dict exceeds #{Codec::MAX_DICT_SIZE} bytes"
           end
 
-          @recv_dict = RZstd::Dictionary.new(wire.b)
+          # Replace the no-dict recv codec with a fresh dict-bound one;
+          # the old codec is GC'd (rzstd 0.4: dict is a permanent codec
+          # property).
+          @recv_codec      = RZstd::FrameCodec.new(dict: wire.b)
+          @recv_dict_bytes = wire.b
         end
 
 

data/lib/omq/zstd/version.rb

@@ -2,6 +2,6 @@
 
 module OMQ
   module Zstd
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq-zstd
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Patrik Wenger
@@ -27,16 +27,16 @@ dependencies:
   name: rzstd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 description: Adds zstd+tcp:// endpoint support to OMQ with per-frame Zstd compression,
   bounded decompression, in-band dictionary shipping, and sender-side dictionary training.
 email: