Check B-Tree index format in loader (#4969)

Author: kunga

ydb/core/tablet_flat/flat_page_btree_index.h

@@ -248,13 +248,15 @@ namespace NKikimr::NTable::NPage {
         };
 
     public:
+        // Version = 0 didn't have GroupDataSize field
+        static const ui16 FormatVersion = 1;
+
         TBtreeIndexNode(TSharedData raw)
             : Raw(std::move(raw))
         {
             const auto data = NPage::TLabelWrapper().Read(Raw, EPage::BTreeIndex);
 
-            // Version = 0 didn't have GroupDataSize field
-            Y_ABORT_UNLESS(data == ECodec::Plain && data.Version == 1);
+            Y_ABORT_UNLESS(data == ECodec::Plain && data.Version == FormatVersion);
 
             Header = TDeref<const THeader>::At(data.Page.data());
             size_t offset = sizeof(THeader);

ydb/core/tablet_flat/flat_page_btree_index_writer.h

@@ -97,7 +97,7 @@ namespace NKikimr::NTable::NPage {
             Ptr = buf.mutable_begin();
             End = buf.end();
 
-            WriteUnaligned<TLabel>(Advance(sizeof(TLabel)), TLabel::Encode(EPage::BTreeIndex, 1, pageSize));
+            WriteUnaligned<TLabel>(Advance(sizeof(TLabel)), TLabel::Encode(EPage::BTreeIndex, TBtreeIndexNode::FormatVersion, pageSize));
 
             auto &header = Place<THeader>();
             header.KeysCount = Keys.size();

ydb/core/tablet_flat/flat_part_loader.cpp

@@ -79,17 +79,19 @@ void TLoader::StageParseMeta() noexcept
 
         BTreeGroupIndexes.clear();
         BTreeHistoricIndexes.clear();
-        for (bool history : {false, true}) {
-            for (const auto &meta : history ? layout.GetBTreeHistoricIndexes() : layout.GetBTreeGroupIndexes()) {
-                NPage::TBtreeIndexMeta converted{{
-                    meta.GetRootPageId(), 
-                    meta.GetRowCount(), 
-                    meta.GetDataSize(),
-                    meta.GetGroupDataSize(),
-                    meta.GetErasedRowCount()}, 
-                    meta.GetLevelCount(), 
-                    meta.GetIndexSize()};
-                (history ? BTreeHistoricIndexes : BTreeGroupIndexes).push_back(converted);
+        if (layout.HasBTreeIndexesFormatVersion() && layout.GetBTreeIndexesFormatVersion() == NPage::TBtreeIndexNode::FormatVersion) {
+            for (bool history : {false, true}) {
+                for (const auto &meta : history ? layout.GetBTreeHistoricIndexes() : layout.GetBTreeGroupIndexes()) {
+                    NPage::TBtreeIndexMeta converted{{
+                        meta.GetRootPageId(), 
+                        meta.GetRowCount(), 
+                        meta.GetDataSize(),
+                        meta.GetGroupDataSize(),
+                        meta.GetErasedRowCount()}, 
+                        meta.GetLevelCount(), 
+                        meta.GetIndexSize()};
+                    (history ? BTreeHistoricIndexes : BTreeGroupIndexes).push_back(converted);
+                }
             }
         }
 

ydb/core/tablet_flat/flat_part_writer.h

@@ -667,16 +667,19 @@ namespace NTable {
                     lay->AddHistoricIndexes(page);
                 }
 
-                for (bool history : {false, true}) {
-                    for (auto meta : history ? Current.BTreeHistoricIndexes : Current.BTreeGroupIndexes) {
-                        auto m = history ? lay->AddBTreeHistoricIndexes() : lay->AddBTreeGroupIndexes();
-                        m->SetRootPageId(meta.PageId);
-                        m->SetLevelCount(meta.LevelCount);
-                        m->SetIndexSize(meta.IndexSize);
-                        m->SetDataSize(meta.DataSize);
-                        m->SetGroupDataSize(meta.GroupDataSize);
-                        m->SetRowCount(meta.RowCount);
-                        m->SetErasedRowCount(meta.ErasedRowCount);
+                if (WriteBTreeIndex) {
+                    lay->SetBTreeIndexesFormatVersion(NPage::TBtreeIndexNode::FormatVersion);
+                    for (bool history : {false, true}) {
+                        for (auto meta : history ? Current.BTreeHistoricIndexes : Current.BTreeGroupIndexes) {
+                            auto m = history ? lay->AddBTreeHistoricIndexes() : lay->AddBTreeGroupIndexes();
+                            m->SetRootPageId(meta.PageId);
+                            m->SetLevelCount(meta.LevelCount);
+                            m->SetIndexSize(meta.IndexSize);
+                            m->SetDataSize(meta.DataSize);
+                            m->SetGroupDataSize(meta.GroupDataSize);
+                            m->SetRowCount(meta.RowCount);
+                            m->SetErasedRowCount(meta.ErasedRowCount);
+                        }
                     }
                 }
 

ydb/core/tablet_flat/protos/flat_table_part.proto

@@ -46,6 +46,7 @@ message TLayout {
     optional uint32 TxIdStats = 10; // EPage::TxIdStats for uncommitted deltas
     repeated TBTreeIndexMeta BTreeGroupIndexes = 11;
     repeated TBTreeIndexMeta BTreeHistoricIndexes = 12;
+    optional uint32 BTreeIndexesFormatVersion = 13;
 }
 
 message TStat {