Skip to content

Commit 77a59cb

Browse files
committed
[fix](be) Revert misplaced VARBINARY filter change
### What problem does this PR solve? Issue Number: None Related PR: #65498 Problem Summary: The VARBINARY external-reader filter fix and its unit test were committed to this PR by mistake. Restore the two affected files to their state before the misplaced commits so this PR contains only its intended changes. ### Release note None ### Check List (For Author) - Test: No need to test (the commit only restores the exact pre-change file contents) - Behavior changed: No - Does this need documentation: No
1 parent 5b3c674 commit 77a59cb

2 files changed

Lines changed: 2 additions & 43 deletions

File tree

‎be/src/format_v2/column_mapper.cpp‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -990,18 +990,6 @@ static bool mapping_can_use_file_column_directly(const ColumnMapping& mapping) {
990990
return !needs_complex_rematerialize(mapping);
991991
}
992992

993-
static FilterConversionType direct_filter_conversion(const ColumnMapping& mapping) {
994-
DORIS_CHECK(mapping.table_type != nullptr);
995-
// FileScanOperator deliberately keeps VARBINARY predicates above external readers. Their
996-
// physical binary representations are not uniformly supported by reader-side expression and
997-
// metadata filtering, so localizing a late runtime filter here can incorrectly reject rows.
998-
if (remove_nullable(mapping.table_type)->get_primitive_type() == TYPE_VARBINARY) {
999-
return FilterConversionType::FINALIZE_ONLY;
1000-
}
1001-
return mapping.is_trivial ? FilterConversionType::COPY_DIRECTLY
1002-
: FilterConversionType::CAST_FILTER;
1003-
}
1004-
1005993
static const ColumnDefinition* find_file_child_for_mapping(const ColumnDefinition& table_child,
1006994
const ColumnDefinition& file_parent,
1007995
TableColumnMappingMode mode,
@@ -1882,7 +1870,8 @@ Status TableColumnMapper::_create_direct_mapping(const ColumnDefinition& table_c
18821870
mapping->projected_file_children = file_field.children;
18831871
mapping->file_type = file_field.type;
18841872
mapping->is_trivial = mapping_can_use_file_column_directly(*mapping);
1885-
mapping->filter_conversion = direct_filter_conversion(*mapping);
1873+
mapping->filter_conversion = mapping->is_trivial ? FilterConversionType::COPY_DIRECTLY
1874+
: FilterConversionType::CAST_FILTER;
18861875
mapping->child_mappings.clear();
18871876

18881877
auto table_children = table_column.children;

‎be/test/format_v2/column_mapper_test.cpp‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "core/data_type/data_type_string.h"
3838
#include "core/data_type/data_type_struct.h"
3939
#include "core/data_type/data_type_timestamptz.h"
40-
#include "core/data_type/data_type_varbinary.h"
4140
#include "exprs/vexpr.h"
4241
#include "exprs/vexpr_context.h"
4342
#include "exprs/vin_predicate.h"
@@ -79,10 +78,6 @@ DataTypePtr str() {
7978
return std::make_shared<DataTypeString>();
8079
}
8180

82-
DataTypePtr varbinary() {
83-
return std::make_shared<DataTypeVarbinary>();
84-
}
85-
8681
DataTypePtr timestamptz(uint32_t scale) {
8782
return std::make_shared<DataTypeTimeStampTz>(scale);
8883
}
@@ -2162,31 +2157,6 @@ TEST(ColumnMapperLocalizeFiltersTest, VisibleLocalFilterAddsPredicateColumnAndCo
21622157
EXPECT_TRUE(localized_slot->data_type()->equals(*int_type));
21632158
}
21642159

2165-
TEST(ColumnMapperLocalizeFiltersTest, VarbinaryFilterStaysAboveFileReader) {
2166-
const auto binary_type = varbinary();
2167-
const auto table_column = name_col("partition_key", binary_type);
2168-
const auto file_column = name_col("partition_key", binary_type, 7);
2169-
2170-
TableColumnMapper mapper({.mode = TableColumnMappingMode::BY_NAME});
2171-
ASSERT_TRUE(mapper.create_mapping({table_column}, {}, {file_column}).ok());
2172-
ASSERT_EQ(mapper.mappings().size(), 1);
2173-
EXPECT_TRUE(mapper.mappings()[0].is_trivial);
2174-
EXPECT_EQ(mapper.mappings()[0].filter_conversion, FilterConversionType::FINALIZE_ONLY);
2175-
2176-
const auto value = Field::create_field<TYPE_VARBINARY>(StringView("binary-value"));
2177-
TableFilter filter {.conjunct = VExprContext::create_shared(binary_predicate(
2178-
TExprOpcode::EQ, table_slot(0, 0, binary_type, "partition_key"),
2179-
literal(binary_type, value))),
2180-
.global_indices = {GlobalIndex(0)}};
2181-
2182-
FileScanRequest request;
2183-
ASSERT_TRUE(mapper.create_scan_request({filter}, {table_column}, &request).ok());
2184-
EXPECT_TRUE(request.predicate_columns.empty());
2185-
ASSERT_EQ(request.non_predicate_columns.size(), 1);
2186-
EXPECT_EQ(request.non_predicate_columns[0].column_id(), LocalColumnId(7));
2187-
EXPECT_TRUE(request.conjuncts.empty());
2188-
}
2189-
21902160
TEST(ColumnMapperLocalizeFiltersTest, ConstantFilterBuildsEntryWithoutFileScanColumn) {
21912161
auto partition_column = name_col("part", i32());
21922162
partition_column.is_partition_key = true;

0 commit comments

Comments
 (0)