Skip to content

Commit 2a66eaa

Browse files
committed
fix
1 parent 510663f commit 2a66eaa

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

ydb/library/yql/core/ut/yql_column_order_ut.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ using namespace NYql;
99

1010
Y_UNIT_TEST_SUITE(TYqlColumnOrder) {
1111

12-
Y_UNIT_TEST(ColumnOrderIgnoreCase) {
13-
TColumnOrder order;
14-
UNIT_ASSERT_EQUAL(order.AddColumn("a"), "a");
15-
UNIT_ASSERT_EQUAL(order.AddColumn("A"), "A_generated_2");
16-
}
17-
1812
Y_UNIT_TEST(ColumnOrderShrink) {
1913
TColumnOrder order;
2014
UNIT_ASSERT_EQUAL(order.AddColumn("a"), "a");

ydb/library/yql/core/yql_type_annotation.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ TString TColumnOrder::Find(const TString& name) const {
124124
TColumnOrder& TColumnOrder::operator=(const TColumnOrder& rhs) {
125125
GeneratedToOriginal_ = rhs.GeneratedToOriginal_;
126126
Order_ = rhs.Order_;
127+
UseCountLcase_ = rhs.UseCountLcase_;
127128
UseCount_ = rhs.UseCount_;
128129
return *this;
129130
}
@@ -152,7 +153,7 @@ TString TColumnOrder::AddColumn(const TString& name) {
152153

153154
bool TColumnOrder::IsDuplicatedIgnoreCase(const TString& name) const {
154155
auto it = UseCountLcase_.find(to_lower(name));
155-
return it != UseCount_.end() && it->second > 1;
156+
return it != UseCountLcase_.end() && it->second > 1;
156157
}
157158

158159
void TColumnOrder::Shrink(size_t remain) {
@@ -179,6 +180,7 @@ void TColumnOrder::Clear() {
179180
Order_.clear();
180181
GeneratedToOriginal_.clear();
181182
UseCount_.clear();
183+
UseCountLcase_.clear();
182184
}
183185

184186
void TColumnOrder::EraseIf(const std::function<bool(const TString&)>& fn) {

0 commit comments

Comments
 (0)