Skip to content

vam: implement complex value comparisons #6745

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

Merged
nwt merged 1 commit into from
Mar 19, 2026
+161 −2
Merged

vam: implement complex value comparisons #6745

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
2 changes: 2 additions & 0 deletions compiler/ztests/sql/having-this.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
spq: select count() from (values 1,2) having this={count:2}

vector: true

output: |
{count:2}
2 changes: 2 additions & 0 deletions compiler/ztests/this.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
spq: 'values {yodawg:this,b:this==this}'

vector: true

input: |
{a:1}

Expand Down
32 changes: 30 additions & 2 deletions runtime/vam/expr/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/brimdata/super"
"github.com/brimdata/super/runtime/sam/expr/coerce"
"github.com/brimdata/super/scode"
"github.com/brimdata/super/vector"
)

Expand Down Expand Up @@ -38,8 +39,8 @@ func (c *Compare) eval(vecs ...vector.Any) vector.Any {
rhs := vector.Under(vecs[1])
lhs, rhs, errVal := coerceVals(c.sctx, lhs, rhs)
if errVal != nil {
// if incompatible types return false
return vector.NewConstBool(false, vecs[0].Len())
// Incompatible types so return true for != and false otherwise.
return vector.NewConstBool(c.opCode == vector.CompNE, errVal.Len())
}
//XXX need to handle overflow (see sam)
kind := lhs.Kind()
Expand All @@ -53,6 +54,12 @@ func (c *Compare) eval(vecs ...vector.Any) vector.Any {
return c.compareNets(lhs, rhs)
case vector.KindType:
return c.compareTypeVals(lhs, rhs)
case vector.KindRecord,
vector.KindArray,
vector.KindSet,
vector.KindMap,
vector.KindEnum:
return c.compareComplex(lhs, rhs)
}
lform, ok := vector.FormOf(lhs)
if !ok {
Expand Down Expand Up @@ -138,6 +145,27 @@ func (c *Compare) compareTypeVals(lhs, rhs vector.Any) vector.Any {
return out
}

func (c *Compare) compareComplex(lhs, rhs vector.Any) vector.Any {
if c.opCode == vector.CompLT || c.opCode == vector.CompGT ||
lhs.Type().ID() != rhs.Type().ID() {
return vector.NewConstBool(false, lhs.Len())
}
var lb, rb scode.Builder
out := vector.NewFalse(lhs.Len())
for i := range lhs.Len() {
l := vector.ValueAt(&lb, lhs, i).Bytes()
r := vector.ValueAt(&rb, rhs, i).Bytes()
v := string(l) == string(r)
if c.opCode == vector.CompNE {
v = !v
}
if v {
out.Set(i)
}
}
return out
}

type isNull struct {
expr Evaluator
}
Expand Down
127 changes: 127 additions & 0 deletions runtime/ztests/expr/compare.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
spq: values [a==b, a!=b, a<b, a<=b, a>=b, a>b]

vector: true

input: |
{a:{aa:1},b:{aa:1}}
{a:{aa:1},b:{aa:2}}
{a:{aa:1},b:{aa:"1"}}
{a:{aa:1},b:{aa:null}}
{a:{aa:1},b:{aa:error(0)}}
{a:{aa:1},b:{bb:1}}
{a:{aa:1},b:1}
{a:{aa:1},b:null}
{a:{aa:1},b:error(0)}

output: |
[true,false,false,true,true,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[null,null,null,null,null,null]
[error(0),error(0),error(0),error(0),error(0),error(0)]

---

spq: values [a==b, a!=b, a<b, a<=b, a>=b, a>b]

vector: true

input: |
{a:[1],b:[1]}
{a:[1],b:[2]}
{a:[1],b:["2"]}
{a:[1],b:[null]}
{a:[1],b:[error(0)]}
{a:[1],b:1}
{a:[1],b:null}
{a:[1],b:error(0)}

output: |
[true,false,false,true,true,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[null,null,null,null,null,null]
[error(0),error(0),error(0),error(0),error(0),error(0)]

---

spq: values [a==b, a!=b, a<b, a<=b, a>=b, a>b]

vector: true

input: |
{a:|[1]|,b:|[1]|}
{a:|[1]|,b:|[2]|}
{a:|[1]|,b:|["2"]|}
{a:|[1]|,b:|[null]|}
{a:|[1]|,b:|[error(0)]|}
{a:[1],b:1}
{a:|[1]|,b:null}
{a:|[1]|,b:error(0)}

output: |
[true,false,false,true,true,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[null,null,null,null,null,null]
[error(0),error(0),error(0),error(0),error(0),error(0)]

---

spq: values [a==b, a!=b, a<b, a<=b, a>=b, a>b]

vector: true

input: |
{a:|{"aa":1}|,b:|{"aa":1}|}
{a:|{"aa":1}|,b:|{"aa":2}|}
{a:|{"aa":1}|,b:|{"aa":"2"}|}
{a:|{"aa":1}|,b:|{"aa":null}|}
{a:|{"aa":1}|,b:|{"aa":error(0)}|}
{a:|{"aa":1}|,b:|{"bb":1}|}
{a:|{"aa":1}|,b:1}
{a:|{"aa":1}|,b:null}
{a:|{"aa":1}|,b:error(0)}

output: |
[true,false,false,true,true,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[null,null,null,null,null,null]
[error(0),error(0),error(0),error(0),error(0),error(0)]

---

spq: values [a==b, a!=b, a<b, a<=b, a>=b, a>b]

vector: true

input: |
{a:"aa"::enum(aa,bb),b:"aa"::enum(aa,bb)}
{a:"aa"::enum(aa,bb),b:"bb"::enum(aa,bb)}
{a:"aa"::enum(aa,bb),b:"aa"::enum(aa,zz)}
{a:"aa"::enum(aa,bb),b:"aa"}
{a:"aa"::enum(aa,bb),b:null}
{a:"aa"::enum(aa,bb),b:error(0)}

output: |
[true,false,false,true,true,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[false,true,false,false,false,false]
[null,null,null,null,null,null]
[error(0),error(0),error(0),error(0),error(0),error(0)]
Loading