Merge pull request #6 from formeo/feature/refactoring

huge refactoring

Author: formeo

.gitignore

@@ -64,3 +64,5 @@ __recovery/
 
 # Castalia statistics file (since XE7 Castalia is distributed with Delphi)
 *.stat
+* .idea
+* 

FirebirdRepairBase.dpr

@@ -15,7 +15,8 @@ uses
   uPageAnalyzer in 'uPageAnalyzer.pas',
   uBtreePage in 'uBtreePage.pas',
   uDatabaseStats in 'uDatabaseStats.pas',
-  uFlagManager in 'uFlagManager.pas';
+  uFlagManager in 'uFlagManager.pas',
+  uRecordParser in 'uRecordParser.pas';
 
 {$R *.res}
 

FirebirdRepairBase.dproj

@@ -122,6 +122,7 @@
         <DCCReference Include="uBtreePage.pas"/>
         <DCCReference Include="uDatabaseStats.pas"/>
         <DCCReference Include="uFlagManager.pas"/>
+        <DCCReference Include="uRecordParser.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

main.pas

@@ -5,9 +5,9 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, FileCtrl, ComCtrls, uStructs, DB, ExtCtrls,
-  Menus, uCommon, uDatabase, XPMan, uDataPage, Grids, DBGrids, DBClient,
+  Menus, uCommon,  XPMan, uDataPage, Grids, DBGrids, DBClient,
   DBCtrls, Spin, Vcl.Buttons,
-  uPageAnalyzer, uDatabaseStats, uFlagManager;
+  uPageAnalyzer, uDatabaseStats, uFlagManager, StrUtils;
 
 type
   TfrmMain = class(TForm)
@@ -200,6 +200,7 @@ procedure TfrmMain.btnReWriteClick(Sender: TObject);
   PageInfo: TPageInfo;
   NewPageBuffer: TBytes;
   FileStream: TFileStream;
