Fix comments

ydb-platform · Nov 5, 2024 · 7522317 · 7522317
1 parent cfce444
commit 7522317
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/ydb/core/tx/columnshard/engines/column_engine_logs.cpp b/ydb/core/tx/columnshard/engines/column_engine_logs.cpp
@@ -165,13 +165,17 @@ void TColumnEngineForLogs::RegisterSchemaVersion(const TSnapshot& snapshot, cons
 void TColumnEngineForLogs::RegisterOldSchemaVersion(const TSnapshot& snapshot, const TSchemaInitializationData& schema) {
     AFL_VERIFY(!VersionedIndex.IsEmpty());
 
-    ISnapshotSchema::TPtr prevSchema = VersionedIndex.GetLastSchemaBeforeSnapshot(snapshot);
+    ISnapshotSchema::TPtr prevSchema = VersionedIndex.GetLastSchemaBeforeOrEqualSnapshotOptional(snapshot);
 
     if (prevSchema && snapshot == prevSchema->GetSnapshot()) {
         // skip already registered snapshot
         return;
     }
 
+    ISnapshotSchema::TPtr secondLast = VersionedIndex.GetSecondLastSchemaOptional();
+
+    AFL_VERIFY(!secondLast || secondLast->GetSnapshot() < snapshot)("reason", "incorrect schema registration order");
+
     std::optional<NOlap::TIndexInfo> indexInfoOptional;
     if (schema.GetDiff()) {
         AFL_VERIFY(prevSchema)("reason", "no base schema to apply diff for");

diff --git a/ydb/core/tx/columnshard/engines/scheme/versions/versioned_index.h b/ydb/core/tx/columnshard/engines/scheme/versions/versioned_index.h
@@ -86,14 +86,14 @@ class TVersionedIndex {
 
     ISnapshotSchema::TPtr GetSchema(const TSnapshot& version) const {
         Y_ABORT_UNLESS(!Snapshots.empty());
-        ISnapshotSchema::TPtr res = GetLastSchemaBeforeSnapshot(version);
+        ISnapshotSchema::TPtr res = GetLastSchemaBeforeOrEqualSnapshotOptional(version);
         if (!res) {
             return Snapshots.begin()->second;
         }
         return res;
     }
 
-    ISnapshotSchema::TPtr GetLastSchemaBeforeSnapshot(const TSnapshot& version) const {
+    ISnapshotSchema::TPtr GetLastSchemaBeforeOrEqualSnapshotOptional(const TSnapshot& version) const {
         ISnapshotSchema::TPtr res = nullptr;
         for (auto it = Snapshots.begin(); it != Snapshots.end(); ++it) {
             if (it->first <= version) {
@@ -108,6 +108,15 @@ class TVersionedIndex {
         return Snapshots.rbegin()->second;
     }
 
+    ISnapshotSchema::TPtr GetSecondLastSchemaOptional() const {
+        if (Snapshots.size() < 2) {
+            return nullptr;
+        }
+        auto i = Snapshots.rbegin();
+        ++i;
+        return i->second;
+    }
+
     bool IsEmpty() const {
         return Snapshots.empty();
     }