moxml 0.5.160 → 0.5.161

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3baac5f598cb14a214bcf65d8f19f7d73d6d70c7f3fc0b53766f07bac4f2d176
-  data.tar.gz: 54e53fb3aa363edd679bca122996d5a224bfa58a99e656a35acc59182dd66f45
+  metadata.gz: 39e75ce66c66f3b1d5c72e8ba103dd2a4e6a2eb14d3e7fc9b016672e35a8759b
+  data.tar.gz: d502f9d3c5c739d6d86c68d79d2486d40b1a85747d3ef5b8503d1f1e9fc0d17c
 SHA512:
-  metadata.gz: 705c62afbefc4678ad231e380644023416a5e0cf19e94dd59437c0570abca635e4570db661272490ed1f37804230623d9836e5cc2b8e70619bea1cc16f2fe0a6
-  data.tar.gz: e40cf23891b36aaca41bb1c62d01b0e7479c5c1c5eada2fa9563f315399d943a170381d5467019e7e956f06940b71aad59db2d19099a545ebf67d7d4603168c8
+  metadata.gz: 9ae62f4b5b1cef0b4f84c0a12b640292d762d110004dc0fd2bbadf4af5a374ace336d30e9aef7cd9e8e151590de5b67f07d9cf1e31afc7e82b8de1b2f01ebda2
+  data.tar.gz: 819a5bade9e79d666087a4a302484e0f88653f3a77db26585c2d370c70cd388e774b685bf5499ee1dbff2cb7307f5476aee3153acbf098db61e6e0c3bb010fcb

data/lib/moxml/adapter/leptris.rb

@@ -83,6 +83,15 @@ module Moxml
         ::Leptris::XML::Native.respond_to?(:xpath_result_rows_bulk) &&
         ::Leptris::XML::Document.method_defined?(:xpath_result_rows_bulk)
 
+      # TODO.sota/04 (build row): ONE-crossing construction —
+      # create + attrs + attach (+ optional text) + version bump +
+      # consumer mint, all in C off the parent wrapper's struct
+      # (leptris-ruby perf/add-element-full). Probed on the class:
+      # older exts take the existing two-crossing path.
+      ADD_ELEMENT_FULL =
+        defined?(::Leptris::XML::NativeNode) &&
+        ::Leptris::XML::NativeNode.method_defined?(:add_element_full)
+
       # leptris-ruby#460: set-text by document+address, kind-dispatched
       # in C — no binding twin mint per write. Face-probed, not
       # version-gated (the floor admits bindings without it).
@@ -1334,8 +1343,6 @@ module Moxml
         end
 
         def set_root(doc, element)
-          drop_columnar_children(doc)
-          drop_columnar_children(element)
           to_binding(doc).root = to_binding(element)
         end
 
@@ -1735,7 +1742,6 @@ module Moxml
         # re-indented). Raw-pointer walk over the root subtree — the
         # same batch child-pointer pattern the materializer uses.
         def strip_blank_text_nodes!(doc)
-          drop_columnar_children(doc)
           binding_ffi = ::Leptris::XML::FFI
           root = binding_ffi.leptris_document_root(doc.c_ptr)
           return unless root && !root.null?
@@ -2233,8 +2239,6 @@ module Moxml
         # source. Answer the installed binding element; callers re-point
         # wrappers at it.
         def adopt_root(doc, element)
-          drop_columnar_children(doc)
-          drop_columnar_children(element)
           return nil unless NATIVE_ROOT_ADOPT
 
           binding_doc = to_binding(doc)
@@ -2345,7 +2349,10 @@ module Moxml
           doc = doc_for(node)
           return nil unless doc
 
-          map = attachments.get(doc, COLUMNAR_CHILDREN)
+          pair = attachments.get(doc, COLUMNAR_CHILDREN)
+          return nil unless pair.is_a?(Array) && pair[0] == doc.version
+
+          map = pair[1]
           return nil unless map&.key?(node)
 
           map[node].dup
@@ -2383,36 +2390,14 @@ module Moxml
             end
             mine << handle if depth == child_depth
           end
-          attachments.set(doc, COLUMNAR_CHILDREN, map) if map
+          # Memo-version law: the pair is stamped with the binding
+          # Document#@version the map was primed under; every mutation
+          # face advances that version in C, so a stale map misses the
+          # hit check and re-primes — no write-side drop walk needed.
+          attachments.set(doc, COLUMNAR_CHILDREN, [doc.version, map]) if map
           mine
         end
 
