fix: Fix bug for Search fails with filter expression contains undersc…

…ore (#38085) Enhance the matching for elements within the UnaryRangeArray #38068 --------- Signed-off-by: Xianhui.Lin <[email protected]>
milvus-io · Dec 5, 2024 · 6d0a4fd · 6d0a4fd
1 parent 9b60694
commit 6d0a4fd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/internal/core/src/exec/expression/UnaryExpr.cpp b/internal/core/src/exec/expression/UnaryExpr.cpp
@@ -320,6 +320,11 @@ PhyUnaryRangeFilterExpr::ExecRangeVisitorImplArray() {
                 func(data, valid_data, size, val, index, res, valid_res);
                 break;
             }
+            case proto::plan::Match: {
+                UnaryElementFuncForArray<ValueType, proto::plan::Match> func;
+                func(data, valid_data, size, val, index, res, valid_res);
+                break;
+            }
             default:
                 PanicInfo(
                     OpTypeInvalid,

diff --git a/internal/core/src/exec/expression/UnaryExpr.h b/internal/core/src/exec/expression/UnaryExpr.h
@@ -191,6 +191,20 @@ struct UnaryElementFuncForArray {
                 UnaryArrayCompare(array_data <= val);
             } else if constexpr (op == proto::plan::OpType::PrefixMatch) {
                 UnaryArrayCompare(milvus::query::Match(array_data, val, op));
+            } else if constexpr (op == proto::plan::OpType::Match) {
+                if constexpr (std::is_same_v<GetType, proto::plan::Array>) {
+                    res[i] = false;
+                } else {
+                    if (index >= src[i].length()) {
+                        res[i] = false;
+                        continue;
+                    }
+                    PatternMatchTranslator translator;
+                    auto regex_pattern = translator(val);
+                    RegexMatcher matcher(regex_pattern);
+                    auto array_data = src[i].template get_data<GetType>(index);
+                    res[i] = matcher(array_data);
+                }
             } else {
                 PanicInfo(OpTypeInvalid,
                           "unsupported op_type:{} for "