diff options
12 files changed, 17 insertions, 24 deletions
diff --git a/ydb/core/tx/columnshard/columnshard__write.cpp b/ydb/core/tx/columnshard/columnshard__write.cpp index 6780c0c1809..51bfd23cedb 100644 --- a/ydb/core/tx/columnshard/columnshard__write.cpp +++ b/ydb/core/tx/columnshard/columnshard__write.cpp @@ -535,7 +535,7 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor return; } - auto schema = TablesManager.GetPrimaryIndex()->GetVersionedIndex().GetSchema(operation.GetTableId().GetSchemaVersion()); + auto schema = TablesManager.GetPrimaryIndex()->GetVersionedIndex().GetSchemaVerified(operation.GetTableId().GetSchemaVersion()); if (!schema) { Counters.GetTabletCounters()->IncCounter(COUNTER_WRITE_FAIL); auto result = NEvents::TDataEvents::TEvWriteResult::BuildError( diff --git a/ydb/core/tx/columnshard/engines/portions/constructor_portion.cpp b/ydb/core/tx/columnshard/engines/portions/constructor_portion.cpp index 59261a27322..7092b5f4654 100644 --- a/ydb/core/tx/columnshard/engines/portions/constructor_portion.cpp +++ b/ydb/core/tx/columnshard/engines/portions/constructor_portion.cpp @@ -43,12 +43,13 @@ std::shared_ptr<TPortionInfo> TPortionInfoConstructor::Build() { ISnapshotSchema::TPtr TPortionInfoConstructor::GetSchema(const TVersionedIndex& index) const { if (SchemaVersion) { - auto schema = index.GetSchema(SchemaVersion.value()); + auto schema = index.GetSchemaVerified(SchemaVersion.value()); AFL_VERIFY(!!schema)("details", TStringBuilder() << "cannot find schema for version " << SchemaVersion.value()); return schema; + } else { + AFL_VERIFY(MinSnapshotDeprecated); + return index.GetSchemaVerified(*MinSnapshotDeprecated); } - AFL_VERIFY(MinSnapshotDeprecated); - return index.GetSchema(*MinSnapshotDeprecated); } void TPortionInfoConstructor::AddMetadata(const ISnapshotSchema& snapshotSchema, const std::shared_ptr<arrow::RecordBatch>& batch) { diff --git a/ydb/core/tx/columnshard/engines/portions/portion_info.cpp b/ydb/core/tx/columnshard/engines/portions/portion_info.cpp index 6a180c5d280..8cc9c4e3be6 100644 --- a/ydb/core/tx/columnshard/engines/portions/portion_info.cpp +++ b/ydb/core/tx/columnshard/engines/portions/portion_info.cpp @@ -109,11 +109,11 @@ const TString& TPortionInfo::GetIndexStorageId(const ui32 indexId, const TIndexI ISnapshotSchema::TPtr TPortionInfo::GetSchema(const TVersionedIndex& index) const { AFL_VERIFY(SchemaVersion); if (SchemaVersion) { - auto schema = index.GetSchema(SchemaVersion.value()); + auto schema = index.GetSchemaVerified(SchemaVersion.value()); AFL_VERIFY(!!schema)("details", TStringBuilder() << "cannot find schema for version " << SchemaVersion.value()); return schema; } - return index.GetSchema(MinSnapshotDeprecated); + return index.GetSchemaVerified(MinSnapshotDeprecated); } ISnapshotSchema::TPtr TPortionInfo::TSchemaCursor::GetSchema(const TPortionInfoConstructor& portion) { diff --git a/ydb/core/tx/columnshard/engines/reader/abstract/constructor.cpp b/ydb/core/tx/columnshard/engines/reader/abstract/constructor.cpp index 96627da5f8f..95a756f2f43 100644 --- a/ydb/core/tx/columnshard/engines/reader/abstract/constructor.cpp +++ b/ydb/core/tx/columnshard/engines/reader/abstract/constructor.cpp @@ -39,7 +39,7 @@ NKikimr::TConclusionStatus IScannerConstructor::ParseProgram(const TVersionedInd } //its possible dont use columns from filter where pk field compare with null and remove from PKFilter and program, but stay in kqp columns request if (vIndex) { - for (auto&& i : vIndex->GetSchema(read.GetSnapshot())->GetIndexInfo().GetReplaceKey()->field_names()) { + for (auto&& i : vIndex->GetSchemaVerified(read.GetSnapshot())->GetIndexInfo().GetReplaceKey()->field_names()) { const TString cId(i.data(), i.size()); namesChecker.erase(cId); programColumns.erase(cId); diff --git a/ydb/core/tx/columnshard/engines/reader/abstract/read_metadata.h b/ydb/core/tx/columnshard/engines/reader/abstract/read_metadata.h index ed6667e61bb..f144bf05f95 100644 --- a/ydb/core/tx/columnshard/engines/reader/abstract/read_metadata.h +++ b/ydb/core/tx/columnshard/engines/reader/abstract/read_metadata.h @@ -118,13 +118,13 @@ public: ISnapshotSchema::TPtr GetLoadSchemaVerified(const TPortionInfo& porition) const; const std::shared_ptr<NArrow::TSchemaLite>& GetBlobSchema(const ui64 version) const { - return GetIndexVersions().GetSchema(version)->GetIndexInfo().ArrowSchema(); + return GetIndexVersions().GetSchemaVerified(version)->GetIndexInfo().ArrowSchema(); } const TIndexInfo& GetIndexInfo(const std::optional<TSnapshot>& version = {}) const { AFL_VERIFY(ResultIndexSchema); if (version && version < RequestSnapshot) { - return GetIndexVersions().GetSchema(*version)->GetIndexInfo(); + return GetIndexVersions().GetSchemaVerified(*version)->GetIndexInfo(); } return ResultIndexSchema->GetIndexInfo(); } diff --git a/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor/constructor.cpp b/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor/constructor.cpp index ae28340c993..78926d99dce 100644 --- a/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor/constructor.cpp +++ b/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor/constructor.cpp @@ -9,7 +9,7 @@ namespace NKikimr::NOlap::NReader::NPlain { NKikimr::TConclusionStatus TIndexScannerConstructor::ParseProgram( const TVersionedIndex* vIndex, const NKikimrTxDataShard::TEvKqpScan& proto, TReadDescription& read) const { AFL_VERIFY(vIndex); - auto& indexInfo = vIndex->GetSchema(Snapshot)->GetIndexInfo(); + auto& indexInfo = vIndex->GetSchemaVerified(Snapshot)->GetIndexInfo(); TIndexColumnResolver columnResolver(indexInfo); return TBase::ParseProgram(vIndex, proto.GetOlapProgramType(), proto.GetOlapProgram(), read, columnResolver); } diff --git a/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor/read_metadata.h b/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor/read_metadata.h index 50befec8387..317ee0f03da 100644 --- a/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor/read_metadata.h +++ b/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor/read_metadata.h @@ -116,7 +116,7 @@ public: std::shared_ptr<TReadStats> ReadStats; TReadMetadata(const ui64 pathId, const std::shared_ptr<TVersionedIndex> info, const TSnapshot& snapshot, const ESorting sorting, const TProgramContainer& ssaProgram) - : TBase(info, sorting, ssaProgram, info->GetSchema(snapshot), snapshot) + : TBase(info, sorting, ssaProgram, info->GetSchemaVerified(snapshot), snapshot) , PathId(pathId) , ReadStats(std::make_shared<TReadStats>()) { diff --git a/ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/source.h b/ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/source.h index 527bdb810b4..3647bb52a37 100644 --- a/ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/source.h +++ b/ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/source.h @@ -81,8 +81,6 @@ public: return DoStartFetchingAccessor(sourcePtr, step); } - virtual ui64 PredictAccessorMemoryBytes() const = 0; - bool AddTxConflict() { if (!Context->GetCommonContext()->HasLock()) { return false; @@ -317,9 +315,6 @@ private: } virtual bool DoStartFetchingAccessor(const std::shared_ptr<IDataSource>& sourcePtr, const TFetchingScriptCursor& step) override; - virtual ui64 PredictAccessorMemoryBytes() const override { - return Portion->PredictMetadataMemorySize(Schema->GetColumnsCount()); - } public: virtual bool NeedAccessorsFetching() const override { @@ -459,9 +454,6 @@ public: virtual bool DoStartFetchingAccessor(const std::shared_ptr<IDataSource>& /*sourcePtr*/, const TFetchingScriptCursor& /*step*/) override { return false; } - virtual ui64 PredictAccessorMemoryBytes() const override { - return 0; - } virtual ui64 GetColumnsVolume(const std::set<ui32>& columnIds, const EMemType type) const override { AFL_VERIFY(columnIds.size()); diff --git a/ydb/core/tx/columnshard/engines/scheme/versions/versioned_index.h b/ydb/core/tx/columnshard/engines/scheme/versions/versioned_index.h index e399535a96a..e320089f85d 100644 --- a/ydb/core/tx/columnshard/engines/scheme/versions/versioned_index.h +++ b/ydb/core/tx/columnshard/engines/scheme/versions/versioned_index.h @@ -73,7 +73,7 @@ public: return sb; } - ISnapshotSchema::TPtr GetSchema(const ui64 version) const { + ISnapshotSchema::TPtr GetSchemaOptional(const ui64 version) const { auto it = SnapshotByVersion.find(version); return it == SnapshotByVersion.end() ? nullptr : it->second; } @@ -84,7 +84,7 @@ public: return it->second; } - ISnapshotSchema::TPtr GetSchema(const TSnapshot& version) const { + ISnapshotSchema::TPtr GetSchemaVerified(const TSnapshot& version) const { for (auto it = Snapshots.rbegin(); it != Snapshots.rend(); ++it) { if (it->first <= version) { return it->second; diff --git a/ydb/core/tx/columnshard/normalizer/portion/chunks.cpp b/ydb/core/tx/columnshard/normalizer/portion/chunks.cpp index 3f4002f1ffb..21a184f7fd9 100644 --- a/ydb/core/tx/columnshard/normalizer/portion/chunks.cpp +++ b/ydb/core/tx/columnshard/normalizer/portion/chunks.cpp @@ -98,7 +98,7 @@ public: }; void TChunksNormalizer::TChunkInfo::InitSchema(const NColumnShard::TTablesManager& tm) { - Schema = tm.GetPrimaryIndexSafe().GetVersionedIndex().GetSchema(NOlap::TSnapshot(Key.GetPlanStep(), Key.GetTxId())); + Schema = tm.GetPrimaryIndexSafe().GetVersionedIndex().GetSchemaVerified(NOlap::TSnapshot(Key.GetPlanStep(), Key.GetTxId())); } TConclusion<std::vector<INormalizerTask::TPtr>> TChunksNormalizer::DoInit( diff --git a/ydb/core/tx/columnshard/normalizer/portion/restore_portion_from_chunks.cpp b/ydb/core/tx/columnshard/normalizer/portion/restore_portion_from_chunks.cpp index 5a0f5592064..a2c382e5dd6 100644 --- a/ydb/core/tx/columnshard/normalizer/portion/restore_portion_from_chunks.cpp +++ b/ydb/core/tx/columnshard/normalizer/portion/restore_portion_from_chunks.cpp @@ -129,7 +129,7 @@ TConclusion<std::vector<INormalizerTask::TPtr>> TNormalizer::DoInit( for (auto&& [_, chunkWithPortionData] : portionsToWrite) { package.emplace_back( - tablesManager.GetPrimaryIndexSafe().GetVersionedIndex().GetSchema(chunkWithPortionData.GetMinSnapshotDeprecated())->GetVersion(), + tablesManager.GetPrimaryIndexSafe().GetVersionedIndex().GetSchemaVerified(chunkWithPortionData.GetMinSnapshotDeprecated())->GetVersion(), std::move(chunkWithPortionData)); if (package.size() == 100) { std::vector<TPatchItem> local; diff --git a/ydb/core/tx/columnshard/tables_manager.h b/ydb/core/tx/columnshard/tables_manager.h index 1a55c68547d..5f6928f7cce 100644 --- a/ydb/core/tx/columnshard/tables_manager.h +++ b/ydb/core/tx/columnshard/tables_manager.h @@ -206,7 +206,7 @@ public: const NOlap::TIndexInfo& GetIndexInfo(const NOlap::TSnapshot& version) const { Y_ABORT_UNLESS(!!PrimaryIndex); - return PrimaryIndex->GetVersionedIndex().GetSchema(version)->GetIndexInfo(); + return PrimaryIndex->GetVersionedIndex().GetSchemaVerified(version)->GetIndexInfo(); } const std::unique_ptr<NOlap::IColumnEngine>& GetPrimaryIndex() const { |