yeptris 0.1.0 → 0.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f9152c76936119e3fcc83cc8510e15debf741cc25d22229b225d1023f330cec
-  data.tar.gz: 6845a69bcb669246e5445601e117a9abfcd96200476fcfd1c41e9b5040775615
+  metadata.gz: 321301694ee81cae03622b737dce8d9603d6fffa87cacc280967c3bf7e9e397b
+  data.tar.gz: '09892fb7c54261dc8d46c5354a1c55052e6bf1333552bc7632e36cd433706c66'
 SHA512:
-  metadata.gz: 1927807c5fbb83fbc986d17a35ed35e6c888b52e045482e1cd96d4733b8aff7a9aa6238dd1b11c80c3f9e2da795b81eaa01c75b11861acffff64ca1bfbdb579b
-  data.tar.gz: b85ef72350379c4a6e1b5b9ca8fc76aaf0901ea533c05c2dca6223b1eb48679faefe94880bb3d2eb8df6f57dd584c82777af3cffaa37fe3274467b58d562c1b0
+  metadata.gz: 2d3e550bfe02ed9abff59332131fa13ae93e0e4ab7bf46b4cbcf8f57670d7592ad2494b2c9aa17c331a504ab3fdca48274bf585cc429a282a8c4d507fd3c5a04
+  data.tar.gz: b66b1001c328be6081ddbd53d790a9fbfbff4d4881da5ee74edea0d2065cb5266d876cdc1f3bb4ddcacbc6c41b2087661218f2fb11cd4763136a380073dfbbe2

data/lib/yeptris/ffi.rb

@@ -118,6 +118,24 @@ module Yeptris
                     %i[pointer size_t int pointer pointer pointer pointer], :int
     attach_function :yeptris_value_free, %i[pointer pointer], :void
 
+    # Columnar drain (libyeptris > 0.1.1): the same stream as parallel
+    # typed buffers, one carved allocation. Feature-detected — the
+    # record API is the fallback on older libraries.
+    COLUMNS = begin
+      attach_function :yeptris_value_drain_columns, %i[pointer size_t int pointer], :int
+      attach_function :yeptris_value_free_columns, [:pointer], :void
+      true
+    rescue ::FFI::NotFoundError
+      false
+    end
+
+    class ValueColumns < ::FFI::Struct
+      layout :count, :size_t, :arena_len, :size_t,
+             :payloads, :pointer, :offs, :pointer, :lens, :pointer,
+             :kinds, :pointer, :tags, :pointer, :is_keys, :pointer,
+             :bools, :pointer, :arena, :pointer
+    end
+
     # bulk build (TODO.impl/15 phase D): one call raises a document
     BUILD_SCALAR = 1
     BUILD_SEQ = 2

data/lib/yeptris/valueml.rb

@@ -55,6 +55,38 @@ module Yeptris
       end
     end
 
+    # Columnar path (libyeptris > 0.1.1): whole columns unpack in one
+    # call each, and the walk indexes tight arrays (no 7-slot stride).
+    # Semantics are IDENTICAL to the record walk — the two bodies are
+    # maintained in lockstep; field-access shape is the only difference.
+    def load_all_columns(yaml, schema: :compat_11)
+      yaml = yaml.read if yaml.respond_to?(:read)
+      yaml = yaml.to_s
+      cols = FFI::ValueColumns.new
+      st = FFI.yeptris_value_drain_columns(
+        yaml, yaml.bytesize,
+        schema == :compat_11 ? FFI::SCHEMA_11_COMPAT : FFI::SCHEMA_12_CORE,
+        cols
+      )
+      raise ParseError, FFI.last_error_message if st != FFI::OK
+
+      begin
+        n = cols[:count]
+        kinds = cols[:kinds].read_bytes(n).unpack("C*")
+        tags = cols[:tags].read_bytes(n).unpack("C*")
+        ikeys = cols[:is_keys].read_bytes(n).unpack("C*")
+        bools = cols[:bools].read_bytes(n).unpack("C*")
+        offs = cols[:offs].read_bytes(n * 4).unpack("V*")
+        lens = cols[:lens].read_bytes(n * 4).unpack("V*")
+        pays = cols[:payloads].read_bytes(n * 8).unpack("q<*")
+        arena_bytes = cols[:arena].read_bytes(cols[:arena_len])
+        arena_bytes.force_encoding(Encoding::UTF_8)
+        walk_columns(kinds, tags, ikeys, bools, offs, lens, pays, arena_bytes)
+      ensure
+        FFI.yeptris_value_free_columns(cols)
+      end
+    end
+
     def load(yaml, schema: :compat_11)
       docs = load_all(yaml, schema: schema)
       docs.empty? ? nil : docs.first
@@ -97,14 +129,14 @@ module Yeptris
             anchors[pending_anchor] = v
             pending_anchor = nil
           end