-        # Structural seams drop the columnar map wholesale; the next
-        # children read re-primes it (see COLUMNAR_WALK). Cheap no-op
-        # when no map is live: one lock-free attachment probe.
-        def drop_columnar_children(node)
-          return unless COLUMNAR_WALK
-
-          doc =
-            case node
-            when ::Leptris::XML::NativeNode
-              doc_for(node)
-            when ::Leptris::XML::Document
-              node
-            else
-              begin
-                node.document
-              rescue StandardError
-                nil
-              end
-            end
-          return if doc.nil?
-
-          return if attachments.get(doc, COLUMNAR_CHILDREN).nil?
-
-          attachments.delete(doc, COLUMNAR_CHILDREN)
-        end
-
         def native_keep_entity_refs?(node)
           return false unless NATIVE_READ_LAYER &&
             node.is_a?(::Leptris::XML::NativeNode)
@@ -2625,8 +2610,18 @@ module Moxml
         # loop is C->C dlsym). Requires parent binding + the face;
         # callers fall back to create_element + set_attribute +
         # add_child when absent.
+        # TODO.sota/04: the ONE-crossing build face. Returns the
+        # contract-carrying row, or nil when this binding cannot
+        # serve it (caller takes the legacy path).
+        def add_element_full(parent, name, attrs)
+          return nil unless NATIVE_C_MINT && ADD_ELEMENT_FULL &&
+            parent.is_a?(::Leptris::XML::NativeNode)
+
+          validate_element_name(name)
+          parent.add_element_full(name.to_s, attrs.flatten, nil)
+        end
+
         def create_element_with_attrs(parent, name, attrs)
-          drop_columnar_children(parent)
           validate_element_name(name)
           # NativeNode parents need NO FFI twin (TODO.sota/04 bridge
           # tax): the bridge existed only to obtain c_address +
@@ -2964,8 +2959,6 @@ module Moxml
         # on the source, so a living source can never outlive the
         # memory its reads still touch.
         def absorb_source_document(dest, owner)
-          drop_columnar_children(dest)
-          drop_columnar_children(owner)
           return nil unless NATIVE_DOC_ABSORB
           return :direct if attachments.get(dest, :absorbed_sources)&.include?(owner)
 
@@ -3011,8 +3004,6 @@ module Moxml
         end
 
         def add_child(parent, child)
-          drop_columnar_children(parent)
-          drop_columnar_children(child)
           result = add_child_impl(parent, child)
           # A successful child insertion rebuilds the engine's
           # document index; the upstream sibling-insert bug leaves it
@@ -3134,8 +3125,6 @@ module Moxml
         end
 
         def add_previous_sibling(node, new_node)
-          drop_columnar_children(node)
-          drop_columnar_children(new_node)
           result = add_previous_sibling_impl(node, new_node)
           mark_xpath_index_stale(node)
           result
@@ -3188,8 +3177,6 @@ module Moxml
         end
 
         def add_next_sibling(node, new_node)
-          drop_columnar_children(node)
-          drop_columnar_children(new_node)
           result = add_next_sibling_impl(node, new_node)
           mark_xpath_index_stale(node)
           result
@@ -3266,7 +3253,6 @@ module Moxml
         end
 
         def remove(node)
-          drop_columnar_children(node)
           node = to_binding(node) if NATIVE_READ_LAYER
           case node
           when CustomizedLeptris::Declaration
@@ -3298,8 +3284,6 @@ module Moxml
         end
 
         def replace(node, new_node)
-          drop_columnar_children(node)
-          drop_columnar_children(new_node)
           if NATIVE_READ_LAYER
             node = to_binding(node)
             new_node = to_binding(new_node)
@@ -3358,7 +3342,6 @@ module Moxml
           Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.290.0")
 
         def replace_children(node, new_children)
-          drop_columnar_children(node)
           # Cross-pool children: the binding's bulk face adopts per
           # node and fails on mixed kinds (inner_xml= with
           # text+elements died with Memory allocation failed —
@@ -3448,7 +3431,6 @@ module Moxml
           ::Leptris::XML::NativeNode.method_defined?(:set_text_native)
 
         def set_text_content(node, content)
