Skip to content

[Fix](inverted index) fix match null for inverted index #41746 #41787

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
airborne12 merged 1 commit into from
Oct 14, 2024
Merged

[Fix](inverted index) fix match null for inverted index #41746 #41787

Show file tree
Hide file tree
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
16 changes: 3 additions & 13 deletions be/src/vec/exprs/vmatch_predicate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,9 @@ Status VMatchPredicate::prepare(RuntimeState* state, const RowDescriptor& desc,
argument_template.emplace_back(nullptr, child->data_type(), child->expr_name());
child_expr_name.emplace_back(child->expr_name());
}
// result column always not null
if (_data_type->is_nullable()) {
_function = SimpleFunctionFactory::instance().get_function(
_fn.name.function_name, argument_template, remove_nullable(_data_type));
} else {
_function = SimpleFunctionFactory::instance().get_function(_fn.name.function_name,
argument_template, _data_type);
}

_function = SimpleFunctionFactory::instance().get_function(_fn.name.function_name,
argument_template, _data_type);
if (_function == nullptr) {
std::string type_str;
for (auto arg : argument_template) {
Expand Down Expand Up @@ -174,11 +169,6 @@ Status VMatchPredicate::execute(VExprContext* context, Block* block, int* result
RETURN_IF_ERROR(_function->execute(context->fn_context(_fn_context_index), *block, arguments,
num_columns_without_result, block->rows(), false));
*result_column_id = num_columns_without_result;
if (_data_type->is_nullable()) {
auto nested = block->get_by_position(num_columns_without_result).column;
auto nullable = ColumnNullable::create(nested, ColumnUInt8::create(block->rows(), 0));
block->replace_by_position(num_columns_without_result, nullable);
}
return Status::OK();
}

Expand Down
21 changes: 6 additions & 15 deletions be/src/vec/functions/match.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ Status FunctionMatchBase::evaluate_inverted_index(
std::shared_ptr<roaring::Roaring> roaring = std::make_shared<roaring::Roaring>();
Field param_value;
arguments[0].column->get(0, param_value);
if (param_value.is_null()) {
// if query value is null, skip evaluate inverted index
return Status::OK();
}
auto param_type = arguments[0].type->get_type_as_type_descriptor().type;
if (!is_string_type(param_type)) {
return Status::Error<ErrorCode::INVERTED_INDEX_INVALID_PARAMETERS>(
Expand Down Expand Up @@ -102,12 +106,7 @@ Status FunctionMatchBase::execute_impl(FunctionContext* context, Block& block,
const auto* values = check_and_get_column<ColumnString>(source_col.get());
const ColumnArray* array_col = nullptr;
if (source_col->is_column_array()) {
if (source_col->is_nullable()) {
auto* nullable = check_and_get_column<ColumnNullable>(source_col.get());
array_col = check_and_get_column<ColumnArray>(*nullable->get_nested_column_ptr());
} else {
array_col = check_and_get_column<ColumnArray>(source_col.get());
}
array_col = check_and_get_column<ColumnArray>(source_col.get());
if (array_col && !array_col->get_data().is_column_string()) {
return Status::NotSupported(
fmt::format("unsupported nested array of type {} for function {}",
Expand All @@ -127,15 +126,7 @@ Status FunctionMatchBase::execute_impl(FunctionContext* context, Block& block,
values = check_and_get_column<ColumnString>(*(array_col->get_data_ptr()));
}
} else if (auto* nullable = check_and_get_column<ColumnNullable>(source_col.get())) {
// match null
if (type_ptr->is_nullable()) {
if (column_ptr->only_null()) {
block.get_by_position(result).column = nullable->get_null_map_column_ptr();
return Status::OK();
}
} else {
values = check_and_get_column<ColumnString>(*nullable->get_nested_column_ptr());
}
values = check_and_get_column<ColumnString>(*nullable->get_nested_column_ptr());
}

if (!values) {
Expand Down
2 changes: 0 additions & 2 deletions be/src/vec/functions/match.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ const std::string MATCH_PHRASE_EDGE_FUNCTION = "match_phrase_edge";

class FunctionMatchBase : public IFunction {
public:
bool use_default_implementation_for_nulls() const override { return false; }

size_t get_number_of_arguments() const override { return 2; }

String get_name() const override { return "match"; }
Expand Down
4 changes: 3 additions & 1 deletion regression-test/data/inverted_index_p0/test_null_index.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
-- !sql --

-- !sql --
1 a \N [null] [1]

-- !sql --

-- !sql --

30 changes: 28 additions & 2 deletions regression-test/suites/inverted_index_p0/test_null_index.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ suite("test_null_index", "p0"){
`id` int(11) NOT NULL,
`str` string NOT NULL,
`str_null` string NULL,
`value` array<text> NOT NULL,
`value_int` array<int> NOT NULL
`value` array<text> NOT NULL,
`value_int` array<int> NOT NULL
) ENGINE=OLAP
DUPLICATE KEY(`id`)
COMMENT 'OLAP'
Expand All @@ -48,4 +48,30 @@ suite("test_null_index", "p0"){
sql "INSERT INTO $indexTblName VALUES (1, 'a', null, [null], [1]), (2, 'b', 'b', ['b'], [2]), (3, 'c', 'c', ['c'], [3]);"
qt_sql "SELECT * FROM $indexTblName WHERE str match null order by id;"
qt_sql "SELECT * FROM $indexTblName WHERE str_null match null order by id;"

def indexTblName2 = "with_index_test"

sql "DROP TABLE IF EXISTS ${indexTblName2}"
// create 1 replica table
sql """
CREATE TABLE IF NOT EXISTS ${indexTblName2}(
`id` int(11) NOT NULL,
`str` string NOT NULL,
`str_null` string NULL,
`value` array<text> NOT NULL,
`value_int` array<int> NOT NULL,
INDEX str_idx(`str`) USING INVERTED,
INDEX str_null_idx(`str_null`) USING INVERTED
) ENGINE=OLAP
DUPLICATE KEY(`id`)
COMMENT 'OLAP'
DISTRIBUTED BY HASH(`id`) BUCKETS 1
PROPERTIES(
"replication_allocation" = "tag.location.default: 1"
);
"""
sql """ set enable_common_expr_pushdown = true """
sql "INSERT INTO $indexTblName2 VALUES (1, 'a', null, [null], [1]), (2, 'b', 'b', ['b'], [2]), (3, 'c', 'c', ['c'], [3]);"
qt_sql "SELECT * FROM $indexTblName2 WHERE str match null order by id;"
qt_sql "SELECT * FROM $indexTblName2 WHERE str_null match null order by id;"
}