Improvements on AbstractMem

src/libraries/abstractmem/UAbstractMemBTree.pas

@@ -113,8 +113,9 @@ type
     constructor Create(AAbstractMem : TAbstractMem; const AInitialZone: TAMZone; AAllowDuplicates : Boolean; AOrder : Integer; const AOnCompareAbstractMemDataMethod: TComparison<TBTreeData>);
     procedure Add(); reintroduce;
     procedure Delete(); reintroduce;
-    function FindData(const AData: TBTreeData; out APosition : TAbstractMemPosition; out AFoundData : TBTreeData) : Boolean; overload;
-    function FindData(const AData: TBTreeData; out APosition : TAbstractMemPosition) : Boolean; overload;
+    function FindData(const AData: TBTreeData; out APosition : TAbstractMemPosition; var AFoundData : TBTreeData) : Boolean; overload;
+    function FindData(const AData: TBTreeData; var AFoundData : TBTreeData) : Boolean; overload;
+    function FindDataPos(const AData: TBTreeData; out APosition : TAbstractMemPosition) : Boolean;
     function FindDataPrecessor(const AData : TBTreeData; var APrecessor : TBTreeData) : Boolean;
     function FindDataSuccessor(const AData : TBTreeData; var ASuccessor : TBTreeData) : Boolean;
     function FindDataLowest(out ALowest : TBTreeData) : Boolean;
@@ -559,9 +560,9 @@ begin
 end;
 
 function TAbstractMemBTreeDataAbstract<TBTreeData>.FindData(const AData: TBTreeData;
-  out APosition: TAbstractMemPosition; out AFoundData : TBTreeData): Boolean;
+  out APosition: TAbstractMemPosition; var AFoundData : TBTreeData): Boolean;
 begin
-  if FindData(AData,APosition) then begin
+  if FindDataPos(AData,APosition) then begin
     Result := True;
     AFoundData := LoadData(APosition);
   end else begin
@@ -572,6 +573,13 @@ begin
 end;
 
 function TAbstractMemBTreeDataAbstract<TBTreeData>.FindData(
+  const AData: TBTreeData; var AFoundData: TBTreeData): Boolean;
+var LPos : TAbstractMemPosition;
+begin
+  Result := FindData(AData,LPos,AFoundData);
+end;
+
+function TAbstractMemBTreeDataAbstract<TBTreeData>.FindDataPos(
   const AData: TBTreeData; out APosition: TAbstractMemPosition): Boolean;
 begin
   FAbstractBTreeLock.Acquire;
@@ -657,7 +665,7 @@ begin
   while (Result) and (i<FIndexes.Count) do begin
     LBTreeIndex := TAbstractMemBTreeDataIndex<TBTreeData>(FIndexes.Items[i]);
     if (Not LBTreeIndex.AllowDuplicates) then begin
-      Result :=  Not (LBTreeIndex.FindData(AData,LIndexPosition));
+      Result :=  Not (LBTreeIndex.FindDataPos(AData,LIndexPosition));
     end;
     inc(i);
   end;
@@ -696,12 +704,12 @@ begin
   while (Result) and (i<FIndexes.Count) do begin
     LBTreeIndex := TAbstractMemBTreeDataIndex<TBTreeData>(FIndexes.Items[i]);
     if (Not LBTreeIndex.AllowDuplicates) then begin
-      Result :=  Not (LBTreeIndex.FindData(AData,LIndexPosition));
+      Result :=  Not (LBTreeIndex.FindDataPos(AData,LIndexPosition));
     end;
     inc(i);
   end;
   if (Result) And (Not AllowDuplicates) then begin
-    Result := Not FindData(AData,LIndexPosition);
+    Result := Not FindDataPos(AData,LIndexPosition);
   end;
 end;
 
@@ -734,11 +742,11 @@ var LAbstractMemPos, LindexPosition : TAbstractMemPosition;
   i : Integer;
   LBTreeIndex : TAbstractMemBTreeDataIndex<TBTreeData>;
 begin
-  if FindData(AData,LAbstractMemPos) then begin
+  if FindDataPos(AData,LAbstractMemPos) then begin
     // Delete from indexes
     for i := 0 to FIndexes.Count-1 do begin
       LBTreeIndex := TAbstractMemBTreeDataIndex<TBTreeData>(FIndexes.Items[i]);
-      if Not LBTreeIndex.FindData(AData,LindexPosition) then raise EAbstractMemBTree.Create(Format('Fatal error Data not found in index %d/%d to Delete from pos %s',[i+1,Findexes.Count,LAbstractMemPos.ToHexString]));
+      if Not LBTreeIndex.FindDataPos(AData,LindexPosition) then raise EAbstractMemBTree.Create(Format('Fatal error Data not found in index %d/%d to Delete from pos %s',[i+1,Findexes.Count,LAbstractMemPos.ToHexString]));
       if not LBTreeIndex.DeleteInherited(LindexPosition) then raise EAbstractMemBTree.Create(Format('Fatal error Data not deleted in index %d/%d from pos %s at pos %s',[i+1,Findexes.Count,LAbstractMemPos.ToHexString,LindexPosition.ToHexString]));
       FAbstractMem.Dispose(LindexPosition);
     end;

src/libraries/abstractmem/UFileMem.pas

@@ -260,8 +260,8 @@ begin
       SaveHeader;
     finally
       FIsFlushingCache := False;
+      FLock.Release;
     end;
-    FLock.Release;
   end;
 end;
 

src/libraries/abstractmem/UOrderedList.pas

@@ -69,6 +69,7 @@ type
     Function IndexOf(const AValue: T) : Integer;
     property AllowDuplicates : Boolean read FAllowDuplicates;
     property OnComparer : TComparison<T> read FOnCompare;
+    property Items[index:Integer] : T read Get; default;
   End;
 
 // Default Ordered functions

src/libraries/abstractmem/tests/src/UAbstractMemBTree.Tests.pas

@@ -403,6 +403,7 @@ var
   intValue, nRounds, nAdds, nDeletes, i, intAux : Integer;
   LCurr, LnextCurr : String;
   begin
+    nRounds := 0; nAdds := 0; nDeletes := 0;
     repeat
       inc(nRounds);
       intValue := Random(AOrder * 100);
@@ -420,7 +421,7 @@ var
     // Delete mode
     while Lbt.Count>0 do begin
       if not Lbt.FindDataLowest(LCurr) then raise Exception.Create('Cannot fint lowest but Count>0');
-      if not Lbt.FindData(LCurr,LzoneIndex.position) then raise Exception.Create(Format('"%s" Not Found %d',[LCurr,Lbt.Count]));
+      if not Lbt.FindDataPos(LCurr,LzoneIndex.position) then raise Exception.Create(Format('"%s" Not Found %d',[LCurr,Lbt.Count]));
       while (Random(50)>0) do begin
         if Random(3)=0 then begin
           if not Lbt.FindDataPrecessor(Lcurr,LnextCurr) then begin