Skip to content

fix null join key handling in hash join #7238

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
Aug 26, 2026
Merged

fix null join key handling in hash join #7238

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
19 changes: 13 additions & 6 deletions runtime/vam/op/hashjoin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,12 @@ func (j *hashJoin) probeLeft() (vector.Any, error) {
if keyVal.IsMissing() {
continue
}
key := hashKey(keyVal)
var rightVals []super.Value
var ok bool
if !keyVal.IsNull() {
rightVals, ok = j.table[hashKey(keyVal)]
}
leftVal := vector.ValueAt(&sb, vec, i)
rightVals, ok := j.table[key]
if !ok {
if j.style != "inner" {
b.Write(j.wrap(leftVal.Ptr(), nil))
Expand Down Expand Up @@ -235,10 +238,14 @@ func (j *hashJoin) probeRight() (vector.Any, error) {
if keyVal.IsMissing() {
continue
}
key := hashKey(keyVal)
leftVals, ok := j.table[key]
if ok {
j.hits[key] = true
var leftVals []super.Value
if !keyVal.IsNull() {
key := hashKey(keyVal)
var ok bool
leftVals, ok = j.table[key]
if ok {
j.hits[key] = true
}
}
if j.style == "anti" {
continue
Expand Down
4 changes: 1 addition & 3 deletions runtime/ztests/op/join-first-key-is-null.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ spq: |
| join using (a)
| values left

input: &input |
input: |
{a:null}

output: *input
21 changes: 21 additions & 0 deletions runtime/ztests/op/join-kinds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ inputs:
{a:40,sa:"a3"}
{a:45,sa:"a5"}
{a:50,sa:"a4"}
{a:null,sa:"anull"}
{anti_a:"Anti hash join output must not contain this record."}
- name: B.sup
data: |
Expand All @@ -38,6 +39,7 @@ inputs:
{b:40,sb:"b40"}
{b:40,sb:"b40.2"}
{b:60,sb:"b60"}
{b:null,sb:"bnull"}
- name: C.sup
data: |
{c:15,sc:"c8"}
Expand All @@ -46,6 +48,7 @@ inputs:
{c:30,sc:"c2"}
{c:35,sc:"c6"}
{c:40,sc:"c3"}
{c:null,sc:"cnull"}

outputs:
- name: stdout
Expand All @@ -58,10 +61,12 @@ outputs:
{a:35,sa:"a6"}
{a:45,sa:"a5"}
{a:50,sa:"a4"}
{a:null,sa:"anull"}
=== anti nested loop
{a:10,sa:"a0"}
{a:15,sa:"a8"}
{a:20,sa:"a1"}
{a:null,sa:"anull"}
{anti_a:"Anti hash join output must not contain this record."}
=== left hash
{a:10,sa:"a0",hit:error("missing")}
Expand All @@ -75,6 +80,7 @@ outputs:
{a:40,sa:"a3",hit:"b40.2"}
{a:45,sa:"a5",hit:error("missing")}
{a:50,sa:"a4",hit:error("missing")}
{a:null,sa:"anull",hit:error("missing")}
=== left nested loop
{a:10,sa:"a0",hit:error("missing")}
{a:15,sa:"a8",hit:error("missing")}
Expand All @@ -95,6 +101,7 @@ outputs:
{a:50,sa:"a4",hit:"b20.2"}
{a:50,sa:"a4",hit:"b40"}
{a:50,sa:"a4",hit:"b40.2"}
{a:null,sa:"anull",hit:error("missing")}
{anti_a:"Anti hash join output must not contain this record.",hit:error("missing")}
=== inner hash
{a:20,sa:"a1",hit:"b20.1"}
Expand Down Expand Up @@ -127,6 +134,7 @@ outputs:
{c:35,sc:"c6",hit:error("missing")}
{c:40,sc:"c3",hit:"b40"}
{c:40,sc:"c3",hit:"b40.2"}
{c:null,sc:"cnull",hit:error("missing")}
=== right nested loop
{c:15,sc:"c8",hit:error("missing")}
{c:20,sc:"c1",hit:error("missing")}
Expand All @@ -138,34 +146,47 @@ outputs:
{c:35,sc:"c6",hit:"b20.2"}
{c:40,sc:"c3",hit:"b20.1"}
{c:40,sc:"c3",hit:"b20.2"}
{c:null,sc:"cnull",hit:error("missing")}
=== cross
{b:20,sb:"b20.1",c:15,sc:"c8"}
{b:20,sb:"b20.1",c:20,sc:"c1"}
{b:20,sb:"b20.1",c:25,sc:"c7"}
{b:20,sb:"b20.1",c:30,sc:"c2"}
{b:20,sb:"b20.1",c:35,sc:"c6"}
{b:20,sb:"b20.1",c:40,sc:"c3"}
{b:20,sb:"b20.1",c:null,sc:"cnull"}
{b:20,sb:"b20.2",c:15,sc:"c8"}
{b:20,sb:"b20.2",c:20,sc:"c1"}
{b:20,sb:"b20.2",c:25,sc:"c7"}
{b:20,sb:"b20.2",c:30,sc:"c2"}
{b:20,sb:"b20.2",c:35,sc:"c6"}
{b:20,sb:"b20.2",c:40,sc:"c3"}
{b:20,sb:"b20.2",c:null,sc:"cnull"}
{b:40,sb:"b40",c:15,sc:"c8"}
{b:40,sb:"b40",c:20,sc:"c1"}
{b:40,sb:"b40",c:25,sc:"c7"}
{b:40,sb:"b40",c:30,sc:"c2"}
{b:40,sb:"b40",c:35,sc:"c6"}
{b:40,sb:"b40",c:40,sc:"c3"}
{b:40,sb:"b40",c:null,sc:"cnull"}
{b:40,sb:"b40.2",c:15,sc:"c8"}
{b:40,sb:"b40.2",c:20,sc:"c1"}
{b:40,sb:"b40.2",c:25,sc:"c7"}
{b:40,sb:"b40.2",c:30,sc:"c2"}
{b:40,sb:"b40.2",c:35,sc:"c6"}
{b:40,sb:"b40.2",c:40,sc:"c3"}
{b:40,sb:"b40.2",c:null,sc:"cnull"}
{b:60,sb:"b60",c:15,sc:"c8"}
{b:60,sb:"b60",c:20,sc:"c1"}
{b:60,sb:"b60",c:25,sc:"c7"}
{b:60,sb:"b60",c:30,sc:"c2"}
{b:60,sb:"b60",c:35,sc:"c6"}
{b:60,sb:"b60",c:40,sc:"c3"}
{b:60,sb:"b60",c:null,sc:"cnull"}
{b:null,sb:"bnull",c:15,sc:"c8"}
{b:null,sb:"bnull",c:20,sc:"c1"}
{b:null,sb:"bnull",c:25,sc:"c7"}
{b:null,sb:"bnull",c:30,sc:"c2"}
{b:null,sb:"bnull",c:35,sc:"c6"}
{b:null,sb:"bnull",c:40,sc:"c3"}
{b:null,sb:"bnull",c:null,sc:"cnull"}
Loading