scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 10:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #640 from travisturner/backport-executeclearrow

Browse source 
safe cast of bool in executeClearRow
This commit is contained in:
Travis Turner 2020-08-04 17:18:33 -05:00 • committed by GitHub
commit 76dbedc082
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
executor.go
View file

@ -3074,11 +3074,18 @@ func (e *executor) executeClearRow(ctx context.Context, index string, c *pql.Cal
// Merge returned results at coordinating node.
reduceFn := func(ctx context.Context, prev, v interface{}) interface{} {
val := v.(bool)
if prev == nil {
val, ok := v.(bool)
if !ok {
return errors.Errorf("executeClearRow.reduceFn: val is non-bool (%+v)", v)
}
if prev == nil || val {
return val
}
return val || prev.(bool)
pval, ok := prev.(bool)
if !ok {
return errors.Errorf("executeClearRow.reduceFn: prev is non-bool (%+v)", prev)
}
return pval
}
result, err := e.mapReduce(ctx, index, shards, c, opt, mapFn, reduceFn)
@ -3166,7 +3173,7 @@ func (e *executor) executeSetRow(ctx context.Context, indexName string, c *pql.C
if !ok {
return errors.Errorf("executeSetRow.reduceFn: val is non-bool (%+v)", v)
}
if val {
if prev == nil || val {
return val
}