mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-19 12:51:51 +03:00
graph-store: first stab at reworking the scry format
This commit is contained in:
Logan Allen
parent
8c1d609617
commit
17430d9314
@ -180,10 +180,7 @@
|
|||||||
==
|
==
|
||||||
::
|
::
|
||||||
++ add-nodes
|
++ add-nodes
|
||||||
|= $: =time
|
|= [=time =resource:store nodes=(map index:store node:store)]
|
||||||
=resource:store
|
|
||||||
nodes=(map index:store node:store)
|
|
||||||
==
|
|
||||||
^- (quip card _state)
|
^- (quip card _state)
|
||||||
|^
|
|^
|
||||||
=/ [=graph:store mark=(unit mark:store)]
|
=/ [=graph:store mark=(unit mark:store)]
|
||||||
@ -618,392 +615,78 @@
|
|||||||
~/ %graph-store-peek
|
~/ %graph-store-peek
|
||||||
|= =path
|
|= =path
|
||||||
^- (unit (unit cage))
|
^- (unit (unit cage))
|
||||||
|^
|
?+ path (on-peek:def path)
|
||||||
?> (team:title our.bowl src.bowl)
|
|
||||||
?+ path (on-peek:def path)
|
|
||||||
[%x %graph-mark @ @ ~]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ result=(unit marked-graph:store)
|
|
||||||
(~(get by graphs) [ship term])
|
|
||||||
?~ result [~ ~]
|
|
||||||
``noun+!>(`(unit mark)`q.u.result)
|
|
||||||
::
|
|
||||||
[%x %keys ~]
|
[%x %keys ~]
|
||||||
:- ~ :- ~ :- %graph-update-2
|
:- ~ :- ~ :- %graph-update-2
|
||||||
!>(`update:store`[now.bowl [%keys ~(key by graphs)]])
|
!>(`update:store`[now.bowl [%keys ~(key by graphs)]])
|
||||||
::
|
::
|
||||||
[%x %tags ~]
|
[%x %tag-queries *]
|
||||||
:- ~ :- ~ :- %graph-update-2
|
:- ~ :- ~ :- %graph-update-2
|
||||||
!>(`update:store`[now.bowl [%tags ~(key by tag-queries)]])
|
!> ^- update:store
|
||||||
|
:- now.bowl
|
||||||
|
?+ t.t.path (on-peek:def t.t.path)
|
||||||
|
~ [%tag-queries tag-queries]
|
||||||
|
[%tags ~] [%tags ~(key by tag-queries)]
|
||||||
|
==
|
||||||
::
|
::
|
||||||
[%x %tag-queries ~]
|
[%x %update-logs @ @ *]
|
||||||
:- ~ :- ~ :- %graph-update-2
|
|
||||||
!>(`update:store`[now.bowl [%tag-queries tag-queries]])
|
|
||||||
::
|
|
||||||
[%x %graph @ @ ~]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
=/ =ship (slav %p i.t.t.path)
|
||||||
=/ =term i.t.t.t.path
|
=/ =term i.t.t.t.path
|
||||||
=/ result=(unit marked-graph:store)
|
=/ update-log
|
||||||
(~(get by graphs) [ship term])
|
(~(get by update-logs) [ship term])
|
||||||
?~ result [~ ~]
|
?~ update-log [~ ~]
|
||||||
:- ~ :- ~ :- %graph-update-2
|
:- ~ :- ~ :- %noun
|
||||||
!> ^- update:store
|
!>
|
||||||
:- now.bowl
|
?+ t.t.t.t.path (on-peek:def t.t.t.t.path)
|
||||||
[%add-graph [ship term] `graph:store`p.u.result q.u.result %.y]
|
~ `update-log:store`u.update-log
|
||||||
::
|
|
||||||
:: note: near-duplicate of /x/graph
|
|
||||||
::
|
|
||||||
[%x %archive @ @ ~]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ result=(unit marked-graph:store)
|
|
||||||
(~(get by archive) [ship term])
|
|
||||||
?~ result
|
|
||||||
~& no-archived-graph+[ship term]
|
|
||||||
[~ ~]
|
|
||||||
:- ~ :- ~ :- %graph-update-2
|
|
||||||
!> ^- update:store
|
|
||||||
:- now.bowl
|
|
||||||
[%add-graph [ship term] `graph:store`p.u.result q.u.result %.y]
|
|
||||||
::
|
|
||||||
[%x %export ~]
|
|
||||||
``noun+!>(state)
|
|
||||||
::
|
|
||||||
[%x %graph-subset @ @ @ @ ~]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ start=(unit atom) (rush i.t.t.t.t.path dem:ag)
|
|
||||||
=/ end=(unit atom) (rush i.t.t.t.t.t.path dem:ag)
|
|
||||||
=/ graph=(unit marked-graph:store)
|
|
||||||
(~(get by graphs) [ship term])
|
|
||||||
?~ graph [~ ~]
|
|
||||||
:- ~ :- ~ :- %graph-update-2
|
|
||||||
!> ^- update:store
|
|
||||||
:- now.bowl
|
|
||||||
:+ %add-nodes
|
|
||||||
[ship term]
|
|
||||||
%- ~(gas by *(map index:store node:store))
|
|
||||||
%+ turn (tap:orm `graph:store`(lot:orm p.u.graph start end))
|
|
||||||
|= [=atom =node:store]
|
|
||||||
^- [index:store node:store]
|
|
||||||
[~[atom] node]
|
|
||||||
::
|
|
||||||
[%x %node-exists @ @ @ *]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ =index:store
|
|
||||||
(turn t.t.t.t.path (cury slav %ud))
|
|
||||||
=/ node=(unit node:store)
|
|
||||||
(get-node ship term index)
|
|
||||||
``noun+!>(`?`?=(^ node))
|
|
||||||
::
|
|
||||||
[%x %node @ @ @ *]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ =index:store
|
|
||||||
(turn t.t.t.t.path (cury slav %ud))
|
|
||||||
=/ node=(unit node:store) (get-node ship term index)
|
|
||||||
?~ node [~ ~]
|
|
||||||
:- ~ :- ~ :- %graph-update-2
|
|
||||||
!> ^- update:store
|
|
||||||
:- now.bowl
|
|
||||||
:+ %add-nodes
|
|
||||||
[ship term]
|
|
||||||
(~(gas by *(map index:store node:store)) [index u.node] ~)
|
|
||||||
::
|
|
||||||
[%x %node-siblings ?(%older %younger) @ @ @ *]
|
|
||||||
|^
|
|
||||||
=/ older ?=(%older i.t.t.path)
|
|
||||||
=/ =ship (slav %p i.t.t.t.path)
|
|
||||||
=/ =term i.t.t.t.t.path
|
|
||||||
=/ count (slav %ud i.t.t.t.t.t.path)
|
|
||||||
=/ =index:store
|
|
||||||
(turn t.t.t.t.t.t.path (cury slav %ud))
|
|
||||||
=/ parent=index:store
|
|
||||||
(scag (dec (lent index)) index)
|
|
||||||
=/ graph
|
|
||||||
(get-node-children ship term parent)
|
|
||||||
?~ graph [~ ~]
|
|
||||||
:- ~ :- ~ :- %graph-update-2
|
|
||||||
!> ^- update:store
|
|
||||||
:- now.bowl
|
|
||||||
:+ %add-nodes
|
|
||||||
[ship term]
|
|
||||||
%- ~(gas by *(map index:store node:store))
|
|
||||||
%+ turn
|
|
||||||
?: older
|
|
||||||
(tab:orm u.graph `(rear index) count)
|
|
||||||
:: TODO time complexity not desirable for %younger case
|
|
||||||
::
|
|
||||||
%+ slag (safe-sub (lent -) count)
|
|
||||||
%- tap:orm
|
|
||||||
%+ lot:orm u.graph
|
|
||||||
[~ `(snag (dec (lent index)) index)]
|
|
||||||
|= [=atom =node:store]
|
|
||||||
^- [index:store node:store]
|
|
||||||
[(snoc parent atom) node]
|
|
||||||
::
|
::
|
||||||
++ safe-sub
|
[%latest ~]
|
||||||
|= [a=@ b=@]
|
^- (unit time)
|
||||||
^- @
|
%+ biff update-log
|
||||||
?: (gte b a)
|
|= =update-log:store
|
||||||
0
|
=/ result=(unit [=time =update:store])
|
||||||
(sub a b)
|
(pry:orm-log:store update-log)
|
||||||
--
|
(bind result head)
|
||||||
|
::
|
||||||
|
[%subset @ @ ~]
|
||||||
|
^- update-log:store
|
||||||
|
=* start i.t.t.t.t.t.path
|
||||||
|
=* end i.t.t.t.t.t.t.path
|
||||||
|
%^ lot:orm-log
|
||||||
|
u.update-log
|
||||||
|
(slaw %da start)
|
||||||
|
(slaw %da end)
|
||||||
|
==
|
||||||
::
|
::
|
||||||
[%x %shallow-children @ @ *]
|
[%x %graph @ @ *]
|
||||||
=/ =ship (slav %p i.t.t.path)
|
=/ =ship (slav %p i.t.t.path)
|
||||||
=/ =term i.t.t.t.path
|
=/ =term i.t.t.t.path
|
||||||
=/ =index:store
|
=/ marked-graph=(unit marked-graph:store)
|
||||||
(turn t.t.t.t.path (cury slav %ud))
|
(~(get by graphs) [ship term])
|
||||||
=/ children
|
?~ marked-graph [~ ~]
|
||||||
(get-node-children ship term index)
|
=* graph p.u.marked-graph
|
||||||
?~ children [~ ~]
|
=* mark q.u.marked-graph
|
||||||
:- ~ :- ~ :- %graph-update-2
|
?+ t.t.t.t.path (on-peek:def t.t.t.t.path)
|
||||||
!> ^- update:store
|
~
|
||||||
:+ now.bowl %add-nodes
|
:- ~ :- ~ :- %graph-update-2
|
||||||
:- [ship term]
|
!>(`update:store`[now.bowl [%add-graph [ship term] graph mark %.y]])
|
||||||
%- ~(gas by *(map index:store node:store))
|
::
|
||||||
%+ turn (tap:orm u.children)
|
[%mark ~]
|
||||||
|= [=atom =node:store]
|
``noun+!>(`(unit ^mark)`mark)
|
||||||
^- [index:store node:store]
|
::
|
||||||
:- (snoc index atom)
|
[%subset @ @ ~]
|
||||||
node(children [%empty ~])
|
=/ start=(unit atom) (rush i.t.t.t.t.t.path dem:ag)
|
||||||
::
|
=/ end=(unit atom) (rush i.t.t.t.t.t.t.path dem:ag)
|
||||||
[%x ?(%newest %oldest) @ @ @ *]
|
|
||||||
=/ newest ?=(%newest i.t.path)
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ count=@ud
|
|
||||||
(slav %ud i.t.t.t.t.path)
|
|
||||||
=/ =index:store
|
|
||||||
(turn t.t.t.t.t.path (cury slav %ud))
|
|
||||||
=/ children
|
|
||||||
(get-node-children ship term index)
|
|
||||||
?~ children [~ ~]
|
|
||||||
:- ~ :- ~ :- %graph-update-2
|
|
||||||
!> ^- update:store
|
|
||||||
:- now.bowl
|
|
||||||
:+ %add-nodes
|
|
||||||
[ship term]
|
|
||||||
%- ~(gas by *(map index:store node:store))
|
|
||||||
%+ turn
|
|
||||||
%+ scag count
|
|
||||||
?: newest
|
|
||||||
(tap:orm u.children)
|
|
||||||
(bap:orm u.children)
|
|
||||||
|= [=atom =node:store]
|
|
||||||
^- [index:store node:store]
|
|
||||||
[(snoc index atom) node]
|
|
||||||
::
|
|
||||||
[%x %node-children-subset @ @ @ @ @ *]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ start=(unit atom) (rush i.t.t.t.t.path dem:ag)
|
|
||||||
=/ end=(unit atom) (rush i.t.t.t.t.t.path dem:ag)
|
|
||||||
=/ =index:store
|
|
||||||
(turn t.t.t.t.t.t.path |=(=cord (slav %ud cord)))
|
|
||||||
=/ node=(unit node:store) (get-node ship term index)
|
|
||||||
?~ node [~ ~]
|
|
||||||
?- -.children.u.node
|
|
||||||
%empty [~ ~]
|
|
||||||
%graph
|
|
||||||
:- ~ :- ~ :- %graph-update-2
|
:- ~ :- ~ :- %graph-update-2
|
||||||
!> ^- update:store
|
!> ^- update:store
|
||||||
:- now.bowl
|
:^ now.bowl %add-nodes [ship term]
|
||||||
:+ %add-nodes
|
|
||||||
[ship term]
|
|
||||||
%- ~(gas by *(map index:store node:store))
|
%- ~(gas by *(map index:store node:store))
|
||||||
%+ turn (tap:orm `graph:store`(lot:orm p.children.u.node end start))
|
%+ turn (tap:orm (lot:orm graph start end))
|
||||||
|= [=atom =node:store]
|
|=([=atom =node:store] [atom^~ node])
|
||||||
^- [index:store node:store]
|
|
||||||
[(snoc index atom) node]
|
|
||||||
==
|
==
|
||||||
::
|
|
||||||
[%x %deep-nodes-older-than @ @ @ @ ~]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ count=(unit atom) (rush i.t.t.t.t.path dem:ag)
|
|
||||||
=/ start=(unit atom) (rush i.t.t.t.t.t.path dem:ag)
|
|
||||||
?: ?=(~ count)
|
|
||||||
[~ ~]
|
|
||||||
=/ result=(unit marked-graph:store)
|
|
||||||
(~(get by graphs) [ship term])
|
|
||||||
?~ result
|
|
||||||
[~ ~]
|
|
||||||
:- ~ :- ~ :- %graph-update-2
|
|
||||||
!> ^- update:store
|
|
||||||
:- now.bowl
|
|
||||||
:+ %add-nodes
|
|
||||||
[ship term]
|
|
||||||
=* a u.count
|
|
||||||
=/ b=(list (pair atom node:store))
|
|
||||||
(tab:orm p.u.result start u.count)
|
|
||||||
=| c=index:store
|
|
||||||
=| d=(map index:store node:store)
|
|
||||||
=| e=@ud
|
|
||||||
=- d
|
|
||||||
|- ^- [e=@ud d=(map index:store node:store)]
|
|
||||||
?: ?|(?=(~ b) =(e a))
|
|
||||||
[e d]
|
|
||||||
=* atom p.i.b
|
|
||||||
=* node q.i.b
|
|
||||||
=. c (snoc c atom)
|
|
||||||
?- -.children.node
|
|
||||||
%empty
|
|
||||||
$(b t.b, e +(e), d (~(put by d) c node), c (snip c))
|
|
||||||
::
|
|
||||||
%graph
|
|
||||||
=/ f $(b (tab:orm p.children.node ~ (sub a e)))
|
|
||||||
?: =(e.f a) f
|
|
||||||
%_ $
|
|
||||||
b t.b
|
|
||||||
e +(e.f)
|
|
||||||
d (~(put by d.f) c node(children [%empty ~]))
|
|
||||||
c (snip c)
|
|
||||||
==
|
|
||||||
==
|
|
||||||
::
|
|
||||||
[%x %firstborn @ @ @ *]
|
|
||||||
|^
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ =index:store
|
|
||||||
(turn t.t.t.t.path (cury slav %ud))
|
|
||||||
?> ?=(^ index)
|
|
||||||
=/ result=(unit marked-graph:store)
|
|
||||||
(~(get by graphs) [ship term])
|
|
||||||
?~ result
|
|
||||||
[~ ~]
|
|
||||||
%- (bond |.(`(unit (unit cage))`[~ ~]))
|
|
||||||
%+ biff
|
|
||||||
(collect-parents p.u.result index ship term)
|
|
||||||
(corl some collect-firstborn)
|
|
||||||
::
|
|
||||||
++ collect-parents
|
|
||||||
|= [=graph:store =index:store =ship =term]
|
|
||||||
^- %- unit
|
|
||||||
[node:store index:store (map index:store node:store) ^ship ^term]
|
|
||||||
=| =(map index:store node:store)
|
|
||||||
=| =node:store
|
|
||||||
=| ind=index:store
|
|
||||||
=/ len (lent index)
|
|
||||||
|-
|
|
||||||
?: (gte (lent ind) len)
|
|
||||||
`[node ind map ship term]
|
|
||||||
?> ?=(^ index)
|
|
||||||
=* atom i.index
|
|
||||||
?. (has:orm graph atom)
|
|
||||||
~
|
|
||||||
=: node (got:orm graph atom)
|
|
||||||
ind (snoc ind atom)
|
|
||||||
==
|
|
||||||
?: ?=(%empty -.children.node)
|
|
||||||
?. (gte (lent ind) len)
|
|
||||||
~
|
|
||||||
:- ~
|
|
||||||
:* node ind
|
|
||||||
(~(put by map) ind node)
|
|
||||||
ship term
|
|
||||||
==
|
|
||||||
%_ $
|
|
||||||
index t.index
|
|
||||||
graph p.children.node
|
|
||||||
map (~(put by map) ind node(children empty+~))
|
|
||||||
==
|
|
||||||
::
|
|
||||||
++ collect-firstborn
|
|
||||||
|= [=node:store =index:store mp=(map index:store node:store) =ship =term]
|
|
||||||
^- (unit (unit cage))
|
|
||||||
?: ?=(%empty -.children.node)
|
|
||||||
:- ~ :- ~ :- %graph-update-2
|
|
||||||
!> ^- update:store
|
|
||||||
[now.bowl [%add-nodes [ship term] mp]]
|
|
||||||
=/ item=[k=atom v=node:store]
|
|
||||||
(need (ram:orm p.children.node))
|
|
||||||
=. index (snoc index k.item)
|
|
||||||
$(mp (~(put by mp) index v.item(children empty+~)), node v.item)
|
|
||||||
--
|
|
||||||
::
|
|
||||||
[%x %update-log-subset @ @ @ @ ~]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ start=(unit time) (slaw %da i.t.t.t.t.path)
|
|
||||||
=/ end=(unit time) (slaw %da i.t.t.t.t.t.path)
|
|
||||||
=/ update-log=(unit update-log:store) (~(get by update-logs) [ship term])
|
|
||||||
?~ update-log [~ ~]
|
|
||||||
:: orm-log is ordered backwards, so swap start and end
|
|
||||||
``noun+!>(`update-log:store`(lot:orm-log u.update-log end start))
|
|
||||||
::
|
|
||||||
[%x %update-log @ @ ~]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ update-log=(unit update-log:store) (~(get by update-logs) [ship term])
|
|
||||||
?~ update-log [~ ~]
|
|
||||||
``noun+!>(`update-log:store`u.update-log)
|
|
||||||
::
|
|
||||||
[%x %peek-update-log @ @ ~]
|
|
||||||
=/ =ship (slav %p i.t.t.path)
|
|
||||||
=/ =term i.t.t.t.path
|
|
||||||
=/ m-update-log=(unit update-log:store)
|
|
||||||
(~(get by update-logs) [ship term])
|
|
||||||
:- ~ :- ~ :- %noun
|
|
||||||
!> ^- (unit time)
|
|
||||||
%+ biff m-update-log
|
|
||||||
|= =update-log:store
|
|
||||||
=/ result=(unit [=time =update:store])
|
|
||||||
(pry:orm-log:store update-log)
|
|
||||||
(bind result head)
|
|
||||||
==
|
|
||||||
::
|
|
||||||
++ get-node-children
|
|
||||||
|= [=ship =term =index:store]
|
|
||||||
^- (unit graph:store)
|
|
||||||
?: ?=(~ index)
|
|
||||||
=/ graph
|
|
||||||
(~(get by graphs) [ship term])
|
|
||||||
?~ graph ~
|
|
||||||
`p.u.graph
|
|
||||||
=/ node
|
|
||||||
(get-node ship term index)
|
|
||||||
?~ node ~
|
|
||||||
?: ?=(%empty -.children.u.node)
|
|
||||||
~
|
|
||||||
`p.children.u.node
|
|
||||||
::
|
|
||||||
++ get-node
|
|
||||||
|= [=ship =term =index:store]
|
|
||||||
^- (unit node:store)
|
|
||||||
=/ parent-graph=(unit marked-graph:store)
|
|
||||||
(~(get by graphs) [ship term])
|
|
||||||
?~ parent-graph ~
|
|
||||||
=/ node=(unit node:store) ~
|
|
||||||
=/ =graph:store p.u.parent-graph
|
|
||||||
|-
|
|
||||||
?~ index
|
|
||||||
node
|
|
||||||
?~ t.index
|
|
||||||
(get:orm graph i.index)
|
|
||||||
=. node (get:orm graph i.index)
|
|
||||||
?~ node ~
|
|
||||||
?- -.children.u.node
|
|
||||||
%empty ~
|
|
||||||
%graph $(graph p.children.u.node, index t.index)
|
|
||||||
==
|
|
||||||
--
|
|
||||||
::
|
|
||||||
++ on-arvo
|
|
||||||
|= [=wire =sign-arvo]
|
|
||||||
^- (quip card _this)
|
|
||||||
?+ wire (on-arvo:def wire sign-arvo)
|
|
||||||
::
|
|
||||||
:: old wire, do nothing
|
|
||||||
[%graph *] [~ this]
|
|
||||||
[%validator @ ~] [~ this]
|
|
||||||
[%try-rejoin @ *] [~ this]
|
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
|
++ on-arvo on-arvo:def
|
||||||
++ on-agent on-agent:def
|
++ on-agent on-agent:def
|
||||||
++ on-leave on-leave:def
|
++ on-leave on-leave:def
|
||||||
++ on-fail on-fail:def
|
++ on-fail on-fail:def
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user