Skip to content

fix(vm): treat a present-but-empty collection as not EXISTS #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sumankarki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(vm): treat a present-but-empty collection as not EXISTS #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions vm/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,14 @@ func walkUnary(ctx expr.EvalContext, includer expr.Includer, node *expr.UnaryNod
switch a.(type) {
case nil, value.NilValue:
return value.NewBoolValue(false), true
// A present-but-empty collection does not "exist": an empty list/map
// carries no value, so EXISTS is false (matches Elasticsearch, which
// does not index empty arrays). Scalars (incl. empty string) are left
// as present.
case value.StringsValue, value.SliceValue, value.ByteSliceValue,
value.MapValue, value.MapStringValue, value.MapIntValue,
value.MapNumberValue, value.MapTimeValue, value.MapBoolValue:
return value.NewBoolValue(!a.Nil()), true
}
return value.NewBoolValue(true), true
default:
Expand Down
34 changes: 23 additions & 11 deletions vm/vm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,19 @@ var (
// and be available to the VM runtime for evaluation by using
// key's such as "int5" or "user_id"
msgContext = datasource.NewContextMap(map[string]any{
"int5": value.NewIntValue(5),
"str5": value.NewStringValue("5"),
"created": value.NewTimeValue(tcreated),
"bvalt": value.NewBoolValue(true),
"bvalf": value.NewBoolValue(false),
"user_id": value.NewStringValue("abc"),
"urls": value.NewStringsValue([]string{"abc", "123"}),
"hits": value.NewMapIntValue(map[string]int64{"google.com": 5, "bing.com": 1}),
"email": value.NewStringValue("bob@bob.com"),
"empty_str": value.NewStringValue(""),
"mt": value.NewMapTimeValue(map[string]time.Time{"event0": t0, "event1": t1}),
"int5": value.NewIntValue(5),
"str5": value.NewStringValue("5"),
"created": value.NewTimeValue(tcreated),
"bvalt": value.NewBoolValue(true),
"bvalf": value.NewBoolValue(false),
"user_id": value.NewStringValue("abc"),
"urls": value.NewStringsValue([]string{"abc", "123"}),
"hits": value.NewMapIntValue(map[string]int64{"google.com": 5, "bing.com": 1}),
"email": value.NewStringValue("bob@bob.com"),
"empty_str": value.NewStringValue(""),
"empty_strs": value.NewStringsValue([]string{}),
"empty_map": value.NewMapIntValue(map[string]int64{}),
"mt": value.NewMapTimeValue(map[string]time.Time{"event0": t0, "event1": t1}),
}, true)

// list of tests
Expand Down Expand Up @@ -231,6 +233,16 @@ var (
vmt(`EXISTS bvalf`, true, noError),
vmt(`EXISTS toint(not_a_field)`, false, noError),

// A present-but-empty collection does not exist; a populated one does.
vmt(`EXISTS urls`, true, noError),
vmt(`EXISTS empty_strs`, false, noError),
vmt(`NOT EXISTS empty_strs`, true, noError),
vmt(`EXISTS hits`, true, noError),
vmt(`EXISTS empty_map`, false, noError),
vmt(`NOT EXISTS empty_map`, true, noError),
// Scalars are unaffected: an empty string is still present.
vmt(`EXISTS empty_str`, true, noError),

// TODO: support () wrapping parts of binary expression
vmt(`6 == (5 + 1)`, true, noError),
// TODO: urnary
Expand Down
Loading