Skip to content

Commit 643d321

Browse files
authored
restore ascii ignore case match (#19334)
1 parent d598cae commit 643d321

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

.github/config/muted_ya.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ ydb/core/kqp/ut/cost KqpCost.OlapWriteRow
2121
ydb/core/kqp/ut/federated_query/large_results KqpScriptExecResults.ExecuteScriptWithLargeFile
2222
ydb/core/kqp/ut/federated_query/s3 sole chunk chunk
2323
ydb/core/kqp/ut/indexes KqpMultishardIndex.WriteIntoRenamingSyncIndex
24-
ydb/core/kqp/ut/olap KqpOlapJson.BloomMixIndexesVariants
25-
ydb/core/kqp/ut/olap KqpOlapJson.BloomNGrammIndexesVariants
2624
ydb/core/kqp/ut/olap KqpOlapJson.CompactionVariants
2725
ydb/core/kqp/ut/olap KqpOlapJson.DuplicationCompactionVariants
2826
ydb/core/kqp/ut/olap KqpOlapJson.SwitchAccessorCompactionVariants

ydb/core/formats/arrow/program/kernel_logic.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class TLogicMatchString: public IKernelLogic {
151151
class TLogicMatchAsciiEqualsIgnoreCase: public TLogicMatchString {
152152
private:
153153
static TString GetClassNameStatic() {
154-
return "String.AsciiEqualsIgnoreCase";
154+
return "String._yql_AsciiEqualsIgnoreCase";
155155
}
156156
public:
157157
TLogicMatchAsciiEqualsIgnoreCase() : TLogicMatchString(TIndexCheckOperation::EOperation::Contains, false, false) {
@@ -163,7 +163,7 @@ class TLogicMatchAsciiEqualsIgnoreCase: public TLogicMatchString {
163163
class TLogicMatchAsciiContainsIgnoreCase: public TLogicMatchString {
164164
private:
165165
static TString GetClassNameStatic() {
166-
return "String.AsciiContainsIgnoreCase";
166+
return "String._yql_AsciiContainsIgnoreCase";
167167
}
168168
public:
169169
TLogicMatchAsciiContainsIgnoreCase() : TLogicMatchString(TIndexCheckOperation::EOperation::Contains, false, false) {
@@ -175,7 +175,7 @@ class TLogicMatchAsciiContainsIgnoreCase: public TLogicMatchString {
175175
class TLogicMatchAsciiStartsWithIgnoreCase: public TLogicMatchString {
176176
private:
177177
static TString GetClassNameStatic() {
178-
return "String.AsciiStartsWithIgnoreCase";
178+
return "String._yql_AsciiStartsWithIgnoreCase";
179179
}
180180
public:
181181
TLogicMatchAsciiStartsWithIgnoreCase() : TLogicMatchString(TIndexCheckOperation::EOperation::StartsWith, false, false) {
@@ -187,7 +187,7 @@ class TLogicMatchAsciiStartsWithIgnoreCase: public TLogicMatchString {
187187
class TLogicMatchAsciiEndsWithIgnoreCase: public TLogicMatchString {
188188
private:
189189
static TString GetClassNameStatic() {
190-
return "String.AsciiEndsWithIgnoreCase";
190+
return "String._yql_AsciiEndsWithIgnoreCase";
191191
}
192192
public:
193193
TLogicMatchAsciiEndsWithIgnoreCase() : TLogicMatchString(TIndexCheckOperation::EOperation::EndsWith, false, false) {

ydb/core/kqp/opt/physical/predicate_collector.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ using namespace NYql;
1010
using namespace NYql::NNodes;
1111

1212
THashMap<TString, TString> IgnoreCaseSubstringMatchFunctions = {
13-
{"EqualsIgnoreCase", "String.AsciiEqualsIgnoreCase"},
14-
{"StartsWithIgnoreCase", "String.AsciiStartsWithIgnoreCase"},
15-
{"EndsWithIgnoreCase", "String.AsciiEndsWithIgnoreCase"},
16-
{"StringContainsIgnoreCase", "String.AsciiContainsIgnoreCase"}
13+
{"EqualsIgnoreCase", "String._yql_AsciiEqualsIgnoreCase"},
14+
{"StartsWithIgnoreCase", "String._yql_AsciiStartsWithIgnoreCase"},
15+
{"EndsWithIgnoreCase", "String._yql_AsciiEndsWithIgnoreCase"},
16+
{"StringContainsIgnoreCase", "String._yql_AsciiContainsIgnoreCase"}
1717
};
1818

1919
namespace {
@@ -127,14 +127,14 @@ bool CanPushdownStringUdf(const TExprNode& udf, bool pushdownSubstring) {
127127
}
128128
const auto& name = udf.Head().Content();
129129
static const THashSet<TString> substringMatchUdfs = {
130-
"String.AsciiEqualsIgnoreCase",
130+
"String._yql_AsciiEqualsIgnoreCase",
131131

132132
"String.Contains",
133-
"String.AsciiContainsIgnoreCase",
133+
"String._yql_AsciiContainsIgnoreCase",
134134
"String.StartsWith",
135-
"String.AsciiStartsWithIgnoreCase",
135+
"String._yql_AsciiStartsWithIgnoreCase",
136136
"String.EndsWith",
137-
"String.AsciiEndsWithIgnoreCase"
137+
"String._yql_AsciiEndsWithIgnoreCase"
138138
};
139139
return substringMatchUdfs.contains(name);
140140
}

ydb/core/kqp/ut/olap/kqp_olap_ut.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,13 +1240,13 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
12401240
R"(`uid` LIKE "_id%000_")",
12411241
R"(`uid` ILIKE "UID%002")",
12421242

1243-
//R"(Udf(String::AsciiEqualsIgnoreCase)(`uid`, "UI"))", //bug #19270
1243+
R"(Udf(String::_yql_AsciiEqualsIgnoreCase)(`uid`, "UI"))",
12441244
R"(Udf(String::Contains)(`uid`, "UI"))",
1245-
//R"(Udf(String::AsciiContainsIgnoreCase)(`uid`, "UI"))", //bug #19270
1245+
R"(Udf(String::_yql_AsciiContainsIgnoreCase)(`uid`, "UI"))",
12461246
R"(Udf(String::StartsWith)(`uid`, "UI"))",
1247-
//R"(Udf(String::AsciiStartsWithIgnoreCase)(`uid`, "UI"))", //bug #19270
1247+
R"(Udf(String::_yql_AsciiStartsWithIgnoreCase)(`uid`, "UI"))",
12481248
R"(Udf(String::EndsWith)(`uid`, "UI"))",
1249-
//R"(Udf(String::AsciiEndsWithIgnoreCase)(`uid`, "UI"))", //bug #19270
1249+
R"(Udf(String::_yql_AsciiEndsWithIgnoreCase)(`uid`, "UI"))",
12501250
};
12511251

12521252
for (const auto& predicate: testData) {

0 commit comments

Comments
 (0)