scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-06 19:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #543 from travisturner/foreign-index-todos

Browse source 
Get ForeignIndex keys in GroupBy
This commit is contained in:
Travis Turner 2020-07-11 19:45:31 -05:00 • committed by GitHub
commit 3c619fa2ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 78 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
executor.go
View file

@ -4299,7 +4299,12 @@ func (e *executor) translateCall(ctx context.Context, indexName string, c *pql.C
fields := make([]*Field, len(c.Children))
for i, child := range c.Children {
fieldname := callArgString(child, "_field")
var fieldname string
if fieldname = callArgString(child, "_field"); fieldname == "" {
// TODO: it's unsettling that we expect "_field" but in some
// cases get "field". We should figure out why that happens.
fieldname = callArgString(child, "field")
}
field := idx.Field(fieldname)
if field == nil {
return errors.Wrapf(ErrFieldNotFound, "getting field '%s' from '%s'", fieldname, child)
@ -4314,10 +4319,21 @@ func (e *executor) translateCall(ctx context.Context, indexName string, c *pql.C
if !ok {
return errors.New("prev value must be a string when field 'keys' option enabled")
}
// TODO: does this need to take field.ForeignIndex() into consideration?
id, err := e.Cluster.translateFieldKey(ctx, field, prevStr)
if err != nil {
return errors.Wrapf(err, "translating field key: %s", prevStr)
var id uint64
var err error
if fi := field.ForeignIndex(); fi != "" {
ids, err := e.Cluster.translateIndexKeys(ctx, fi, []string{prevStr})
if err != nil {
return errors.Wrap(err, "translating foreign index key in groupby previous")
}
if len(ids) == 1 {
id = ids[0]
}
} else {
id, err = e.Cluster.translateFieldKey(ctx, field, prevStr)
if err != nil {
return errors.Wrapf(err, "translating field key: %s", prevStr)
}
}
previous[i] = id
} else {
@ -4350,7 +4366,7 @@ func (e *executor) translateResults(ctx context.Context, index string, idx *Inde
}
for i := range results {
results[i], err = e.translateResult(index, idx, calls[i], results[i], idMap)
results[i], err = e.translateResult(ctx, index, idx, calls[i], results[i], idMap)
if err != nil {
return err
}
@ -4374,7 +4390,7 @@ func (e *executor) collectResultIDs(index string, idx *Index, call *pql.Call, re
return nil
}
func (e *executor) translateResult(index string, idx *Index, call *pql.Call, result interface{}, idSet map[uint64]string) (interface{}, error) {
func (e *executor) translateResult(ctx context.Context, index string, idx *Index, call *pql.Call, result interface{}, idSet map[uint64]string) (interface{}, error) {
switch result := result.(type) {
case *Row:
if idx.Keys() {
@ -4481,10 +4497,23 @@ func (e *executor) translateResult(index string, idx *Index, call *pql.Call, res
return nil, ErrFieldNotFound
}
if field.Keys() {
// TODO: does this need to take field.ForeignIndex() into consideration?
key, err := field.TranslateStore().TranslateID(g.RowID)
if err != nil {
return nil, errors.Wrap(err, "translating row ID in Group")
var key string
var err error
if fi := field.ForeignIndex(); fi != "" && g.Value != nil {
val := uint64(*g.Value) // not worried about overflow here because it's a foreign key
keys, err := e.Cluster.translateIndexIDs(ctx, fi, []uint64{val})
if err != nil {
return nil, errors.Wrap(err, "translating foreign index in Group")
}
if len(keys) == 1 {
key = keys[0]
group[i].Value = nil // Remove value now that it has been translated.
}
} else {
key, err = field.TranslateStore().TranslateID(g.RowID)
if err != nil {
return nil, errors.Wrap(err, "translating row ID in Group")
}
}
group[i].RowKey = key
}

39
executor_test.go
View file

@ -4743,7 +4743,7 @@ func TestExecutor_Execute_Rows_Keys(t *testing.T) {
exp: []string{},
},
{
q: `Rows(f, like="__")`,
q: `Rows(f, like="__")`,
exp: []string{"10", "11", "12", "13", "14", "15", "16", "17", "18"},
},
}
@ -5189,6 +5189,43 @@ func TestExecutor_Execute_GroupBy(t *testing.T) {
})
// Foreign Index
c.CreateField(t, "fip", pilosa.IndexOptions{Keys: true}, "parent")
c.CreateField(t, "fic", pilosa.IndexOptions{}, "child",
pilosa.OptFieldTypeInt(0, math.MaxInt64),
pilosa.OptFieldForeignIndex("fip"),
)
// Set data on the parent so we have some index keys.
c.Query(t, "fip", `
Set("one", parent=1)
Set("two", parent=2)
Set("three", parent=3)
Set("four", parent=4)
Set("five", parent=5)
`)
// Set data on the child to align with the foreign index keys.
c.Query(t, "fic", `
Set(1, child="one")
Set(2, child="one")
Set(3, child="one")
Set(4, child="three")
Set(5, child="three")
Set(6, child="five")
`)
t.Run("test foreign index with keys", func(t *testing.T) {
// the execututor returns row IDs when the field has keys, so they should be included in the target.
// because the order is determined by the partitioned index key, they seem out of order.
expected := []pilosa.GroupCount{
{Group: []pilosa.FieldRow{{Field: "child", RowID: 0, RowKey: "one"}}, Count: 3},
{Group: []pilosa.FieldRow{{Field: "child", RowID: 1, RowKey: "five"}}, Count: 1},
{Group: []pilosa.FieldRow{{Field: "child", RowID: 2, RowKey: "three"}}, Count: 2},
}
results := c.Query(t, "fic", `GroupBy(Rows(child))`).Results[0].([]pilosa.GroupCount)
test.CheckGroupBy(t, expected, results)
})
}
for size := range []int{1, 3} {
t.Run(fmt.Sprintf("%d_nodes", size), func(t *testing.T) {