leptris 1.9.366.1 → 1.9.366.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97ab0ffc1ab21b11d43593a97f8d91f75f49028460d68d5f0fdf7dbe14f697f7
-  data.tar.gz: 3badee92d7d7744c93da9434badb3401e7b4e5b4f61acc3e984029ed16dcf903
+  metadata.gz: bdbc55946efddecae9ca22ce9afb09b6e3b22adcb9904f9a0d21b5d009f0fabf
+  data.tar.gz: 321b6aa17d26eb61638e7e6108b3ef32edfefc9074341261cdb7572f501e762b
 SHA512:
-  metadata.gz: 9222fe57cebd087fe04c892116bd771266c1671039d2c8a6bf7fd0846b746210766adc8db5c7824289e9cd7e48cb17effb3ec37a2505732f29da52068ccf7fe9
-  data.tar.gz: 6f9fc5fc3e204d9112e9f49bdd829b3a0c11360135a8037f471753c01e414e688a6b94ee35f2bf89113898d0f702119f1f076e4716dac17fa2da9077bbbdd4b5
+  metadata.gz: a6351c134abf1fcbf925f76ac950ea8f23f252aa01edb7231a1510c201f5bc363c456f0a7560302304b5aec01a596a07a0a56c6140c0320bad6c51d3ca711e4d
+  data.tar.gz: 39e95a64f54eed408f0dd3fb1c640b9cd4a087f08e5b97bdeb367e02bb28a7947e072fd9b8becaad9ff1798807744e96e710278a33ad6e822602733f67bfd9f9

data/lib/leptris/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Leptris
-  VERSION = "1.9.366.1"
+  VERSION = "1.9.366.2"
 end

data/lib/leptris/xml/descriptor.rb

@@ -126,7 +126,7 @@ class Leptris::XML::Descriptor
         "descriptor ABI v#{abi} != binding v#{Leptris::XML::FFI::PLAN_ABI_VERSION}"
     end
     plans = []
-    root_index = flatten_plan(tree, plans)
+    root_index = flatten_plan(tree, plans, {})
     spec, plans_pointer, anchors = pack_plans(plans)
     spec[:abi_version] = abi
     spec[:plan_count] = plans.size
@@ -143,13 +143,32 @@ class Leptris::XML::Descriptor
   # Flattens the nested hash tree into the engine's flat plans
   # array (child rows reference plans by index). Returns the root
   # plan's index — always 0 for a single root.
-  def self.flatten_plan(tree, plans)
-    tree = tree.dup
-    plans << tree
+  #
+  # Identity-memoized (leptris#1743): lutaml-model's PlanCompiler
+  # (0.8.107+) feeds recursive content models as a DAG — the SAME
+  # plan Hash reachable from many parents. Without the memo each
+  # shared subtree re-flattened once per path (2^depth visits: the
+  # STS runaway — 28+ CPU-min, 14 GB RSS) and the duplicated index
+  # graph even mis-walked. Memoize on the ARGUMENT's identity
+  # (object_id, read before the dup) so each unique plan object is
+  # flattened once and shared rows reference one index.
+  def self.flatten_plan(tree, plans, memo = {})
+    key = tree.object_id
+    hit = memo[key]
+    return hit if hit
+
+    raise Leptris::XML::Error,
+          "plan tree contains a cycle at #{tree[:name].inspect} — "           "the plan graph must be a DAG" if hit == false
+
+    memo[key] = false # in-progress; a finished entry is an Integer index
+    duped = tree.dup
+    plans << duped
     tree_index = plans.size - 1
-    tree[:children] = (tree[:children] || []).map do |row|
+    memo[key] = tree_index
+    duped[:children] = (duped[:children] || []).map do |row|
       if row[:kind] == :nested
-        row.merge(child_plan_index: flatten_plan(row.fetch(:plan), plans))
+        row.merge(child_plan_index: flatten_plan(row.fetch(:plan), plans,
+                                                 memo))
       else
         row
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leptris
 version: !ruby/object:Gem::Version
-  version: 1.9.366.1
+  version: 1.9.366.2
 platform: ruby
 authors:
 - Ribose Inc.