forked from ydb-platform/ydb
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cs to stable 24 3 (ydb-platform#9268)
Co-authored-by: Semyon <[email protected]> Co-authored-by: ivanmorozov333 <[email protected]> Co-authored-by: Ivan <[email protected]> Co-authored-by: Artem Alekseev <[email protected]> Co-authored-by: Alexander Avdonkin <[email protected]> Co-authored-by: Nikita Vasilev <[email protected]> Co-authored-by: Vladislav Gogov <[email protected]> Conflicts: ydb/core/kqp/compute_actor/kqp_compute_actor.cpp ydb/core/kqp/compute_actor/kqp_compute_actor.h ydb/core/kqp/compute_actor/kqp_compute_actor_factory.h ydb/core/kqp/compute_actor/kqp_compute_events.h ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.h ydb/core/kqp/executer_actor/kqp_data_executer.cpp ydb/core/kqp/executer_actor/kqp_planner.cpp ydb/core/kqp/executer_actor/kqp_planner.h ydb/core/kqp/node_service/kqp_node_service.cpp ydb/core/kqp/ut/common/kqp_ut_common.cpp ydb/core/kqp/ut/olap/clickbench_ut.cpp ydb/core/kqp/ut/olap/kqp_olap_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_common.h ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_mvcc_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_tx_ut.cpp ydb/core/protos/feature_flags.proto ydb/core/protos/kqp.proto ydb/core/testlib/basics/feature_flags.h ydb/core/tx/columnshard/engines/scheme/index_info.cpp ydb/core/tx/columnshard/splitter/chunks.h ydb/library/yql/sql/v1/sql_ut.cpp ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 Fix tx tests (ydb-platform#8945) (ydb-platform#9284) Co-authored-by: Nikita Vasilev <[email protected]> fix tests
- Loading branch information
1 parent
79bc3c2
commit 4c494cc
Showing
587 changed files
with
19,209 additions
and
6,264 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| #include "accessor.h" | ||
|
|
||
| #include <ydb/core/formats/arrow/arrow_helpers.h> | ||
| #include <ydb/core/formats/arrow/permutations.h> | ||
| #include <ydb/core/formats/arrow/save_load/saver.h> | ||
| #include <ydb/core/formats/arrow/size_calcer.h> | ||
| #include <ydb/core/formats/arrow/splitter/simple.h> | ||
| #include <ydb/core/formats/arrow/switch/compare.h> | ||
| #include <ydb/core/formats/arrow/switch/switch_type.h> | ||
|
|
||
| #include <ydb/library/actors/core/log.h> | ||
|
|
||
| namespace NKikimr::NArrow::NAccessor { | ||
|
|
||
| void IChunkedArray::TReader::AppendPositionTo(arrow::ArrayBuilder& builder, const ui64 position, ui64* recordSize) const { | ||
| auto address = GetReadChunk(position); | ||
| AFL_VERIFY(NArrow::Append(builder, *address.GetArray(), address.GetPosition(), recordSize)); | ||
| } | ||
|
|
||
| std::shared_ptr<arrow::Array> IChunkedArray::TReader::CopyRecord(const ui64 recordIndex) const { | ||
| auto address = GetReadChunk(recordIndex); | ||
| return NArrow::CopyRecords(address.GetArray(), { address.GetPosition() }); | ||
| } | ||
|
|
||
| std::shared_ptr<arrow::ChunkedArray> IChunkedArray::Slice(const ui32 offset, const ui32 count) const { | ||
| AFL_VERIFY(offset + count <= (ui64)GetRecordsCount())("offset", offset)("count", count)("length", GetRecordsCount()); | ||
| ui32 currentOffset = offset; | ||
| ui32 countLeast = count; | ||
| std::vector<std::shared_ptr<arrow::Array>> chunks; | ||
| auto address = GetChunkSlow(offset); | ||
| while (countLeast) { | ||
| address = GetChunk(address.GetAddress(), currentOffset); | ||
| const ui64 internalPos = address.GetAddress().GetLocalIndex(currentOffset); | ||
| if (internalPos + countLeast <= (ui64)address.GetArray()->length()) { | ||
| chunks.emplace_back(address.GetArray()->Slice(internalPos, countLeast)); | ||
| break; | ||
| } else { | ||
| const ui32 deltaCount = address.GetArray()->length() - internalPos; | ||
| chunks.emplace_back(address.GetArray()->Slice(internalPos, deltaCount)); | ||
| AFL_VERIFY(countLeast >= deltaCount); | ||
| countLeast -= deltaCount; | ||
| currentOffset += deltaCount; | ||
| } | ||
| } | ||
| return std::make_shared<arrow::ChunkedArray>(chunks, DataType); | ||
| } | ||
|
|
||
| NKikimr::NArrow::NAccessor::IChunkedArray::TFullDataAddress IChunkedArray::GetChunk( | ||
| const std::optional<TAddressChain>& chunkCurrent, const ui64 position) const { | ||
| AFL_VERIFY(position < GetRecordsCount()); | ||
| std::optional<TCommonChunkAddress> address; | ||
|
|
||
| if (IsDataOwner()) { | ||
| if (chunkCurrent) { | ||
| AFL_VERIFY(chunkCurrent->GetSize() == 1)("size", chunkCurrent->GetSize()); | ||
| } | ||
| auto localAddress = GetLocalData(address, position); | ||
| TAddressChain addressChain; | ||
| addressChain.Add(localAddress.GetAddress()); | ||
| AFL_VERIFY(addressChain.Contains(position)); | ||
| return TFullDataAddress(localAddress.GetArray(), std::move(addressChain)); | ||
| } else { | ||
| auto chunkedArrayAddress = GetArray(chunkCurrent, position, nullptr); | ||
| if (chunkCurrent) { | ||
| AFL_VERIFY(chunkCurrent->GetSize() == 1 + chunkedArrayAddress.GetAddress().GetSize())("current", chunkCurrent->GetSize())( | ||
| "chunked", chunkedArrayAddress.GetAddress().GetSize()); | ||
| } | ||
| auto localAddress = chunkedArrayAddress.GetArray()->GetLocalData(address, chunkedArrayAddress.GetAddress().GetLocalIndex(position)); | ||
| auto fullAddress = std::move(chunkedArrayAddress.MutableAddress()); | ||
| fullAddress.Add(localAddress.GetAddress()); | ||
| AFL_VERIFY(fullAddress.Contains(position)); | ||
| return TFullDataAddress(localAddress.GetArray(), std::move(fullAddress)); | ||
| } | ||
| } | ||
|
|
||
| IChunkedArray::TFullChunkedArrayAddress IChunkedArray::GetArray( | ||
| const std::optional<TAddressChain>& chunkCurrent, const ui64 position, const std::shared_ptr<IChunkedArray>& selfPtr) const { | ||
| AFL_VERIFY(position < GetRecordsCount()); | ||
| if (IsDataOwner()) { | ||
| AFL_VERIFY(selfPtr); | ||
| TAddressChain chain; | ||
| chain.Add(TCommonChunkAddress(0, GetRecordsCount(), 0)); | ||
| return IChunkedArray::TFullChunkedArrayAddress(selfPtr, std::move(chain)); | ||
| } | ||
| TAddressChain addressChain; | ||
|
|
||
| auto* currentLevel = this; | ||
| ui32 currentPosition = position; | ||
| ui32 idx = 0; | ||
| std::vector<std::shared_ptr<IChunkedArray>> chainForTemporarySave; | ||
| while (!currentLevel->IsDataOwner()) { | ||
| std::optional<TCommonChunkAddress> currentAddress; | ||
| if (chunkCurrent) { | ||
| currentAddress = chunkCurrent->GetAddress(idx); | ||
| } | ||
| auto nextChunkedArray = currentLevel->GetLocalChunkedArray(currentAddress, currentPosition); | ||
| chainForTemporarySave.emplace_back(nextChunkedArray.GetArray()); | ||
| currentLevel = chainForTemporarySave.back().get(); | ||
| addressChain.Add(nextChunkedArray.GetAddress()); | ||
| AFL_VERIFY(nextChunkedArray.GetAddress().GetStartPosition() <= currentPosition); | ||
| currentPosition -= nextChunkedArray.GetAddress().GetStartPosition(); | ||
| ++idx; | ||
| } | ||
| AFL_VERIFY(!chunkCurrent || chunkCurrent->GetSize() - idx <= 1)("idx", idx)("size", chunkCurrent->GetSize()); | ||
| return TFullChunkedArrayAddress(chainForTemporarySave.back(), std::move(addressChain)); | ||
| } | ||
|
|
||
| TString IChunkedArray::TReader::DebugString(const ui32 position) const { | ||
| auto address = GetReadChunk(position); | ||
| return NArrow::DebugString(address.GetArray(), address.GetPosition()); | ||
| } | ||
|
|
||
| std::partial_ordering IChunkedArray::TReader::CompareColumns( | ||
| const std::vector<TReader>& l, const ui64 lPosition, const std::vector<TReader>& r, const ui64 rPosition) { | ||
| AFL_VERIFY(l.size() == r.size()); | ||
| for (ui32 i = 0; i < l.size(); ++i) { | ||
| const TAddress lAddress = l[i].GetReadChunk(lPosition); | ||
| const TAddress rAddress = r[i].GetReadChunk(rPosition); | ||
| auto cmp = lAddress.Compare(rAddress); | ||
| if (std::is_neq(cmp)) { | ||
| return cmp; | ||
| } | ||
| } | ||
| return std::partial_ordering::equivalent; | ||
| } | ||
|
|
||
| IChunkedArray::TAddress IChunkedArray::TReader::GetReadChunk(const ui64 position) const { | ||
| AFL_VERIFY(position < ChunkedArray->GetRecordsCount()); | ||
| if (CurrentChunkAddress && CurrentChunkAddress->GetAddress().Contains(position)) { | ||
| } else { | ||
| CurrentChunkAddress = ChunkedArray->GetChunk(CurrentChunkAddress, position); | ||
| } | ||
| return IChunkedArray::TAddress(CurrentChunkAddress->GetArray(), CurrentChunkAddress->GetAddress().GetLocalIndex(position)); | ||
| } | ||
|
|
||
| const std::partial_ordering IChunkedArray::TAddress::Compare(const TAddress& item) const { | ||
| return TComparator::TypedCompare<true>(*Array, Position, *item.Array, item.Position); | ||
| } | ||
|
|
||
| TChunkedArraySerialized::TChunkedArraySerialized(const std::shared_ptr<IChunkedArray>& array, const TString& serializedData) | ||
| : Array(array) | ||
| , SerializedData(serializedData) { | ||
| AFL_VERIFY(serializedData); | ||
| AFL_VERIFY(Array); | ||
| AFL_VERIFY(Array->GetRecordsCount()); | ||
| } | ||
|
|
||
| std::partial_ordering IChunkedArray::TFullDataAddress::Compare( | ||
| const ui64 position, const TFullDataAddress& item, const ui64 itemPosition) const { | ||
| AFL_VERIFY(Address.Contains(position))("pos", position)("start", Address.DebugString()); | ||
| AFL_VERIFY(item.Address.Contains(itemPosition))("pos", itemPosition)("start", item.Address.DebugString()); | ||
| return TComparator::TypedCompare<true>(*Array, Address.GetLocalIndex(position), *item.Array, item.Address.GetLocalIndex(itemPosition)); | ||
| } | ||
|
|
||
| std::shared_ptr<arrow::Array> IChunkedArray::TFullDataAddress::CopyRecord(const ui64 recordIndex) const { | ||
| return NArrow::CopyRecords(Array, { Address.GetLocalIndex(recordIndex) }); | ||
| } | ||
|
|
||
| TString IChunkedArray::TFullDataAddress::DebugString(const ui64 position) const { | ||
| return NArrow::DebugString(Array, Address.GetLocalIndex(position)); | ||
| } | ||
|
|
||
| } // namespace NKikimr::NArrow::NAccessor |
Oops, something went wrong.