rename

Author: vlad-gogov

ydb/core/tx/columnshard/engines/changes/indexation.cpp

@@ -104,7 +104,7 @@ class TPathFieldsInfo {
             return;
         }
         auto blobSchema = context.SchemaVersions.GetSchemaVerified(data.GetSchemaVersion());
-        std::set<ui32> columnIdxsToDelete = blobSchema->GetColumnIdxsToDelete(ResultSchema);
+        std::set<ui32> columnIdsToDelete = blobSchema->GetColumnIdsToDelete(ResultSchema);
         if (!Schemas.contains(data.GetSchemaVersion())) {
             Schemas.emplace(data.GetSchemaVersion(), blobSchema);
         }
@@ -113,7 +113,7 @@ class TPathFieldsInfo {
             filteredIds.emplace_back((ui32)IIndexInfo::ESpecialColumn::DELETE_FLAG);
         }
         for (const auto& filteredId : filteredIds) {
-            if (!columnIdxsToDelete.contains(filteredId)) {
+            if (!columnIdsToDelete.contains(filteredId)) {
                 UsageColumnIds.insert(filteredId);
             }
         }
@@ -247,9 +247,9 @@ TConclusionStatus TInsertColumnEngineChanges::DoConstructBlobs(TConstructionCont
             auto batchSchema =
                 std::make_shared<arrow::Schema>(inserted.GetMeta().GetSchemaSubset().Apply(blobSchema->GetIndexInfo().ArrowSchema()->fields()));
             batch = std::make_shared<NArrow::TGeneralContainer>(NArrow::DeserializeBatch(blobData, batchSchema));
-            std::set<ui32> columnIdxToDelete = blobSchema->GetColumnIdxsToDelete(resultSchema);
-            if (!columnIdxToDelete.empty()) {
-                batch->DeleteFieldsByIndex(blobSchema->ConvertColumnIdxsToIndexes(columnIdxToDelete));
+            std::set<ui32> columnIdsToDelete = blobSchema->GetColumnIdsToDelete(resultSchema);
+            if (!columnIdsToDelete.empty()) {
+                batch->DeleteFieldsByIndex(blobSchema->ConvertColumnIdsToIndexes(columnIdsToDelete));
             }
         }
         IIndexInfo::AddSnapshotColumns(*batch, inserted.GetSnapshot(), (ui64)inserted.GetInsertWriteId());

ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/source.cpp

@@ -224,9 +224,9 @@ void TCommittedDataSource::DoAssembleColumns(const std::shared_ptr<TColumnsSet>&
         auto rBatch = NArrow::DeserializeBatch(bData, std::make_shared<arrow::Schema>(CommittedBlob.GetSchemaSubset().Apply(schema->fields())));
         AFL_VERIFY(rBatch)("schema", schema->ToString());
         auto batch = std::make_shared<NArrow::TGeneralContainer>(rBatch);
-        std::set<ui32> columnIdxsToDelete = batchSchema->GetColumnIdxsToDelete(resultSchema);
-        if (!columnIdxsToDelete.empty()) {
-            batch->DeleteFieldsByIndex(batchSchema->ConvertColumnIdxsToIndexes(columnIdxsToDelete));
+        std::set<ui32> columnIdsToDelete = batchSchema->GetColumnIdsToDelete(resultSchema);
+        if (!columnIdsToDelete.empty()) {
+            batch->DeleteFieldsByIndex(batchSchema->ConvertColumnIdsToIndexes(columnIdsToDelete));
         }
         TSnapshot ss = TSnapshot::Zero();
         if (CommittedBlob.IsCommitted()) {

ydb/core/tx/columnshard/engines/scheme/versions/abstract_scheme.cpp

@@ -133,7 +133,7 @@ TConclusion<std::shared_ptr<arrow::RecordBatch>> ISnapshotSchema::PrepareForModi
     return batch;
 }
 
-std::set<ui32> ISnapshotSchema::GetColumnIdxsToDelete(const ISnapshotSchema::TPtr& targetSchema) const {
+std::set<ui32> ISnapshotSchema::GetColumnIdsToDelete(const ISnapshotSchema::TPtr& targetSchema) const {
     if (targetSchema->GetVersion() == GetVersion()) {
         return {};
     }
@@ -147,7 +147,7 @@ std::set<ui32> ISnapshotSchema::GetColumnIdxsToDelete(const ISnapshotSchema::TPt
     return columnIdxsToDelete;
 }
 
-std::vector<ui32> ISnapshotSchema::ConvertColumnIdxsToIndexes(const std::set<ui32>& idxs) const {
+std::vector<ui32> ISnapshotSchema::ConvertColumnIdsToIndexes(const std::set<ui32>& idxs) const {
     std::vector<ui32> columnIndexes;
     for (const auto& id : idxs) {
         AFL_VERIFY(HasColumnId(id));

ydb/core/tx/columnshard/engines/scheme/versions/abstract_scheme.h

@@ -77,8 +77,8 @@ class ISnapshotSchema {
         const ISnapshotSchema& dataSchema, const std::shared_ptr<NArrow::TGeneralContainer>& batch, const std::set<ui32>& restoreColumnIds) const;
     [[nodiscard]] TConclusion<std::shared_ptr<arrow::RecordBatch>> PrepareForModification(
         const std::shared_ptr<arrow::RecordBatch>& incomingBatch, const NEvWrite::EModificationType mType) const;
-    std::set<ui32> GetColumnIdxsToDelete(const ISnapshotSchema::TPtr& targetSchema) const;
-    std::vector<ui32> ConvertColumnIdxsToIndexes(const std::set<ui32>& idxs) const;
+    std::set<ui32> GetColumnIdsToDelete(const ISnapshotSchema::TPtr& targetSchema) const;
+    std::vector<ui32> ConvertColumnIdsToIndexes(const std::set<ui32>& idxs) const;
 };
 
 } // namespace NKikimr::NOlap