ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-20 15:08:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

metadata-store: move to 1-1 mapping between groups and resources

Browse Source 
Most of userspace already makes this assumption, but it was never
reflected in metadata-store itself.
This commit is contained in:
Liam Fitzgerald 2021-01-13 13:50:04 +10:00
parent 98324445c1
commit d724e933b3
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB
3 changed files with 52 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
pkg/arvo/app/metadata-store.hoon
View File

@ -24,7 +24,7 @@
:: /group/%group-path associations for group
::
/- *metadata-store, *metadata-hook
/+ *metadata-json, default-agent, verb, dbug, resource, *migrate
/+ *metadata-json, default-agent, verb, dbug, resource, *migrate, bi
|%
+$ card card:agent:gall
+$ base-state-0
@ -58,7 +58,7 @@
+$ cached-indices
$: group-indices=(jug resource md-resource)
app-indices=(jug app-name [group=resource =resource])
resource-indices=(jug md-resource resource)
resource-indices=(map md-resource resource)
==
::
+$ base-state-2
@ -155,7 +155,7 @@
|= =path
^- (unit (unit cage))
?+ path (on-peek:def path)
[%y %group-indices ~] ``noun+!>(group-indices)
:: [%y %group-indices ~] ``noun+!>(group-indices)
[%y %app-indices ~] ``noun+!>(app-indices)
[%y %resource-indices ~] ``noun+!>(resource-indices)
[%x %associations ~] ``noun+!>(associations)
@ -167,15 +167,15 @@
=/ group=resource (de-path:resource t.t.path)
``noun+!>((metadata-for-group:mc group))
::
[%x %metadata @ @ @ ~]
=/ group=resource (de-path:resource (stab (slav %t i.t.t.path)))
=/ =md-resource [`term`i.t.t.t.path (de-path:resource (stab (slav %t i.t.t.t.t.path)))]
``noun+!>((~(get by associations) [group md-resource]))
[%x %metadata @ @ @ @ ~]
=/ =md-resource
[i.t.t.t.path (de-path:resource t.t.t.t.path)]
``noun+!>((~(get by associations) md-resource))
::
[%x %resource @ *]
=/ app=term i.t.t.path
=/ rid=resource (de-path:resource t.t.t.path)
``noun+!>((~(get by resource-indices) app rid))
``noun+!>((~(get by associations) [app rid]))
::
[%x %export ~]
``noun+!>(-.state)
@ -203,12 +203,12 @@
::
resource-indices
(rebuild-resource-indices associations.old)
::
app-indices
(rebuild-app-indices associations.old)
::
group-indices
(rebuild-group-indices associations.old)
::
app-indices
(rebuild-app-indices associations.old)
==
?: ?=(%6 -.old)
=/ old-assoc=associations-1
@ -230,24 +230,25 @@
::
++ rebuild-resource-indices
|= =^associations
%- ~(gas ju *(jug md-resource resource))
%+ turn ~(tap in ~(key by associations))
|= [g=resource r=md-resource]
^- [md-resource resource]
%- ~(gas by *(map md-resource resource))
%+ turn ~(tap by associations)
|= [r=md-resource g=resource =metadata]
[r g]
::
++ rebuild-group-indices
|= =^associations
%- ~(gas ju *(jug resource md-resource))
~(tap in ~(key by associations))
%+ turn
~(tap by associations)
|= [r=md-resource g=resource =metadata]
[g r]
::
++ rebuild-app-indices
|= =^associations
%- ~(gas ju *(jug app-name [group=resource resource]))
%+ turn ~(tap in ~(key by associations))
|= [g=resource r=md-resource]
^- [app-name [resource resource]]
[app-name.r [g resource.r]]
%+ turn ~(tap by associations)
|= [r=md-resource g=resource =metadata]
[app-name.r g resource.r]
::
++ migrate-app-to-graph-store
|= [app=@tas associations=associations-1]
@ -269,7 +270,7 @@
|= act=metadata-action
^- (quip card _state)
?> (team:title our.bowl src.bowl)
?- -.act
?+ -.act !!
%add (handle-add group.act resource.act metadata.act)
%remove (handle-remove group.act resource.act)
==
@ -281,7 +282,7 @@
(on-load !>([%7 (remake-metadata ;;(tree-metadata +.arc))]))
::
+$ tree-metadata
$: associations=(tree [[resource md-resource] metadata])
$: associations=(tree [md-resource [resource metadata]])
~
==
::
@ -298,14 +299,11 @@
^- (quip card _state)
:- %+ send-diff app-name.md-resource
?: (~(has by resource-indices) md-resource)
[%update-metadata group md-resource metadata]
[%updated-metadata group md-resource metadata metadata]
[%add group md-resource metadata]
%= state
associations
(~(put by associations) [group md-resource] metadata)
::
group-indices
(~(put ju group-indices) group md-resource)
(~(put by associations) md-resource [group metadata])
::
app-indices
%+ ~(put ju app-indices)
@ -313,7 +311,7 @@
[group resource.md-resource]
::
resource-indices
(~(put ju resource-indices) md-resource group)
(~(put by resource-indices) md-resource group)
==
::
++ handle-remove
@ -322,10 +320,7 @@
:- (send-diff app-name.md-resource [%remove group md-resource])
%= state
associations
(~(del by associations) [group md-resource])
::
group-indices
(~(del ju group-indices) group md-resource)
(~(del by associations) md-resource)
::
app-indices
%+ ~(del ju app-indices)
@ -333,26 +328,30 @@
[group resource.md-resource]
::
resource-indices
(~(del ju resource-indices) md-resource group)
(~(del by resource-indices) md-resource)
==
::
++ metadata-for-app
|= =app-name
^- ^associations
%- ~(gas by *^associations)
%+ turn ~(tap in (~(gut by app-indices) app-name ~))
|= [group=resource rid=resource]
:- [group [app-name rid]]
(~(got by associations) [group [app-name rid]])
^+ associations
%+ roll ~(tap in (~(gut by app-indices) app-name ~))
|= [[group=resource rid=resource] out=^associations]
=/ =md-resource
[app-name rid]
=/ [resource =metadata]
(~(got by associations) md-resource)
(~(put by out) md-resource [group metadata])
::
++ metadata-for-group
|= group=resource
^- ^associations
%- ~(gas by *^associations)
%+ turn ~(tap in (~(gut by group-indices) group ~))
|= =md-resource
:- [group md-resource]
(~(got by associations) [group md-resource])
=/ resources=(set md-resource)
(~(get ju group-indices) group)
%+ roll
~(tap in resources)
|= [=md-resource out=^associations]
=/ [resource =metadata]
(~(got by associations) md-resource)
(~(put by out) md-resource [group metadata])
::
++ send-diff
|= [=app-name upd=metadata-update]

