flor 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1dae0857de545986e18ad31a41f37a6ead6687b34d3c06de22aafa606369283
-  data.tar.gz: 9843d0124a2c3948ffc6846e7854854f5eda37d95bd02bfc02cecfefab0e5ea1
+  metadata.gz: 8a4ce441bf91802bac4b0d8f4377c5750a18e75e57afef69a77d474ba3d4ede4
+  data.tar.gz: fd068ae5ffa7ca790f1697621c5c6e82a23825a877d97be0d97410f2e1198f03
 SHA512:
-  metadata.gz: 185490e0054ffdfe7c078b71955834679a398266e613be5d8bb6b63bc626bf4727bd4fd45249e7dea14cdd91a85c5ad92a1f6b3b120117c7c274b41d5478ba31
-  data.tar.gz: e6dde7ae40f3ef6d2c7a620d6a07840c6591b745798962d039ac39fa426e4bcef51f3c67e97d9a367bb981918ec5fe98934393eec2cd7e87046b8d491b9a6511
+  metadata.gz: 26abe012bdc4c4d6589217bf7df651d8f5d77cc027abf66d11d048207f3cf0ac91040f2dde45fbed327e33461de0f2e9527c3f06093ecc2db1f2252579840411
+  data.tar.gz: 9e754e16edd94b1795cbe5439fd24c62b8033bc0a93703283465be591fa29b7441282eacb65b71a57057367ff3443abb1ad86c558262f61a2ff5560c0528f8c0

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## flor 1.3.0  released 2021-04-13
+
+* Insert a row flor_pointers for 'failure'
+
+
 ## flor 1.2.2  released 2021-03-29
 
 * Include data in flor_pointers

data/lib/flor.rb

@@ -16,7 +16,7 @@ require 'dense'
 
 module Flor
 
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end
 
 require 'flor/colours'

data/lib/flor/core/procedure.rb

@@ -5,7 +5,7 @@ class Flor::Procedure < Flor::Node
   # "Returning vars" variables to pass back to pass upon reply.
   # In the 'receive' messages, it's a hash under the key 'rvars'.
   #
-  RVARS = %w[ idx ]
+  RVARS = %w[ idx ].freeze
 
   # Attributes that when given alone are turned to "true" attributes.
   #
@@ -13,7 +13,7 @@ class Flor::Procedure < Flor::Node
   #
   # The transformation occurs in Flor::Pro::Att ("_att").
   #
-  TRUE_ATTS = %w[ flank off disabled ]
+  TRUE_ATTS = %w[ flank off disabled ].freeze
 
   class << self
 
@@ -550,6 +550,8 @@ class Flor::Procedure < Flor::Node
     wrap_reply
   end
 
+  IF_UNLESS = %w[ _if _unless ].freeze
+
   # Grab on_error proc from incoming payload and stores it into parent node.
   #
   # Has no effect if there is no parent node.
@@ -562,7 +564,7 @@ class Flor::Procedure < Flor::Node
       @node; loop do
         pnode = parent_node(pnode)
         return unless pnode
-        break unless %w[ _if _unless ].include?(pnode['heap'])
+        break unless IF_UNLESS.include?(pnode['heap'])
       end
 
     flavour = "on_#{key}"
@@ -598,6 +600,8 @@ class Flor::Procedure < Flor::Node
     wrap('point' => 'entered', 'nid' => nid, 'tags' => ret)
   end
 
+  WRAP_KEYS = %w[ error cancel timeout ].freeze
+
   def wrap(h={})
 
     m = {}
@@ -642,7 +646,7 @@ class Flor::Procedure < Flor::Node
       # was considering passing the whole vars back (as 'varz'), but
       # it got in the way... and it might be heavy
 
