lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: Add autoedge and autogroup meta params to mcl

Browse Source 
These weren't yet exposed in mcl. They're now available under the same
Meta namespace as the normal meta param structs. Even though they live
as a separate trait, they should be exposed together for a consistent
interface in mcl. If autoedge or autogroup ever grow additional params,
we can always add: `Meta:autoedge:something` to break it down further.
This commit is contained in:
James Shubin
2019-01-12 13:16:39 -05:00
parent 451e1122a7
commit b1ffb1d4a4
5 changed files with 68 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/language-guide.md
View File

@@ -227,6 +227,7 @@ file "/tmp/f1" {
Meta:noop => true, Meta:noop => true,
Meta:delay => $b ?: 42, Meta:delay => $b ?: 42,
Meta:autoedge => false,
} }
``` ```
@@ -250,6 +251,8 @@ file "/tmp/f1" {
limit => 4.2, limit => 4.2,
burst => 3, burst => 3,
sema => ["foo:1", "bar:3",], sema => ["foo:1", "bar:3",],
autoedge => true,
autogroup => false,
}, },
} }
``` ```

4
lang/interpret_test.go
View File

@@ -994,8 +994,12 @@ func TestAstInterpret0(t *testing.T) {
limit => 4.2, limit => 4.2,
burst => 3, burst => 3,
sema => ["foo:1", "bar:3",], sema => ["foo:1", "bar:3",],
autoedge => true,
autogroup => true,
}, },
Meta:noop => true, Meta:noop => true,
Meta:autoedge => true,
Meta:autogroup => true,
} }
`, `,
graph: graph, graph: graph,

22
lang/interpret_test/TestAstFunc1/metaparams0.graph
View File

@@ -1,17 +1,23 @@
Edge: bool(false) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3))) # noop Edge: bool(false) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true)) # noop
Edge: bool(true) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true)) # autoedge
Edge: bool(true) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true)) # autogroup
Edge: bool(true) -> var(b) # b Edge: bool(true) -> var(b) # b
Edge: bool(true) -> var(b) # b Edge: bool(true) -> var(b) # b
Edge: float(4.2) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3))) # limit Edge: float(4.2) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true)) # limit
Edge: int(-1) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3))) # retry Edge: int(-1) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true)) # retry
Edge: int(0) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3))) # delay Edge: int(0) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true)) # delay
Edge: int(3) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3))) # burst Edge: int(3) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true)) # burst
Edge: int(5) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3))) # poll Edge: int(5) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true)) # poll
Edge: list(str(foo:1), str(bar:3)) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3))) # sema Edge: list(str(foo:1), str(bar:3)) -> struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true)) # sema
Edge: str(bar:3) -> list(str(foo:1), str(bar:3)) # 1 Edge: str(bar:3) -> list(str(foo:1), str(bar:3)) # 1
Edge: str(foo:1) -> list(str(foo:1), str(bar:3)) # 0 Edge: str(foo:1) -> list(str(foo:1), str(bar:3)) # 0
Edge: str(hello world) -> call:fmt.printf(str(hello world)) # a Edge: str(hello world) -> call:fmt.printf(str(hello world)) # a
Vertex: bool(false) Vertex: bool(false)
Vertex: bool(false) Vertex: bool(false)
Vertex: bool(false)
Vertex: bool(true)
Vertex: bool(true)
Vertex: bool(true)
Vertex: bool(true) Vertex: bool(true)
Vertex: bool(true) Vertex: bool(true)
Vertex: call:fmt.printf(str(hello world)) Vertex: call:fmt.printf(str(hello world))
@@ -26,6 +32,6 @@ Vertex: str(bar:3)
Vertex: str(foo:1) Vertex: str(foo:1)
Vertex: str(greeting) Vertex: str(greeting)
Vertex: str(hello world) Vertex: str(hello world)
Vertex: struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3))) Vertex: struct(noop: bool(false); retry: int(-1); delay: int(0); poll: int(5); limit: float(4.2); burst: int(3); sema: list(str(foo:1), str(bar:3)); autoedge: bool(true); autogroup: bool(true))
Vertex: var(b) Vertex: var(b)
Vertex: var(b) Vertex: var(b)

4
lang/interpret_test/TestAstFunc1/metaparams0/main.mcl
View File

