Skip to content

Commit 97b61de

Browse files
authored
Fix subcolumns problems (#28200)
1 parent 569cc8f commit 97b61de

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

ydb/core/formats/arrow/accessor/sub_columns/accessor.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,6 @@ class TJsonRestorer {
138138
bool enqueue = false;
139139
bool wasEnqueue = false;
140140
NJson::TJsonValue* current = &Result;
141-
if (path.empty()) {
142-
current->InsertValue(path, jsonValue);
143-
return;
144-
}
145141
for (ui32 i = 0; i < path.size(); ++i) {
146142
if (path[i] == '\\') {
147143
++i;
@@ -195,7 +191,7 @@ class TJsonRestorer {
195191
TStringBuf key(path.data() + start + 1, (path.size() - 1) - start - 1);
196192
current->InsertValue(key, jsonValue);
197193
} else {
198-
AFL_VERIFY(path.size() > start)("path", path)("start", start);
194+
AFL_VERIFY(path.size() >= start)("path", path)("start", start);
199195
TStringBuf key(path.data() + start, (path.size()) - start);
200196
ui32 keyIndex;
201197
if (key.StartsWith("[") && key.EndsWith("]") && TryFromString<ui32>(key.data() + 1, key.size() - 2, keyIndex)) {

ydb/core/tx/columnshard/engines/scheme/indexes/abstract/fetcher.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ void TIndexFetcherLogic::DoOnDataReceived(TReadActionsCollection& nextRead, NBlo
4747
ranges.insert(ranges.end(), rangesLocal.begin(), rangesLocal.end());
4848
}
4949
}
50+
std::sort(ranges.begin(), ranges.end());
5051
ranges.erase(std::unique(ranges.begin(), ranges.end()), ranges.end());
5152
if (ranges.size()) {
5253
auto reading = blobsAction.GetReading(StorageId);

0 commit comments

Comments
 (0)