ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/oup/current/Helper/LevelDB.pas
(Generate patch)

Comparing oup/current/Helper/LevelDB.pas (file contents):
Revision 140 by alloc, Fri Mar 30 01:06:52 2007 UTC vs.
Revision 150 by alloc, Sun Apr 1 18:26:35 2007 UTC

# Line 44 | Line 44 | end;
44  
45  
46   procedure TForm_LevelDB.CreateLevel(Source, Target: String);
47 + const
48 +  EmptyBytes: Array[0..31] of Byte = (
49 +      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 );
50   var
51    DatHeader:        THeader;
52    FilesHeader:      TFilesMap;
# Line 74 | Line 77 | var
77    RawLinks:   TRawDataList;
78  
79    DatFileStream, RawFileStream: TMemoryStream;
77 –
78 – // ###########################
79 –  datsum, linksum, rawsum: Int64;
80 –  freq: Int64;
81 –  tempticks1, tempticks2: Int64;
82 – // ###########################
80   const
81    Steps: Byte = 3;
82  
# Line 297 | Line 294 | begin
294    lbl_estimation.Caption := 'Estimated finishing time: unknown';
295    Application.ProcessMessages;
296  
300 –  QueryPerformanceFrequency(freq);
301 –  datsum := 0;
302 –  linksum := 0;
303 –  rawsum := 0;
304 –
297    FileTime := Time;
298    for FileID := 0 to DatHeader.Files - 1 do
299    begin
# Line 310 | Line 302 | begin
302        FilesHeader[FileID].Extension[j] := FileInfo.Extension[4 - j];
303      if FileInfo.Size > 0 then
304      begin
313 –      QueryPerformanceCounter(tempticks1);
314 –
305        FilesHeader[FileID].DataAddr := Stream_Body.Size + 8;
306        DatFileStream := TMemoryStream.Create;
307        Connection.LoadDatFile(FileID, TStream(DatFileStream));
# Line 320 | Line 310 | begin
310        DatFileStream.Write(tempi, 4);
311        DatFileStream.Write(LevelID, 4);
312  
323 –      QueryPerformanceCounter(tempticks2);
324 –      datsum := datsum + (tempticks2 - tempticks1);
325 –
313        DatLinks := Connection.GetDatLinks(FileID);
314        if Length(DatLinks) > 0 then
315        begin
# Line 337 | Line 324 | begin
324          end;
325        end;
326  
340 –      QueryPerformanceCounter(tempticks1);
341 –      linksum := linksum + (tempticks1 - tempticks2);
342 –
327        RawLinks := Connection.GetRawList(FileID);
328        if Length(RawLinks) > 0 then
329        begin
# Line 354 | Line 338 | begin
338              begin
339                RawLinks[i].RawAddr := Stream_Sep.Size;
340                Stream_sep.CopyFrom(RawFileStream, RawFileStream.Size);
341 +              if (Stream_Sep.Size mod 32) > 0 then
342 +                Stream_Sep.Write(EmptyBytes[0], 32 - (Stream_Sep.Size mod 32));
343              end else begin
344                RawLinks[i].RawAddr := Stream_Raw.Size;
345                Stream_Raw.CopyFrom(RawFileStream, RawFileStream.Size);
346 +              if (Stream_Raw.Size mod 32) > 0 then
347 +                Stream_Raw.Write(EmptyBytes[0], 32 - (Stream_Raw.Size mod 32));
348              end;
349            end else
350              RawLinks[i].RawAddr := 0;
# Line 366 | Line 354 | begin
354        end;
355        DatFileStream.Seek(0, soFromBeginning);
356        Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
357 <
358 <      QueryPerformanceCounter(tempticks2);
359 <      rawsum := rawsum + (tempticks2 - tempticks1);
357 >      if (Stream_Body.Size mod 32) > 0 then
358 >      begin
359 >        ShowMessage(
360 >            IntToStr(FileID) + '-' + FileInfo.Name + '.' + FileInfo.Extension + #13#10 +
361 >            IntToStr(Stream_Body.Size));
362 >        Stream_Body.Write(EmptyBytes[0], 32 - (Stream_Body.Size mod 32));
363 >      end;
364      end
365      else
366        FilesHeader[FileID].DataAddr := 0;
# Line 391 | Line 383 | begin
383      Application.ProcessMessages;
384    end;
385  
394 –  ShowMessage('AvgDats: ' + FloatToStr((datsum / progress.Max) / freq) + #13#10 +
395 –      'AvgLinks: ' + FloatToStr((linksum / progress.Max) / freq) + #13#10 +
396 –      'AvgRaws: ' + FloatToStr((rawsum / progress.Max) / freq)
397 –   );
398 –
386    Stream_Dat.Write(DatHeader, SizeOf(DatHeader));
387    for i := 0 to High(FilesHeader) do
388      Stream_Dat.Write(FilesHeader[i], SizeOf(FilesHeader[i]));
# Line 404 | Line 391 | begin
391    for i := 0 to High(ExtensionsHeader) do
392      Stream_Dat.Write(ExtensionsHeader[i], SizeOf(ExtensionsHeader[i]));
393  
394 +  if (Stream_Dat.Size mod 32) > 0 then
395 +    Stream_Dat.Write(EmptyBytes[0], 32 - (Stream_Dat.Size mod 32));
396 +
397    DatHeader.DataSize  := Stream_Body.Size;
398    DatHeader.NamesSize := Stream_Names.Size;
399    DatHeader.DataAddr  := Stream_Dat.Size;
400  
401    Stream_Body.Seek(0, soFromBeginning);
402    Stream_Dat.CopyFrom(Stream_Body, Stream_Body.Size);
403 +
404 +  if (Stream_Dat.Size mod 32) > 0 then
405 +    Stream_Dat.Write(EmptyBytes[0], 32 - (Stream_Dat.Size mod 32));
406 +
407    DatHeader.NamesAddr := Stream_Dat.Size;
408    Stream_Names.Seek(0, soFromBeginning);
409    Stream_Dat.CopyFrom(Stream_Names, Stream_Names.Size);
# Line 450 | Line 444 | var
444  
445    BeginTime, FileTime: Double;
446    Step:       Integer;
453 –  LevelID:    Integer;
447    TimeFormat: TFormatSettings;
448  
449    ConID:      Integer;
# Line 459 | Line 452 | var
452  
453    FileID:     Integer;
454  
462 –  Strings:    TStrings;
455    i:          Integer;
456    temps:      String;
465 –  tempi:      Integer;
466 –  tempb:      Byte;
457    tempdata:   TByteData;
458    FileInfo:   TFileInfo;
459    DatLinks:   TDatLinkList;
# Line 585 | Line 575 | begin
575    Query.ExecSQL;
576    Query.SQL.Text :=
577      'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
578 <    'src_link_offset INTEGER, target_id INTEGER,  INDEX idsrcid x src_id, ' +
579 <    'INDEX iddestid x target_id);';
578 >    'src_link_offset INTEGER, target_id INTEGER);';
579 >  Query.ExecSQL;
580 >  Query.SQL.Text := 'CREATE INDEX idsrcid ON linkmap (src_id);';
581 >  Query.ExecSQL;
582 >  Query.SQL.Text := 'CREATE INDEX idtargetid ON linkmap (target_id);';
583    Query.ExecSQL;
584    Query.SQL.Text :=
585      'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
586      'src_link_offset INTEGER, sep BOOLEAN, size INTEGER, ' +
587 <    'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib, ' +
595 <    'INDEX idsrcid x src_id);';
587 >    'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib);';
588    //    Query.SQL.Text:='CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
589    Query.ExecSQL;
590 +  Query.SQL.Text := 'CREATE INDEX idsrcid ON rawmap (src_id);';
591 +  Query.ExecSQL;
592    Query.SQL.Text :=
593      'CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), ' +
594      'name STRING(128), contenttype INTEGER, size INTEGER, ' +
# Line 631 | Line 625 | begin
625    DoStep('Writing .dat-fileslist');
626    Application.ProcessMessages;
627  
628 +  FileTime := Time;
629    Database.StartTransaction;
630    for FileID := 0 to Connection.GetFileCount - 1 do
631    begin
# Line 705 | Line 700 | begin
700      end;
701      if ((FileID mod 10) = 0) and (FileID >= 100) then
702        lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
703 <        (Time - BeginTime) / FileID * (progress.Max - FileID + 1) * 1.1, timeformat );
703 >        (Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, timeformat );
704      progress.Position := FileID;
705      lbl_progress.Caption := 'Files done: ' + IntToStr(FileID) + '/' + IntToStr(progress.Max);
706      Application.ProcessMessages;

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)