@@ -13,8 +13,12 @@ test "greeting" {
limit => 4.2, limit => 4.2,
burst => 3, burst => 3,
sema => ["foo:1", "bar:3",], sema => ["foo:1", "bar:3",],
autoedge => true,
autogroup => true,
}, },
Meta:noop => false, Meta:noop => false,
Meta:noop => true, # duplicates allowed atm, but not recommended! Meta:noop => true, # duplicates allowed atm, but not recommended!
Meta:poll => $b ?: 42, Meta:poll => $b ?: 42,
Meta:autoedge => true,
Meta:autogroup => false,
} }

44
lang/structs.go
View File

@@ -617,6 +617,15 @@ func (obj *StmtRes) edges(resName string) ([]*interfaces.Edge, error) {
func (obj *StmtRes) metaparams(res engine.Res) error { func (obj *StmtRes) metaparams(res engine.Res) error {
meta := engine.DefaultMetaParams.Copy() // defaults meta := engine.DefaultMetaParams.Copy() // defaults
var aem *engine.AutoEdgeMeta
if r, ok := res.(engine.EdgeableRes); ok {
aem = r.AutoEdgeMeta() // get a struct with the defaults
}
var agm *engine.AutoGroupMeta
if r, ok := res.(engine.GroupableRes); ok {
agm = r.AutoGroupMeta() // get a struct with the defaults
}
for _, line := range obj.Contents { for _, line := range obj.Contents {
x, ok := line.(*StmtResMeta) x, ok := line.(*StmtResMeta)
if !ok { if !ok {
@@ -676,6 +685,16 @@ func (obj *StmtRes) metaparams(res engine.Res) error {
} }
meta.Sema = values meta.Sema = values
case "autoedge":
if aem != nil {
aem.Disabled = !v.Bool() // must not panic
}
case "autogroup":
if agm != nil {
agm.Disabled = !v.Bool() // must not panic
}
case MetaField: case MetaField:
if val, exists := v.Struct()["noop"]; exists { if val, exists := v.Struct()["noop"]; exists {
meta.Noop = val.Bool() // must not panic meta.Noop = val.Bool() // must not panic
@@ -712,6 +731,12 @@ func (obj *StmtRes) metaparams(res engine.Res) error {
} }
meta.Sema = values meta.Sema = values
} }
if val, exists := v.Struct()["autoedge"]; exists && aem != nil {
aem.Disabled = !val.Bool() // must not panic
}
if val, exists := v.Struct()["autogroup"]; exists && agm != nil {
agm.Disabled = !val.Bool() // must not panic
}
default: default:
return fmt.Errorf("unknown property: %s", p) return fmt.Errorf("unknown property: %s", p)
@@ -719,6 +744,13 @@ func (obj *StmtRes) metaparams(res engine.Res) error {
} }
res.SetMetaParams(meta) // set it! res.SetMetaParams(meta) // set it!
if r, ok := res.(engine.EdgeableRes); ok {
r.SetAutoEdgeMeta(aem) // set
}
if r, ok := res.(engine.GroupableRes); ok {
r.SetAutoGroupMeta(agm) // set
}
return nil return nil
} }
@@ -1086,6 +1118,8 @@ func (obj *StmtResMeta) Init(data *interfaces.Data) error {
case "limit": case "limit":
case "burst": case "burst":
case "sema": case "sema":
case "autoedge":
case "autogroup":
case MetaField: case MetaField:
default: default:
@@ -1194,10 +1228,18 @@ func (obj *StmtResMeta) Unify(kind string) ([]interfaces.Invariant, error) {
case "sema": case "sema":
typ = types.NewType("[]str") typ = types.NewType("[]str")
case "autoedge":
typ = types.TypeBool
case "autogroup":
typ = types.TypeBool
// autoedge and autogroup aren't part of the `MetaRes` interface, but we
// can merge them in here for simplicity in the public user interface...
case MetaField: case MetaField:
// FIXME: allow partial subsets of this struct, and in any order // FIXME: allow partial subsets of this struct, and in any order
// FIXME: we might need an updated unification engine to do this // FIXME: we might need an updated unification engine to do this
typ = types.NewType("struct{noop bool; retry int; delay int; poll int; limit float; burst int; sema []str}") typ = types.NewType("struct{noop bool; retry int; delay int; poll int; limit float; burst int; sema []str; autoedge bool; autogroup bool}")
default: default:
return nil, fmt.Errorf("unknown property: %s", p) return nil, fmt.Errorf("unknown property: %s", p)