This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new d047f23ba24 branch-3.0: [fix](inverted index) Fix Null Pointer
Exception in function match #45456 (#45499)
d047f23ba24 is described below
commit d047f23ba24066ae29abafe27e323b3fd10b8ef2
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Dec 20 09:00:42 2024 +0800
branch-3.0: [fix](inverted index) Fix Null Pointer Exception in function
match #45456 (#45499)
Cherry-picked from #45456
Co-authored-by: zzzxl <yangs...@selectdb.com>
---
be/src/vec/functions/match.cpp | 3 ++
be/test/vec/function/function_match_test.cpp | 58 ++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/be/src/vec/functions/match.cpp b/be/src/vec/functions/match.cpp
index 5b74c3b9c18..2cda491cb64 100644
--- a/be/src/vec/functions/match.cpp
+++ b/be/src/vec/functions/match.cpp
@@ -172,6 +172,9 @@ std::vector<std::string>
FunctionMatchBase::analyse_query_str_token(
VLOG_DEBUG << "begin to run " << get_name() << ", parser_type: "
<<
inverted_index_parser_type_to_string(inverted_index_ctx->parser_type);
std::vector<std::string> query_tokens;
+ if (inverted_index_ctx == nullptr) {
+ return query_tokens;
+ }
if (inverted_index_ctx->parser_type ==
InvertedIndexParserType::PARSER_NONE) {
query_tokens.emplace_back(match_query_str);
return query_tokens;
diff --git a/be/test/vec/function/function_match_test.cpp
b/be/test/vec/function/function_match_test.cpp
new file mode 100644
index 00000000000..6d95a463288
--- /dev/null
+++ b/be/test/vec/function/function_match_test.cpp
@@ -0,0 +1,58 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include <gtest/gtest.h>
+
+#include <memory>
+
+#include "function_test_util.h"
+#include "olap/rowset/segment_v2/inverted_index/analyzer/analyzer.h"
+#include "vec/functions/match.h"
+
+namespace doris::vectorized {
+
+TEST(FunctionMatchTest, analyse_query_str) {
+ FunctionMatchPhrase func_match_phrase;
+
+ {
+ auto inverted_index_ctx = nullptr;
+ std::vector<std::string> query_tokens =
+ func_match_phrase.analyse_query_str_token(inverted_index_ctx,
"a b c", "name");
+ ASSERT_EQ(query_tokens.size(), 0);
+ }
+
+ {
+ auto inverted_index_ctx = std::make_unique<InvertedIndexCtx>();
+ inverted_index_ctx->parser_type = InvertedIndexParserType::PARSER_NONE;
+ std::vector<std::string> query_tokens =
func_match_phrase.analyse_query_str_token(
+ inverted_index_ctx.get(), "a b c", "name");
+ ASSERT_EQ(query_tokens.size(), 1);
+ }
+
+ {
+ auto inverted_index_ctx = std::make_unique<InvertedIndexCtx>();
+ inverted_index_ctx->parser_type =
InvertedIndexParserType::PARSER_ENGLISH;
+ auto analyzer =
doris::segment_v2::inverted_index::InvertedIndexAnalyzer::create_analyzer(
+ inverted_index_ctx.get());
+ inverted_index_ctx->analyzer = analyzer.get();
+ std::vector<std::string> query_tokens =
func_match_phrase.analyse_query_str_token(
+ inverted_index_ctx.get(), "a b c", "name");
+ ASSERT_EQ(query_tokens.size(), 3);
+ }
+}
+
+} // namespace doris::vectorized
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
