barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add string comparison to value comparison iterator

Browse source
This commit is contained in:
ben hockey 2015-05-29 10:27:53 -05:00
parent 7c0d8b28b0
commit b2482ac5e1
3 changed files with 148 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
graph/iterator/value_comparison_iterator.go
View file

@ -70,7 +70,6 @@ func (it *Comparison) UID() uint64 {
// Here's the non-boilerplate part of the ValueComparison iterator. Given a value
// and our operator, determine whether or not we meet the requirement.
func (it *Comparison) doComparison(val graph.Value) bool {
//TODO(barakmich): Implement string comparison.
nodeStr := it.qs.NameOf(val)
switch cVal := it.val.(type) {
case int:
@ -86,6 +85,8 @@ func (it *Comparison) doComparison(val graph.Value) bool {
return false
}
return RunIntOp(intVal, it.op, cVal)
case string:
return RunStrOp(nodeStr, it.op, cVal)
default:
return true
}
@ -110,6 +111,21 @@ func RunIntOp(a int64, op Operator, b int64) bool {
}
}
func RunStrOp(a string, op Operator, b string) bool {
switch op {
case compareLT:
return a < b
case compareLTE:
return a <= b
case compareGT:
return a > b
case compareGTE:
return a >= b
default:
panic("Unknown operator type")
}
}
func (it *Comparison) Reset() {
it.subIt.Reset()
}