Skip to content

runtime/vam/op: handle error in HashJoin.buildTable #7244

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
+7 −8
Merged

runtime/vam/op: handle error in HashJoin.buildTable #7244

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
15 changes: 7 additions & 8 deletions runtime/vam/op/hashjoin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ func (h *HashJoin) tableInit() error {
var table map[string][]super.Value
var left, right vio.Puller
if rightBuf.EOS {
table = buildTable(rightBuf, h.rightKey)
table, err = buildTable(rightBuf, h.rightKey)
left = leftBuf
} else {
table = buildTable(leftBuf, h.leftKey)
table, err = buildTable(leftBuf, h.leftKey)
right = rightBuf
}
h.hashJoin = &hashJoin{
Expand All @@ -97,16 +97,16 @@ func (h *HashJoin) tableInit() error {
rightKey: h.rightKey,
hits: make(map[string]bool),
}
return nil
return err
}

func buildTable(p vio.Puller, key expr.Evaluator) map[string][]super.Value {
func buildTable(p vio.Puller, key expr.Evaluator) (map[string][]super.Value, error) {
var sb scode.Builder
table := map[string][]super.Value{}
for {
vec, _ := p.Pull(false)
if vec == nil {
break
vec, err := p.Pull(false)
if vec == nil || err != nil {
return table, err
}
rightKeyVec := key.Eval(vec)
for i := range vec.Len() {
Expand All @@ -118,7 +118,6 @@ func buildTable(p vio.Puller, key expr.Evaluator) map[string][]super.Value {
table[key] = append(table[key], vector.ValueAt(&sb, vec, i).Copy())
}
}
return table
}

// pullRace pulls from a and b concurrently until one reaches EOS. It returns
Expand Down
Loading