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

ignore null bitmap for not null and make subcolumn access slots always nullable
apache · Mar 19, 2024 · 3d4af5c · 3d4af5c
1 parent af4b422
commit 3d4af5c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/be/src/olap/rowset/segment_v2/column_reader.cpp b/be/src/olap/rowset/segment_v2/column_reader.cpp
@@ -1508,8 +1508,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 =
@@ -1542,8 +1541,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 =

diff --git a/...apache/doris/nereids/trees/expressions/functions/scalar/PushDownToProjectionFunction.java b/...apache/doris/nereids/trees/expressions/functions/scalar/PushDownToProjectionFunction.java
@@ -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);