+  ModifiedHeader: TPag; // --- ÄÎÁÀÂËÅÍÎ ---
 begin
   // ReWriting page - ÂÍÈÌÀÍÈÅ: Ýòî ÎÏÀÑÍÀß îïåðàöèÿ!
   if Application.MessageBox('Do You Want to Rewrite Database Page? THIS IS DANGEROUS!',
@@ -214,10 +215,18 @@ procedure TfrmMain.btnReWriteClick(Sender: TObject);
       PageInfo := FPageAnalyzer.GetPageInfo(PageNum);
       NewPageBuffer := Copy(PageInfo.Buffer); // Êîïèðóåì òåêóùèé áóôåð
 
-      // Ìîäèôèöèðóåì çàãîëîâîê â áóôåðå
-      TPag(NewPageBuffer[0]).pag_checksum := UShort(NewChecksum);
+      // --- ÈÑÏÐÀÂËÅÍÈÅ: Èñïîëüçóåì Move äëÿ áåçîïàñíîãî êîïèðîâàíèÿ è èçìåíåíèÿ çàãîëîâêà ---
+      // Ñêîïèðóåì ñòàíäàðòíûé çàãîëîâîê èç áóôåðà â ëîêàëüíóþ ïåðåìåííóþ
+      Move(NewPageBuffer[0], ModifiedHeader, SizeOf(TPag));
+
+      // Èçìåíèì ïîëÿ â ëîêàëüíîé ïåðåìåííîé
+      ModifiedHeader.pag_checksum := UShort(NewChecksum);
       if (NewType >= 0) and (NewType <= $FF) then // Ïðîâåðÿåì äèàïàçîí
-        TPag(NewPageBuffer[0]).pag_type := SChar(NewType);
+        ModifiedHeader.pag_type := SChar(NewType);
+
+      // Ñêîïèðóåì èçìåí¸ííóþ ëîêàëüíóþ ïåðåìåííóþ îáðàòíî â áóôåð
+      Move(ModifiedHeader, NewPageBuffer[0], SizeOf(TPag));
+      // --- ÊÎÍÅÖ ÈÑÏÐÀÂËÅÍÈß ---
 
       // Çàïèñûâàåì èçìåí¸ííûé áóôåð îáðàòíî â ôàéë
       FileStream := TFileStream.Create(FPageAnalyzer.FileName, fmOpenReadWrite or fmShareExclusive);
@@ -290,20 +299,19 @@ procedure TfrmMain.btnGetHeaderFlagsClick(Sender: TObject);
   try
     Flags := FFlagManager.GetFlags;
 
-    // Ôîðìèðóåì ñòðîêó äëÿ îòîáðàæåíèÿ (íàïðèìåð, áèíàðíîå ïðåäñòàâëåíèå èëè ïðîñòî ñïèñîê)
-    // Äëÿ ïðîñòîòû, âûâåäåì ñïèñîê àêòèâíûõ ôëàãîâ
+
     edtFlags.text := 'Active flags: ';
     if Flags.ActiveShadow then edtFlags.text := edtFlags.text + 'ActiveShadow, ';
     if Flags.ForceWrite then edtFlags.text := edtFlags.text + 'ForceWrite, ';
     if Flags.NoChecksums then edtFlags.text := edtFlags.text + 'NoChecksums, ';
     if Flags.NoReserve then edtFlags.text := edtFlags.text + 'NoReserve, ';
     if Flags.SqlDialect3 then edtFlags.text := edtFlags.text + 'SqlDialect3, ';
     if Flags.ReadOnly then edtFlags.text := edtFlags.text + 'ReadOnly, ';
-    // Óáèðàåì ïîñëåäíþþ çàïÿòóþ
-    if edtFlags.text.EndsWith(', ') then
-      edtFlags.text := edtFlags.text.Remove(edtFlags.text.Length - 2);
 
-    // Èëè ìîæíî âûâåñòè âñå ôëàãè ñ óêàçàíèåì ñòàòóñà
+    if EndsStr(', ', edtFlags.text) then // Èñïîëüçóåì EndsStr èç StrUtils
+      edtFlags.text := Copy(edtFlags.text, 1, Length(edtFlags.text) - 2); // Óäàëÿåì ïîñëåäíèå 2 ñèìâîëà
+
+
     lstDBFlags.Items.Add(Format('Active Shadow: %s', [BoolToStr(Flags.ActiveShadow, True)]));
     lstDBFlags.Items.Add(Format('Force Write: %s', [BoolToStr(Flags.ForceWrite, True)]));
     lstDBFlags.Items.Add(Format('No Checksums: %s', [BoolToStr(Flags.NoChecksums, True)]));
@@ -348,28 +356,28 @@ procedure TfrmMain.checkDB;
     lstLog.Items.Add('Database page size: ' + IntToStr(FPageAnalyzer.PageSize));
     lstLog.Items.Add('Scanning pages...');
 
-    // Âû÷èñëÿåì ñòàòèñòèêó ÷åðåç FDatabaseStats
+
     FDatabaseStats.CalculateStats;
 
-    // Ïîëó÷àåì ðåçóëüòàòû
+
     PageStats := FDatabaseStats.PageStats;
     TxStats := FDatabaseStats.TransactionStats;
     RelStats := FDatabaseStats.RelationStats;
 
-    // Îáíîâëÿåì ïðîãðåññ áàð (äëÿ íàãëÿäíîñòè, õîòÿ òåïåðü ýòî áûñòðî)
+
     pbDetectedPage.Min := 0;
-    pbDetectedPage.Max := 100; // Óñëîâíî
+    pbDetectedPage.Max := 100;
     pbDetectedPage.Position := 100;
 
-    // Âûâîäèì ðåçóëüòàòû ïîäñ÷åòà
+
     lstLog.Items.Add('--- Page Type Summary ---');
     lstLog.Items.Add('Count Header Pages: ' + IntToStr(PageStats.HeaderPages));
     lstLog.Items.Add('Count Page Inventory Pages (PIP): ' + IntToStr(PageStats.PipPages));
     lstLog.Items.Add('Count Transaction Inventory Pages (TIP): ' + IntToStr(PageStats.TipPages));
     lstLog.Items.Add('Count Pointer Pages: ' + IntToStr(PageStats.PointerPages));
     lstLog.Items.Add('Count Data Pages: ' + IntToStr(PageStats.DataPages));
     lstLog.Items.Add('Count Index Root Pages: ' + IntToStr(PageStats.IndexRootPages));
-    lstLog.Items.Add('Count Index B-Tree Pages: ' + IntToStr(PageStats.IndexBtreePages)); // Èñïðàâëåíî
+    lstLog.Items.Add('Count Index B-Tree Pages: ' + IntToStr(PageStats.IndexBtreePages));
     lstLog.Items.Add('Count Blob Pages: ' + IntToStr(PageStats.BlobPages));
     lstLog.Items.Add('Count Generator Pages: ' + IntToStr(PageStats.GeneratorPages));
     lstLog.Items.Add('Count Write Ahead Log Pages: ' + IntToStr(PageStats.WalPages));
@@ -415,12 +423,10 @@ procedure TfrmMain.btnWriteFlagsClick(Sender: TObject);
   try
     NewFlags := FFlagManager.GetFlags;
 
-    // Îáíîâëÿåì ôëàãè â ñîîòâåòñòâèè ñ ÷åêáîêñàìè
+
     NewFlags.ForceWrite := chkSetFW.Checked;
     NewFlags.ReadOnly := chkReadOnly.Checked;
-    // Äîáàâüòå äðóãèå ôëàãè ïî íåîáõîäèìîñòè
 
-    // Óñòàíàâëèâàåì ôëàãè ÷åðåç FFlagManager
     FFlagManager.SetFlags(NewFlags);
 
     Application.MessageBox('Header flags updated!', 'Information', MB_OK + MB_ICONINFORMATION);
@@ -452,14 +458,14 @@ procedure TfrmMain.UpdateFlagCheckboxesFromManager;
   end;
 end;
 
-// tsFlagsShow - òåïåðü èñïîëüçóåò UpdateFlagCheckboxesFromManager
+
 procedure TfrmMain.tsFlagsShow(Sender: TObject);
 begin
-  // Îáíîâëÿåì ÷åêáîêñû ïðè ïîêàçå âêëàäêè
+
   UpdateFlagCheckboxesFromManager;
 end;
 
-// pgcServicesChange - îáíîâëÿåò MaxValue äëÿ sePosition
+
 procedure TfrmMain.pgcServicesChange(Sender: TObject);
 begin
   if tsGenerateNewPage.Showing then
@@ -513,15 +519,13 @@ procedure TfrmMain.btnGotoPageClick(Sender: TObject);
     end;
 
     btnGotoPage.Enabled := False;
-    mmoData.Clear; // Î÷èùàåì Memo ïåðåä âûâîäîì
-
-    // Èñïîëüçóåì ôóíêöèþ èç uDataPage äëÿ èçâëå÷åíèÿ ôðàãìåíòîâ
+    mmoData.Clear;
     PageFragments := ExtractDataFragments(PageInfo.Buffer, PageInfo.Size);
 
     pbDataProgress.Min := 0;
-    pbDataProgress.Max := Length(PageFragments) - 1; // Êîëè÷åñòâî ôðàãìåíòîâ
+    pbDataProgress.Max := Length(PageFragments) - 1;
 
-    for i := 0 to High(PageFragments) do // Èñïîëüçóåì High äëÿ ìàññèâà
+    for i := 0 to High(PageFragments) do
     begin
       pbDataProgress.Position := i;
       mmoData.Lines.Add('Fragment ' + IntToStr(i) + ', Offset: ' + IntToStr(PageFragments[i].Offset));

uBtreePage.pas

@@ -3,7 +3,7 @@
 interface
 
 uses
-  Windows, SysUtils, uStructs;
+  Windows, SysUtils, uStructs, Math;
 
 const
   pag_left  = $01; // Ýòî ñàìàÿ ëåâàÿ ñòðàíèöà â óðîâíå
@@ -16,7 +16,6 @@ interface
   key_dupeq  = $08; // Êëþ÷ ïîìå÷åí êàê äóáëèêàò (äëÿ óíèêàëüíûõ èíäåêñîâ)
 
 type
-  // Ôèêñèðîâàííàÿ ÷àñòü çàãîëîâêà B-Tree ñòðàíèöû
   TBtreePageHeader = packed record
     pag_header: TPag;  // 0x00-0x0F - Ñòàíäàðòíûé çàãîëîâîê
     pag_next: SLong;   // 0x10-0x13 - Óêàçàòåëü íà ñëåäóþùóþ ñòðàíèöó (ëèñò)
@@ -28,27 +27,31 @@ interface
     // pag_keys íà÷èíàåòñÿ ñ áàéòà 0x20
   end;
 
-  // Òèï äëÿ ïðåäñòàâëåíèÿ îäíîãî êëþ÷à
+
   TBtreeKey = record
     Length: UShort;
     Flags: SChar;
-    Data: TBytes; // Äàííûå êëþ÷à
-    PageOrRecordNumber: SLong; // Äëÿ âíóòðåííèõ óçëîâ - íîìåð ñòðàíèöû, äëÿ ëèñòüåâ - íîìåð çàïèñè
+    Data: TBytes;
+    PageOrRecordNumber: SLong;
   end;
 
-  // Òèï äëÿ ìàññèâà êëþ÷åé
+
   TBtreeKeyArray = array of TBtreeKey;
 
-  // Êëàññ äëÿ àíàëèçà B-Tree ñòðàíèöû
+
   TBtreePageAnalyzer = class
   private
     FPageSize: Integer;
     FPageNumber: ULong; // Íîìåð ñàìîé B-Tree ñòðàíèöû (ïåðåäà¸òñÿ äëÿ êîíòåêñòà)
     FHeader: TBtreePageHeader;
     FPageData: TBytes; // Äàííûå âñåé ñòðàíèöû (äëÿ èçâëå÷åíèÿ êëþ÷åé)
 
-    // Âíóòðåííÿÿ ôóíêöèÿ äëÿ ïîëó÷åíèÿ êëþ÷à ïî ñìåùåíèþ
+
     function GetKeyAtOffset(Offset: Integer): TBtreeKey;
+
+    function GetIsLeaf: Boolean;
+    function GetIsRoot: Boolean;
+    function GetIsLeftmost: Boolean;
   public
     // Êîíñòðóêòîð - ïðèíèìàåò áàéòû ñòðàíèöû, ðàçìåð ñòðàíèöû è íîìåð ñòðàíèöû
     constructor Create(const PageBuffer: TBytes; PageSize: Integer; PageNum: ULong);
@@ -67,11 +70,11 @@   TBtreePageAnalyzer = class
     // Ïîëó÷èòü íîìåð ðîäèòåëüñêîé ñòðàíèöû
     property ParentPage: SLong read FHeader.pag_parent;
     // Ýòî ëèñòîâàÿ ñòðàíèöà?
-    property IsLeaf: Boolean read (FHeader.pag_flags and pag_leaf) <> 0;
+    property IsLeaf: Boolean read GetIsLeaf; // Èñïîëüçóåì ìåòîä-ãåòòåð
     // Ýòî êîðíåâàÿ ñòðàíèöà?
-    property IsRoot: Boolean read (FHeader.pag_flags and pag_root) <> 0;
+    property IsRoot: Boolean read GetIsRoot; // Èñïîëüçóåì ìåòîä-ãåòòåð
     // Ýòî ñàìàÿ ëåâàÿ ñòðàíèöà?
-    property IsLeftmost: Boolean read (FHeader.pag_flags and pag_left) <> 0;
+    property IsLeftmost: Boolean read GetIsLeftmost; // Èñïîëüçóåì ìåòîä-ãåòòåð
 
   end;
 
@@ -107,32 +110,31 @@ function TBtreePageAnalyzer.GetKeyAtOffset(Offset: Integer): TBtreeKey;
   KeyFlags: SChar;
   KeyDataOffset, KeyPageOffset: Integer;
 begin
-  // Ïðîâåðÿåì ãðàíèöû
+
   if (Offset + 2 {key_length} + 1 {key_flags} > Length(FPageData)) then
     raise Exception.Create('Invalid offset for key in B-Tree page.');
 
-  // ×èòàåì key_length (2 áàéòà)
   KeyLength := PWord(@FPageData[Offset])^;
   Inc(Offset, 2);
 
-  // ×èòàåì key_flags (1 áàéò)
+
   KeyFlags := PShortInt(@FPageData[Offset])^;
   Inc(Offset, 1);
 
-  // Ïðîâåðÿåì, íå âûõîäèò ëè äëèíà äàííûõ çà ïðåäåëû
+
   if (Offset + KeyLength + 4 {key_page} > Length(FPageData)) then
     raise Exception.Create('Key length exceeds page boundary.');
 
-  // Êîïèðóåì key_data
+
   SetLength(Result.Data, KeyLength);
   if KeyLength > 0 then
     Move(FPageData[Offset], Result.Data[0], KeyLength);
   Inc(Offset, KeyLength);
 
-  // ×èòàåì key_page (4 áàéòà)
+
   Result.PageOrRecordNumber := PLongInt(@FPageData[Offset])^;
 
-  // Çàïîëíÿåì ïîëÿ ðåçóëüòàòà
+
   Result.Length := KeyLength;
   Result.Flags := KeyFlags;
 end;
@@ -145,19 +147,32 @@ function TBtreePageAnalyzer.GetKeys: TBtreeKeyArray;
 begin
   SetLength(Keys, FHeader.pag_count);
 
-  // Ñìåùåíèå íà÷àëà ìàññèâà êëþ÷åé
+
   CurrentOffset := SizeOf(TBtreePageHeader);
 
   for i := 0 to FHeader.pag_count - 1 do
   begin
     Keys[i] := GetKeyAtOffset(CurrentOffset);
-
-    // Âû÷èñëÿåì ñìåùåíèå ñëåäóþùåãî êëþ÷à
-    // key_length(2) + key_flags(1) + key_data(key_length) + key_page(4)
     CurrentOffset := CurrentOffset + 2 + 1 + Keys[i].Length + 4;
   end;
 
   Result := Keys;
 end;
 
+
+function TBtreePageAnalyzer.GetIsLeaf: Boolean;
+begin
+  Result := (FHeader.pag_flags and pag_leaf) <> 0;
+end;
+
+function TBtreePageAnalyzer.GetIsRoot: Boolean;
+begin
+  Result := (FHeader.pag_flags and pag_root) <> 0;
+end;
+
+function TBtreePageAnalyzer.GetIsLeftmost: Boolean;
+begin
+  Result := (FHeader.pag_flags and pag_left) <> 0;
+end;
+
 end.

uDatabaseStats.pas

@@ -162,23 +162,27 @@ procedure TDatabaseStats.CalculateRelationStats;
 var
   PageNum: ULong;
   PageInfo: TPageInfo;
-  DataPageHeader: TData_Page_Fixed_Part;
+  DataPageHeader: TData_Page_Fixed_Part; // Òèï èç uDataPage
   Fragments: TRecordFragmentsArray;
   FoundRelation: Boolean;
   i, j: Integer;
 begin
-  SetLength(FRelationStats, 0);
+  // Èíèöèàëèçèðóåì ìàññèâ ñòàòèñòèêè ïî îòíîøåíèÿì
+  SetLength(FRelationStats, 0); // Ïîêà ïóñòîé
 
   for PageNum := 0 to FPageAnalyzer.GetLastPageNumber do
   begin
     PageInfo := FPageAnalyzer.GetPageInfo(PageNum);
-    if PageInfo.Header.pag_type = pag_data then
+    if PageInfo.Header.pag_type = pag_data then // pag_data = $05
     begin
+      // Ïðîâåðÿåì, äîñòàòî÷íî ëè äàííûõ äëÿ ôèêñèðîâàííîé ÷àñòè çàãîëîâêà Data Page
       if Length(PageInfo.Buffer) >= SizeOf(TData_Page_Fixed_Part) then
       begin
-        DataPageHeader := TData_Page_Fixed_Part(PageInfo.Buffer[0]);
+        // --- ÈÑÏÐÀÂËÅÍÈÅ: Èñïîëüçóåì Move âìåñòî ïðÿìîãî ïðèâåäåíèÿ òèïà ---
+        Move(PageInfo.Buffer[0], DataPageHeader, SizeOf(TData_Page_Fixed_Part));
         var RelationID := DataPageHeader.dpg_relation;
 
+        // Íàéäåì èíäåêñ äëÿ ýòîãî RelationID â ìàññèâå ñòàòèñòèêè
         FoundRelation := False;
         for j := 0 to High(FRelationStats) do
         begin
@@ -190,23 +194,24 @@ procedure TDatabaseStats.CalculateRelationStats;
           end;
         end;
 
-
+        // Åñëè îòíîøåíèÿ íå áûëî â ìàññèâå, äîáàâèì åãî
         if not FoundRelation then
         begin
           SetLength(FRelationStats, Length(FRelationStats) + 1);
           FRelationStats[High(FRelationStats)].RelationID := RelationID;
           FRelationStats[High(FRelationStats)].PageCount := 1;
-          FRelationStats[High(FRelationStats)].RecordCount := 0;
+          FRelationStats[High(FRelationStats)].RecordCount := 0; // Ïîêà 0
         end;
 
-
-        Fragments := ExtractDataFragments(PageInfo.Buffer, PageInfo.Size);
-
+        // Ïðèìåð: ïîäñ÷åò çàïèñåé (ôðàãìåíòîâ) íà ñòðàíèöå
+        // Èçâëåêàåì ôðàãìåíòû
+        Fragments := ExtractDataFragments(PageInfo.Buffer, PageInfo.Size); // ExtractDataFragments èç uDataPage
+        // Íàéäåì èíäåêñ îòíîøåíèÿ ñíîâà äëÿ îáíîâëåíèÿ RecordCount
         for j := 0 to High(FRelationStats) do
         begin
           if FRelationStats[j].RelationID = RelationID then
           begin
-            Inc(FRelationStats[j].RecordCount, Length(Fragments));
+            Inc(FRelationStats[j].RecordCount, Length(Fragments)); // Ïðèáàâëÿåì êîëè÷åñòâî ôðàãìåíòîâ
             Break;
           end;
         end;
@@ -215,6 +220,7 @@ procedure TDatabaseStats.CalculateRelationStats;
   end;
 end;
 
+
 procedure TDatabaseStats.CalculateStats;
 begin
   CalculatePageStats;