-          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat, i)
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat[i + IS_KEY], flat[i + TAG])
         when V_INT
           v = flat[i + P64]
           if pending_anchor
             anchors[pending_anchor] = v
             pending_anchor = nil
           end
-          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat, i)
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat[i + IS_KEY], flat[i + TAG])
         when V_FLOAT
           text = arena.byteslice(flat[i + OFF], flat[i + LEN])
           # Psych's float grammar requires the dot (or an inf/nan
@@ -119,7 +151,7 @@ module Yeptris
             anchors[pending_anchor] = v
             pending_anchor = nil
           end
-          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat, i)
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat[i + IS_KEY], flat[i + TAG])
         when V_BOOL
           text = arena.byteslice(flat[i + OFF], flat[i + LEN])
           # Psych quirk: single-char y/n stay Strings
@@ -128,16 +160,16 @@ module Yeptris
             anchors[pending_anchor] = v
             pending_anchor = nil
           end
-          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat, i)
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat[i + IS_KEY], flat[i + TAG])
         when V_NULL
-          slot(docs, stack, pending_key, pending_key_tag, nil, merge_target, flat, i)
+          slot(docs, stack, pending_key, pending_key_tag, nil, merge_target, flat[i + IS_KEY], flat[i + TAG])
         when V_TS
           v = Materializer.parse_timestamp(arena.byteslice(flat[i + OFF], flat[i + LEN]))
           if pending_anchor
             anchors[pending_anchor] = v
             pending_anchor = nil
           end
-          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat, i)
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat[i + IS_KEY], flat[i + TAG])
         when MAP_OPEN
           h = {}
           if pending_anchor
@@ -145,7 +177,7 @@ module Yeptris
             pending_anchor = nil
           end
           merge_target.push(slot(docs, stack, pending_key, pending_key_tag, h, merge_target,
-                                 flat, i))
+                                 flat[i + IS_KEY], flat[i + TAG]))
           stack.push(h)
           pending_key.push(nil)
           pending_key_tag.push(nil)
@@ -156,7 +188,7 @@ module Yeptris
             pending_anchor = nil
           end
           merge_target.push(slot(docs, stack, pending_key, pending_key_tag, a, merge_target,
-                                 flat, i))
+                                 flat[i + IS_KEY], flat[i + TAG]))
           stack.push(a)
           pending_key.push(nil)
           pending_key_tag.push(nil)
@@ -170,7 +202,7 @@ module Yeptris
           docs.push(nil)
         when ALIAS
           v = anchors[arena.byteslice(flat[i + OFF], flat[i + LEN])]
-          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat, i)
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, flat[i + IS_KEY], flat[i + TAG])
         when ANCHOR
           pending_anchor = arena.byteslice(flat[i + OFF], flat[i + LEN])
         end
@@ -179,13 +211,140 @@ module Yeptris
       docs
     end
 
