Skip to content
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

[Fix](Variant) fix variant with not null #32248

Merged
merged 2 commits into from
Mar 19, 2024
Merged

[Fix](Variant) fix variant with not null #32248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1f5f1d
[Fix](Variant) fix variant with not null
eldenmoon Mar 14, 2024
7cf5bb4
make it nullable where SlotReference was generated
eldenmoon Mar 15, 2024
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
6 changes: 2 additions & 4 deletions be/src/olap/rowset/segment_v2/column_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,8 +1504,7 @@ Status VariantRootColumnIterator::next_batch(size_t* n, vectorized::MutableColum
}
}
// fill nullmap
if (root_column->is_nullable()) {
DCHECK(dst->is_nullable());
if (root_column->is_nullable() && dst->is_nullable()) {
vectorized::ColumnUInt8& dst_null_map =
assert_cast<vectorized::ColumnNullable&>(*dst).get_null_map_column();
vectorized::ColumnUInt8& src_null_map =
Expand Down Expand Up @@ -1538,8 +1537,7 @@ Status VariantRootColumnIterator::read_by_rowids(const rowid_t* rowids, const si
}
}
// fill nullmap
if (root_column->is_nullable()) {
DCHECK(dst->is_nullable());
if (root_column->is_nullable() && dst->is_nullable()) {
vectorized::ColumnUInt8& dst_null_map =
assert_cast<vectorized::ColumnNullable&>(*dst).get_null_map_column();
vectorized::ColumnUInt8& src_null_map =
Expand Down
3 changes: 2 additions & 1 deletion ...apache/doris/nereids/trees/expressions/functions/scalar/PushDownToProjectionFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ public static Expression rewriteToSlot(PushDownToProjectionFunction pushedFuncti
// avoid duplicated slots
return targetColumnSlot;
}
boolean nullable = true; // always nullable at present
SlotReference slotRef = new SlotReference(StatementScopeIdGenerator.newExprId(),
topColumnSlot.getName(), topColumnSlot.getDataType(),
topColumnSlot.nullable(), topColumnSlot.getQualifier(), topColumnSlot.getTable().get(),
nullable, topColumnSlot.getQualifier(), topColumnSlot.getTable().get(),
topColumnSlot.getColumn().get(), Optional.of(topColumnSlot.getInternalName()),
fullPaths);
ctx.addPathSlotRef(topColumnSlot, fullPaths, slotRef, pushedFunction);
Expand Down
Loading
Loading