13
pkg/arvo/lib/metadata-json.hoon
View File

@ -7,7 +7,7 @@
^- json
%- pairs
%+ turn ~(tap by associations)
|= [[group=resource =md-resource] =metadata]
|= [=md-resource [group=resource =metadata]]
^- [cord json]
:-
%- crip
@ -89,7 +89,7 @@
=, enjs:format
%+ frond %metadata-update
%- pairs
:~ ?- -.upd
:~ ?+ -.upd *[cord json]
%add
:- %add
%- pairs
@ -98,15 +98,6 @@
[%resource s+(enjs-path:resource resource.resource.upd)]
[%metadata (metadata-to-json metadata.upd)]
==
::
%update-metadata
:- %update-metadata
%- pairs
:~ [%group s+(enjs-path:resource group.upd)]
[%app-name s+app-name.resource.upd]
[%resource s+(enjs-path:resource resource.resource.upd)]
[%metadata (metadata-to-json metadata.upd)]
==
::
%remove
:- %remove

7
pkg/arvo/sur/metadata-store.hoon
View File

@ -5,7 +5,8 @@
+$ app-name term
+$ app-path path
+$ md-resource [=app-name =resource]
+$ associations (map [group=resource md-resource] metadata)
+$ association [group=resource =metadata]
+$ associations (map md-resource association)
::
+$ color @ux
+$ metadata
@ -20,11 +21,13 @@
+$ metadata-action
$% [%add group=resource resource=md-resource =metadata]
[%remove group=resource resource=md-resource]
[%update group=resource resource=md-resource =metadata]
[%initial-group group=resource resources=(map md-resource metadata)]
==
::
+$ metadata-update
$% metadata-action
[%associations =associations]
[%update-metadata group=resource resource=md-resource =metadata]
[%updated-metadata group=resource resource=md-resource before=metadata =metadata]
==
--