-          drop_columnar_children(node)
           if SET_TEXT_NATIVE && node.is_a?(::Leptris::XML::NativeNode)
             begin
               node.set_text_native(content.to_s)

data/lib/moxml/element.rb

@@ -139,10 +139,17 @@ module Moxml
     # wrapper. Equivalent to create_element + attribute writes +
     # add_child, minus two crossings and the intermediate churn.
     def add_element(name, attrs = {})
+      # TODO.sota/04: one crossing when the binding serves it.
+      native_child = adapter.add_element_full(@native, name, attrs)
+      if native_child
+        attach_built_child(native_child)
+        return Moxml::Node.wrap_with(native_child, context, adapter)
+      end
       native_child = adapter.create_element_with_attrs(
         @native, name, attrs
       )
       if native_child
+        attach_built_child(native_child)
         Moxml::Node.wrap_with(native_child, context, adapter)
       else
         fallback = Moxml::Node.wrap_with(
@@ -154,6 +161,16 @@ module Moxml
       end
     end
 
+    # The construction fast paths bypass add_child, so they owe the
+    # same invalidation contract: the ctx children clock retires every
+    # wrapper's generation-checked memo (the receiver's own included —
+    # the read re-checks the generation before serving).
+    def attach_built_child(native_child)
+      context.bump_children_generation
+      native_child.parent_node = self
+      native_child
+    end
+
     def attributes
       # Primed like Node.wrap: the adapter and type are known at
       # mint, so the first name/value/attribute? access skips the

data/lib/moxml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Moxml
-  VERSION = "0.5.160"
+  VERSION = "0.5.161"
 end

data/spec/moxml/adapter/columnar_invalidation_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# The COLUMNAR_WALK children map must never serve rows older than a
+# completed mutation, through EVERY write lane. This is the memo-version
+# law (leptris-ruby#530) applied to the columnar map: the binding
+# Document#@version advances on every mutation, so a map primed under
+# an older version is stale by construction — independent of which
+# adapter seam (or none) happens to drop it.
+RSpec.describe "columnar children map invalidation" do
+  let(:ctx) { Moxml.new(:leptris) }
+
+  def walk_children(node)
+    node.children.map { |c| c.is_a?(Moxml::Element) ? c.name : c.text }
+  end
+
+  it "serves fresh rows after content= replaces a child subtree" do
+    doc = ctx.parse("<r><a>t1</a><b>t2</b></r>")
+    a = doc.root.children.first
+    walk_children(a) # prime the columnar map over a's subtree
+    a.content = "replaced"
+    expect(walk_children(a)).to eq(["replaced"])
+    expect(walk_children(doc.root)).to eq(%w[a b])
+  end
+
+  it "serves fresh rows after add_element" do
+    doc = ctx.parse("<r><a/></r>")
+    walk_children(doc.root)
+    doc.root.add_element("b", "k" => "v")
+    expect(walk_children(doc.root)).to eq(%w[a b])
+  end
+
+  it "serves fresh rows after add_next_sibling" do
+    doc = ctx.parse("<r><a/></r>")
+    a = doc.root.children.first
+    walk_children(doc.root)
+    a.add_next_sibling("<c/>")
+    expect(walk_children(doc.root)).to eq(%w[a c])
+  end
+
+  it "serves fresh rows after remove" do
+    doc = ctx.parse("<r><a/><b/></r>")
+    b = doc.root.children.last
+    walk_children(doc.root)
+    b.remove
+    expect(walk_children(doc.root)).to eq(%w[a])
+  end
+
+  it "keeps the primed rows valid when nothing mutated" do
+    doc = ctx.parse("<r><a>t1</a><b>t2</b></r>")
+    expected = walk_children(doc.root)
+    expect(walk_children(doc.root)).to eq(expected)
+    expect(walk_children(doc.root)).to eq(expected)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.5.160
+  version: 0.5.161
 platform: ruby
 authors:
 - Ribose Inc.
@@ -477,6 +477,7 @@ files:
 - spec/moxml/adapter/.gitkeep
 - spec/moxml/adapter/README.md
 - spec/moxml/adapter/base_spec.rb
+- spec/moxml/adapter/columnar_invalidation_spec.rb
 - spec/moxml/adapter/entity_restoration_spec.rb
 - spec/moxml/adapter/headed_ox_spec.rb
 - spec/moxml/adapter/leptris_adoption_spec.rb