+    # The columnar twin of walk above (lockstep: same semantics, same
+    # order; fields come from tight per-kind arrays, stride 1).
+    def walk_columns(kinds, tags, ikeys, bools, offs, lens, pays, arena)
+      docs = []
+      stack = []
+      anchors = {}
+      pending_key = []
+      pending_key_tag = []
+      pending_anchor = nil
+      merge_target = []
+
+      i = 0
+      n = kinds.length
+      while i < n
+        case kinds[i]
+        when V_STR
+          text = arena.byteslice(offs[i], lens[i])
+          v = if bools[i] == 1 && text.length > 1 &&
+                text.start_with?(":") && !text.start_with?("::")
+                text[1..].to_sym
+              else
+                text
+              end
+          if pending_anchor
+            anchors[pending_anchor] = v
+            pending_anchor = nil
+          end
+          # inline the dominant placement (Hash parent, value slot,
+          # non-merge key): a slot() call per pair was measurable
+          if !stack.empty?
+            parent = stack.last
+            if parent.is_a?(Hash) && ikeys[i] == 0 && (k = pending_key[-1]) && k != "<<"
+              parent[k] = v
+              pending_key[-1] = nil
+            else
+              slot(docs, stack, pending_key, pending_key_tag, v, merge_target, ikeys[i], tags[i])
+            end
+          else
+            docs[-1] = v
+          end
+        when V_INT
+          v = pays[i]
+          if pending_anchor
+            anchors[pending_anchor] = v
+            pending_anchor = nil
+          end
+          if !stack.empty?
+            parent = stack.last
+            if parent.is_a?(Hash) && ikeys[i] == 0 && (k = pending_key[-1]) && k != "<<"
+              parent[k] = v
+              pending_key[-1] = nil
+            else
+              slot(docs, stack, pending_key, pending_key_tag, v, merge_target, ikeys[i], tags[i])
+            end
+          else
+            docs[-1] = v
+          end
+        when V_FLOAT
+          text = arena.byteslice(offs[i], lens[i])
+          v = if text.include?(".") || text.include?(":") || text.start_with?(".")
+                [pays[i]].pack("q<").unpack1("E")
+              else
+                text
+              end
+          if pending_anchor
+            anchors[pending_anchor] = v
+            pending_anchor = nil
+          end
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, ikeys[i], tags[i])
+        when V_BOOL
+          text = arena.byteslice(offs[i], lens[i])
+          v = text.length == 1 ? text : bools[i] == 1
+          if pending_anchor
+            anchors[pending_anchor] = v
+            pending_anchor = nil
+          end
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, ikeys[i], tags[i])
+        when V_NULL
+          slot(docs, stack, pending_key, pending_key_tag, nil, merge_target, ikeys[i], tags[i])
+        when V_TS
+          v = Materializer.parse_timestamp(arena.byteslice(offs[i], lens[i]))
+          if pending_anchor
+            anchors[pending_anchor] = v
+            pending_anchor = nil
+          end
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, ikeys[i], tags[i])
+        when MAP_OPEN
+          h = {}
+          if pending_anchor
+            anchors[pending_anchor] = h
+            pending_anchor = nil
+          end
+          merge_target.push(slot(docs, stack, pending_key, pending_key_tag, h, merge_target,
+                                 ikeys[i], tags[i]))
+          stack.push(h)
+          pending_key.push(nil)
+          pending_key_tag.push(nil)
+        when SEQ_OPEN
+          a = []
+          if pending_anchor
+            anchors[pending_anchor] = a
+            pending_anchor = nil
+          end
+          merge_target.push(slot(docs, stack, pending_key, pending_key_tag, a, merge_target,
+                                 ikeys[i], tags[i]))
+          stack.push(a)
+          pending_key.push(nil)
+          pending_key_tag.push(nil)
+        when CLOSE
+          closed = stack.pop
+          pending_key.pop
+          pending_key_tag.pop
+          target = merge_target.pop
+          Materializer.merge_into(target, closed) if target
+        when DOC
+          docs.push(nil)
+        when ALIAS
+          v = anchors[arena.byteslice(offs[i], lens[i])]
+          slot(docs, stack, pending_key, pending_key_tag, v, merge_target, ikeys[i], tags[i])
+        when ANCHOR
+          pending_anchor = arena.byteslice(offs[i], lens[i])
+        end
+        i += 1
+      end
+      docs
+    end
+
     # Places a completed value: document root, sequence entry, or a
     # map's key (is_key) / value (completing the pending pair).
     # Returns the merge TARGET when the value is a still-empty
     # container placed under a '<<' key — the open-site caller pushes
     # it so the matching CLOSE merges into it (an inline map's
     # contents arrive after its open); scalar merges apply now.
-    def slot(docs, stack, pending_key, pending_key_tag, v, _merge_target, flat, i)
+    def slot(docs, stack, pending_key, pending_key_tag, v, _merge_target, is_key, tag)
       if stack.empty?
         docs[-1] = v
         return nil
@@ -195,9 +354,9 @@ module Yeptris
         parent.push(v)
         return nil
       end
-      if flat[i + IS_KEY] == 1
+      if is_key == 1
         pending_key[-1] = v
-        pending_key_tag[-1] = flat[i + TAG]
+        pending_key_tag[-1] = tag
         return nil
       end
       key = pending_key[-1]

data/lib/yeptris/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yeptris
-  VERSION = "0.1.0"
+  VERSION = "0.1.1.1"
 end

data/lib/yeptris/yaml.rb

@@ -11,12 +11,24 @@ module Yeptris
     # schema: :compat_11 selects Psych/libyaml implicit typing
     # (yes/no, 0o/octal, sexagesimal); :core_12 (default) is YAML 1.2.
     def load(yaml, schema: :compat_11)
-      ValueML.load(yaml, schema: schema)
+      docs = _drain_all(yaml, schema)
+      docs.empty? ? nil : docs.first
     end
 
     # Every document in the stream, in order.
     def load_stream(yaml, schema: :compat_11)
-      ValueML.load_all(yaml, schema: schema)
+      _drain_all(yaml, schema)
+    end
+
+    # The columnar drain when the loaded libyeptris has it (>= 0.1.2
+    # era builds), the record drain otherwise — one code path, the
+    # fastest the library offers.
+    def _drain_all(yaml, schema)
+      if FFI::COLUMNS
+        ValueML.load_all_columns(yaml, schema: schema)
+      else
+        ValueML.load_all(yaml, schema: schema)
+      end
     end
 
     # The Psych-suite port's spelling (spec/psych/): compat typing.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeptris
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1.1
 platform: ruby
 authors:
 - Ribose Inc.