-    %w[ error cancel timeout ]
+    WRAP_KEYS
       .each { |k|
         co = @node["child_on_#{k}"]
         next unless co

data/lib/flor/log.rb

@@ -343,7 +343,7 @@ module Flor
       o.puts(tree_to_s(node.lookup_tree(nid), nid, out: o)) if node
 
       o.puts "#{_c.dg}node:#{_c.yl}"
-      o.puts YAML.dump(n.merge('tree' => '(above)'))
+      o.puts n ? YAML.dump(n.merge('tree' => '(above)')) : 'nil'
 
       o.puts "#{_c.dg}nodes:#{_c.yl}"
       o.puts nods_to_s(executor, m, opts)

data/lib/flor/unit/scheduler.rb

@@ -242,18 +242,18 @@ module Flor
       end
     end
 
+    RETURN_KEYS = %w[ exid nid payload tasker cause ].freeze
+
     def return(message)
 
-      m =
+      queue(
         if message['point'] == 'failed'
           message
         else
           message
-            .select { |k, _| %w[ exid nid payload tasker cause ].include?(k) }
+            .select { |k, _| RETURN_KEYS.include?(k) }
             .merge!('point' => 'return')
-        end
-
-      queue(m)
+        end)
 
       nil
     end
@@ -432,7 +432,7 @@ module Flor
       ex ? ex.execution : nil
     end
 
-    DUMP_KEYS = %w[ timestamp executions timers traps pointers ]
+    DUMP_KEYS = %w[ timestamp executions timers traps pointers ].freeze
 
     # Dumps all or some of the executions to a JSON string.
     # See Scheduler#load for importing.
@@ -598,6 +598,8 @@ module Flor
       puts(on_start_exc(ex))
     end
 
+    PREP_KEYS = %w[ exid name nid payload on_receive_last ].freeze
+
     def prepare_message(point, args)
 
       h = args
@@ -612,7 +614,7 @@ module Flor
       opts = {}
 
       h.each do |k, v|
-        if %w[ exid name nid payload on_receive_last ].include?(k)
+        if PREP_KEYS.include?(k)
           msg[k] = v
         else
           opts[k.to_sym] = v

data/lib/flor/unit/storage.rb

@@ -220,6 +220,9 @@ module Flor
       raise err
     end
 
+    CRECON_STATUSES = %w[ created consumed ].freeze
+    RESCON_STATUSES = %w[ reserved consumed ].freeze
+
     def load_messages(exe_count)
 
       exe_count += 2
@@ -230,12 +233,12 @@ module Flor
         _exids_being_processed =
           @db[:flor_messages]
             .select(:exid)
-            .exclude(status: %w[ created consumed ])
+            .exclude(status: CRECON_STATUSES)
         _exids =
           @db[:flor_messages]
             .select(:exid)
             .exclude(exid: _exids_being_processed)
-            .exclude(status: %w[ reserved consumed ])
+            .exclude(status: RESCON_STATUSES)
             .limit(exe_count)
         @db[:flor_messages]
           .where(exid: _exids, status: 'created')
@@ -318,7 +321,7 @@ module Flor
       []
     end
 
-    POINTS_TO_ARCHIVE = %w[ terminated failed ceased ]
+    POINTS_TO_ARCHIVE = %w[ terminated failed ceased ].freeze
 
     def consume(messages)
 
@@ -686,6 +689,8 @@ module Flor
         # done in update_pointers
     end
 
+    FP_TYPES = %[ var ].freeze
+
     def update_pointers(exe, status, now)
 
 # Q  Should we archive old pointers?
@@ -701,7 +706,7 @@ module Flor
 
       @db[:flor_pointers]
         .where(exid: exid)
-        .where(Sequel.|({ type: %w[ var ] }, Sequel.~(nid: exe['nodes'].keys)))
+        .where(Sequel.|({ type: FP_TYPES }, Sequel.~(nid: exe['nodes'].keys)))
         .delete
           #
           # Delete all pointer to vars, their value might have changed,
@@ -714,10 +719,14 @@ module Flor
       pointers = exe['nodes']
         .inject([]) { |a, (nid, node)|
 
+          # add a pointer for each tag
+
           ts = node['tags']
           ts.each { |t|
             a << [ dom, exid, nid, 'tag', t, nil, now, u, nil ] } if ts
 
+          # add a pointer for each var (if nid == '0')
+
           vs = nid == '0' ? node['vars'] : nil
           vs.each { |k, v|
             case v; when Numeric, String, TrueClass, FalseClass, NilClass
@@ -729,6 +738,8 @@ module Flor
               a << [ dom, exid, '0', 'var', k, nil, now, u, v ]
             end } if vs
 
+          # add a pointer for the task if any
+
           if ta = node['task']
             tasker = ta['tasker']
             n = ta['name']; name = n.is_a?(String) ? n : JSON.dump(n)
@@ -736,6 +747,29 @@ module Flor
             a << [ dom, exid, nid, 'tasker', tasker, name, now, u, content ]
           end
 
+          # add a pointer for the error if any
+
+          if fa = node['failure']
+
+#puts "-" * 80; pp node; puts "-" * 80
+            a <<
+              if er = fa['error']
+                ni = fa['from'] || nid # not nid /!\
+                nam = "#{er['kla']} l#{er['lin']}"
+                val = er['msg']
+                con = { error: fa, nid: ni }
+                [ dom, exid, ni, 'failure', nam, val, now, u, con ]
+              else
+                nam = fa['tasker'] || 'failure'
+                val = [ fa['attl'] || [], fa['attd'] || {} ]
+                  .collect(&:inspect).join(' ')
+                con = { error: fa, nid: nid }
+                [ dom, exid, nid, 'failure', nam, val, now, u, con ]
+              end
+          end
+
+          # done
+
           a }
 
       cps = @db[:flor_pointers] # current pointers
@@ -747,16 +781,8 @@ module Flor
           #
           # don't insert when already inserted
 
-      #if pointer_columns.include?(:content)
       pointers.each { |ptr| c = ptr[8]; ptr[8] = to_blob(c) if c }
-      #else
-      #  pointers.each { |ptr| ptr.pop }
-      #end
-
-      #@db[:flor_pointers]
-      #  .import(
-      #    pointer_columns,
-      #    pointers)
+
       @db[:flor_pointers]
         .import(
           POINTER_COLUMNS,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo