Skip to content

fix: preserve varlena result cardinality for null rows #26877

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
XuPeng-SH merged 6 commits into from
Aug 10, 2026
Merged

fix: preserve varlena result cardinality for null rows #26877

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa5b050
fix: preserve varlena result cardinality for null rows
XuPeng-SH Aug 9, 2026
795f395
test(function): cover varlena null cardinality branches
XuPeng-SH Aug 9, 2026
ccf47f7
fix(function): close varlena cardinality gaps
XuPeng-SH Aug 9, 2026
5981a7d
fix(function): harden varlena producer boundaries
XuPeng-SH Aug 10, 2026
6e2be51
fix(function): share repeated varlena payloads
XuPeng-SH Aug 10, 2026
42aaf14
fix(function): preserve wasm setup errors
XuPeng-SH Aug 10, 2026
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
63 changes: 36 additions & 27 deletions pkg/sql/plan/function/baseTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ func opBinaryStrFixedToStrWithErrorCheck[

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -1073,7 +1073,7 @@ func opBinaryStrFixedToStrWithErrorCheck[
v2, null2 := p2.GetValue(0)
ifNull := null1 || null2
if ifNull {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
r, err := resultFn(functionUtil.QuickBytesToStr(v1), v2)
if err != nil {
Expand All @@ -1092,14 +1092,17 @@ func opBinaryStrFixedToStrWithErrorCheck[
if c1 {
v1, null1 := p1.GetStrValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
if p2.WithAnyNullValue() || rsAnyNull {
nulls.Or(rsNull, parameters[1].GetNulls(), rsNull)
rowCount := uint64(length)
rv1 := functionUtil.QuickBytesToStr(v1)
for i := uint64(0); i < rowCount; i++ {
if rsNull.Contains(i) {
if err := rs.AppendMustNullForBytesResult(); err != nil {
return err
}
continue
}
v2, _ := p2.GetValue(i)
Expand Down Expand Up @@ -1132,13 +1135,16 @@ func opBinaryStrFixedToStrWithErrorCheck[
if c2 {
v2, null2 := p2.GetValue(0)
if null2 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
if p1.WithAnyNullValue() || rsAnyNull {
nulls.Or(rsNull, parameters[0].GetNulls(), rsNull)
rowCount := uint64(length)
for i := uint64(0); i < rowCount; i++ {
if rsNull.Contains(i) {
if err := rs.AppendMustNullForBytesResult(); err != nil {
return err
}
continue
}
v1, _ := p1.GetStrValue(i)
Expand Down Expand Up @@ -1174,6 +1180,9 @@ func opBinaryStrFixedToStrWithErrorCheck[
rowCount := uint64(length)
for i := uint64(0); i < rowCount; i++ {
if rsNull.Contains(i) {
if err := rs.AppendMustNullForBytesResult(); err != nil {
return err
}
continue
}
v1, _ := p1.GetStrValue(i)
Expand Down Expand Up @@ -2107,7 +2116,7 @@ func opBinaryBytesBytesToBytesWithErrorCheck(

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -2124,7 +2133,7 @@ func opBinaryBytesBytesToBytesWithErrorCheck(
v2, null2 := p2.GetStrValue(0)
ifNull := null1 || null2
if ifNull {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
r, err := fn(v1, v2)
if err != nil {
Expand All @@ -2143,7 +2152,7 @@ func opBinaryBytesBytesToBytesWithErrorCheck(
if c1 {
v1, null1 := p1.GetStrValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
if p2.WithAnyNullValue() || rsAnyNull {
nulls.Or(rsNull, parameters[1].GetNulls(), rsNull)
Expand Down Expand Up @@ -2187,7 +2196,7 @@ func opBinaryBytesBytesToBytesWithErrorCheck(
if c2 {
v2, null2 := p2.GetStrValue(0)
if null2 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
if p1.WithAnyNullValue() || rsAnyNull {
nulls.Or(rsNull, parameters[0].GetNulls(), rsNull)
Expand Down Expand Up @@ -2784,7 +2793,7 @@ func opUnaryBytesToBytes(

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -2799,7 +2808,7 @@ func opUnaryBytesToBytes(
if c1 {
v1, null1 := p1.GetStrValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
r := resultFn(v1)

Expand Down Expand Up @@ -2858,7 +2867,7 @@ func opUnaryBytesToStr(

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -2873,7 +2882,7 @@ func opUnaryBytesToStr(
if c1 {
v1, null1 := p1.GetStrValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
r := resultFn(v1)

Expand Down Expand Up @@ -2932,7 +2941,7 @@ func opUnaryStrToStr(

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -2947,7 +2956,7 @@ func opUnaryStrToStr(
if c1 {
v1, null1 := p1.GetStrValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
r := resultFn(functionUtil.QuickBytesToStr(v1))

Expand Down Expand Up @@ -3006,7 +3015,7 @@ func opUnaryFixedToStr[

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -3021,7 +3030,7 @@ func opUnaryFixedToStr[
if c1 {
v1, null1 := p1.GetValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
rb := resultFn(v1)
r := functionUtil.QuickStrToBytes(rb)
Expand Down Expand Up @@ -3146,7 +3155,7 @@ func opUnaryFixedToStrWithErrorCheck[

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -3161,7 +3170,7 @@ func opUnaryFixedToStrWithErrorCheck[
if c1 {
v1, null1 := p1.GetValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
rb, err := resultFn(v1)
if err != nil {
Expand Down Expand Up @@ -3232,7 +3241,7 @@ func opUnaryStrToBytesWithErrorCheck(

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -3247,7 +3256,7 @@ func opUnaryStrToBytesWithErrorCheck(
if c1 {
v1, null1 := p1.GetStrValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
r, err := resultFn(functionUtil.QuickBytesToStr(v1))
if err != nil {
Expand Down Expand Up @@ -3315,7 +3324,7 @@ func opUnaryBytesToBytesWithErrorCheck(

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -3330,7 +3339,7 @@ func opUnaryBytesToBytesWithErrorCheck(
if c1 {
v1, null1 := p1.GetStrValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
r, err := resultFn(v1)
if err != nil {
Expand Down Expand Up @@ -3398,7 +3407,7 @@ func opUnaryBytesToBytesWithNullOnError(

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -3413,11 +3422,11 @@ func opUnaryBytesToBytesWithNullOnError(
if c1 {
v1, null1 := p1.GetStrValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
r, err := resultFn(v1)
if err != nil {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
rowCount := uint64(length)
for i := uint64(0); i < rowCount; i++ {
Expand Down Expand Up @@ -3487,7 +3496,7 @@ func opUnaryBytesToStrWithErrorCheck(

if selectList != nil {
if selectList.IgnoreAllRow() {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
return nil
}
if !selectList.ShouldEvalAllRow() {
Expand All @@ -3502,7 +3511,7 @@ func opUnaryBytesToStrWithErrorCheck(
if c1 {
v1, null1 := p1.GetStrValue(0)
if null1 {
nulls.AddRange(rsNull, 0, uint64(length))
rs.SetNullResult(uint64(length))
} else {
rb, err := resultFn(v1)
if err != nil {
Expand Down
Loading
Loading