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

change test arguments to be appropriate

Browse source
This commit is contained in:
Maxton Huff 2021-02-26 12:58:59 -06:00
parent 6f76767841
commit 8bc8368c57
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pql/ast.go
View file

@ -63,7 +63,11 @@ func (q *Query) lastCallStackElem() *callStackElem {
}
func (q *Query) addPosNum(key, value string) {
q.addField(key)
if key == "field" {
q.addField("_field")
} else {
q.addField(key)
}
q.addNumVal(value)
}
@ -431,8 +435,13 @@ var callInfoByFunc = map[string]callInfo{
},
},
// things that take _field
"TopN": allowUnderField,
"TopN": {
allowUnknown: true,
prototypes: map[string]interface{}{
"_field": "",
"field": "",
},
},
// special cases:
"Clear": {
allowUnknown: true,

14
pql/pqlpeg_test.go
View file

@ -427,12 +427,12 @@ func TestPQLDeepEquality(t *testing.T) {
}},
{
name: "TopK",
call: "TopK(myfield, Row(), a=7)",
call: "TopK(myfield, Row()), k=7",
exp: &Call{
Name: "TopK",
Args: map[string]interface{}{
"a": int64(7),
"_field": "myfield",
"k": int64(7),
},
Children: []*Call{
{Name: "Row"},
@ -440,12 +440,12 @@ func TestPQLDeepEquality(t *testing.T) {
}},
{
name: "TopKWithField=",
call: "TopK(field=myfield, Row(), a=7)",
call: "TopK(field=myfield, Row(), k=7)",
exp: &Call{
Name: "TopK",
Args: map[string]interface{}{
"a": int64(7),
"_field": "myfield",
"k": int64(7),
},
Children: []*Call{
{Name: "Row"},
@ -453,24 +453,22 @@ func TestPQLDeepEquality(t *testing.T) {
}},
{
name: "Rows",
call: "Rows(myfield, 9, z=4)",
call: "Rows(myfield, z=4)",
exp: &Call{
Name: "Rows",
Args: map[string]interface{}{
"z": int64(4),
"_field": "myfield",
"_row": int64(9),
},
}},
{
name: "RowsWithField=",
call: "Rows(field=myfield, 9, z=4)",
call: "Rows(field=myfield, z=4)",
exp: &Call{
Name: "Rows",
Args: map[string]interface{}{
"z": int64(4),
"_field": "myfield",
"_row": int64(9),
},
}},
{