From 9fad381d29e4533cd1ab6ccf9f8bff64f60b1b4c Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Fri, 13 Aug 2004 07:06:02 +0000
Subject: [PATCH] + Rework of buffer management by Joost Van der Sluis

---
 fcl/db/Dataset.txt       |   5 +-
 fcl/db/dataset.inc       | 491 +++++++++++++++++----------------------
 fcl/db/db.pp             |  19 +-
 fcl/db/dbs.inc           |   6 +-
 fcl/db/odbc/testodbc.mdb | Bin 81921 -> 4295 bytes
 5 files changed, 227 insertions(+), 294 deletions(-)

diff --git a/fcl/db/Dataset.txt b/fcl/db/Dataset.txt
index d84f929385..5bff522208 100644
--- a/fcl/db/Dataset.txt
+++ b/fcl/db/Dataset.txt
@@ -13,7 +13,6 @@ General remarks
 
 - All fields and descendents implemented.
 - No calculated fields.
-- No Datasource yet. (although DataEvent is implemented in TField)
 - No persistent fields; this must be added later.
 
 
@@ -38,7 +37,7 @@ The Buffers
 A buffer contains all the data for 1 record of the dataset, and also
 the bookmark information. (bookmarkinformation is REQUIRED)
 
-The dataset allocates by default 'DefultBufferCount+1' records(buffers)
+The dataset allocates by default 'DefaultBufferCount+1' records(buffers)
 This constant can be changed, at the beginning of dataset.inc;
 if you know you'll be working with big datasets, you can 
 increase this constant.
@@ -49,7 +48,7 @@ The following constants are userd when handling this array:
 FBuffercount : The number of buffers allocated, minus one.
 FRecordCount : The number of buffers that is actually filled in.
 FActiveBuffer : The index of the active record.
-FCurrentRecord : The current Buffer. Should be phased out.
+FCurrentRecord : The current record in the underlaying dataset.
 
 So the following picture follows from this:
 
diff --git a/fcl/db/dataset.inc b/fcl/db/dataset.inc
index 5908dbebb8..9f106d1c70 100644
--- a/fcl/db/dataset.inc
+++ b/fcl/db/dataset.inc
@@ -56,13 +56,12 @@ begin
   Inherited Destroy;
 end;
 
-
+// This procedure must be called when the first record is made/read
 Procedure TDataset.ActivateBuffers;
 
 begin
   FBOF:=False;
   FEOF:=False;
-  FRecordCount:=1;
   FActiveRecord:=0;
 end;
 
@@ -74,7 +73,7 @@ end;
 
 Procedure TDataset.BindFields(Binding: Boolean);
 
-Var I : longint;
+// Var I : longint;
 
 begin
   {
@@ -313,7 +312,6 @@ end;
 Procedure TDataset.DoInternalOpen;
 
 begin
-  FBufferCount:=0;
   FDefaultFields:=FieldCount=0;
   DoBeforeOpen;
   Try
@@ -323,20 +321,10 @@ begin
     InternalOpen;
     FBOF:=True;
 {$ifdef dsdebug}
-    Writeln ('Setting buffer size');
+    Writeln ('Calling RecalcBufListSize');
 {$endif}
-{$ifdef dsdebug}
-    Writeln ('Setting buffer size');
-{$endif}
-    (*
-    SetBufListSize(DefaultBufferCount);
-    {$ifdef dsdebug}
-    Writeln ('Getting next records');
-    {$endif}
-    GetNextRecords;
-    *)
+    FRecordcount := 0;
     RecalcBufListSize;
-    //SetBufferCount(DefaultBufferCount);
 {$ifdef dsdebug}
     Writeln ('Setting state to browse');
 {$endif}
@@ -350,16 +338,6 @@ begin
   end;
 end;
 
-Function TDataset.RequiredBuffers : longint;
-{
-  If later some datasource requires more buffers (grids etc)
-  then it should be taken into account here...
-}
-
-begin
-  Result:=0;
-end;
-
 Procedure TDataset.DoInternalClose;
 
 begin
@@ -431,7 +409,7 @@ end;
 Function TDataset.GetCanModify: Boolean;
 
 begin
-  Result:=True;
+  Result:= not FIsUnidirectional;
 end;
 
 Procedure TDataset.GetChildren(Proc: TGetChildProc; Root: TComponent);
@@ -514,43 +492,40 @@ begin
   //!! To be implemented
 end;
 
+
 Function TDataset.GetNextRecord: Boolean;
 
-Var Shifted : Boolean;
+  procedure ExchangeBuffers(var buf1,buf2 : pointer);
+
+  var tempbuf : pointer;
+
+  begin
+    tempbuf := buf1;
+    buf1 := buf2;
+    buf2 := tempbuf;
+  end;
 
 begin
 {$ifdef dsdebug}
   Writeln ('Getting next record. Internal RecordCount : ',FRecordCount);
-{$endif}
-  Shifted:=FRecordCount=FBufferCount;
-  If Shifted then
-    begin
-    ShiftBuffers(0,1);
-    Dec(FRecordCount);
-    end;
-{$ifdef dsdebug}
-  Writeln ('Getting data into buffer : ',FRecordCount);
 {$endif}
   If FRecordCount>0 Then SetCurrentRecord(FRecordCount-1);
-  Result:=GetRecord(FBuffers[FRecordCount],gmNext,True)=grOK;
-  If Result then
+  Result:=GetRecord(FBuffers[FBuffercount],gmNext,True)=grOK;
+
+  if result then
     begin
-    If FRecordCount=0 then
-      ActivateBuffers
-    else
-      If FRecordCount<FBufferCount then
-        Inc(FRecordCount);
-    FCurrentRecord:=FRecordCount - 1;
+      If FRecordCount=0 then ActivateBuffers;
+      if FRecordcount=FBuffercount then
+        shiftbuffersbackward
+      else
+        begin
+          inc(FRecordCount);
+          FCurrentRecord:=FRecordCount - 1;
+          ExchangeBuffers(Fbuffers[FCurrentRecord],FBuffers[FBuffercount]);
+        end;
     end
   else
-    begin
-    if shifted then
-      begin
-      ShiftBuffers(0,-1);
-      inc(FRecordCount);
-      end;
-    CursorPosChanged;
-    end;
+    cursorposchanged;
 {$ifdef dsdebug}
   Writeln ('Result getting next record : ',Result);
 {$endif}
@@ -566,44 +541,31 @@ begin
   While (FRecordCount<FBufferCount) and GetNextRecord do
     Inc(Result);
 {$ifdef dsdebug}
-  Writeln ('Result Getting next record(s), GOT :',RESULT);
+  Writeln ('Result Getting next record(S), GOT :',RESULT);
 {$endif}
 end;
 
 Function TDataset.GetPriorRecord: Boolean;
 
-Var Shifted : boolean;
-
 begin
 {$ifdef dsdebug}
   Writeln ('GetPriorRecord: Getting previous record');
 {$endif}
-  Shifted:=FRecordCount>0;
-  If Shifted Then
+  If FRecordCount>0 Then SetCurrentRecord(0);
+  Result:=GetRecord(FBuffers[FBuffercount],gmPrior,True)=grOK;
+  if result then
     begin
-    SetCurrentRecord(0);
-    ShiftBuffers(0,-1);
-    end;
-  Result:=GetRecord(FBuffers[0],gmPrior,True)=grOK;
-  If Result then
-    begin
-    If FRecordCount=0 then
-      ActivateBuffers
-    else
-      begin
-      If FrecordCount<FBufferCount then
-        Inc(FRecordCount);
-      end;
-    FCurrentRecord:=0;
+      If FRecordCount=0 then ActivateBuffers;
+      shiftbuffersforward;
+
+      if FRecordcount<FBuffercount then
+        inc(FRecordCount);
     end
   else
-    begin
-    If Shifted then
-      begin
-      ShiftBuffers(0,1);
-      end;
-    CursorPosChanged;
-    end;
+    cursorposchanged;
+{$ifdef dsdebug}
+  Writeln ('Result getting prior record : ',Result);
+{$endif}
 end;
 
 Function TDataset.GetPriorRecords: Longint;
@@ -678,10 +640,19 @@ begin
   //!! To be implemented
 end;
 
+Function TDataset.SetTempState(const Value: TDataSetState): TDataSetState;
+
+begin
+  result := FState;
+  FState := value;
+  inc(FDisableControlsCount);
+end;
+
 Procedure TDataset.RestoreState(const Value: TDataSetState);
 
 begin
-  //!! To be implemented
+  FState := value;
+  dec(FDisableControlsCount);
 end;
 
 Procedure TDataset.SetActive (Value : Boolean);
@@ -695,37 +666,45 @@ begin
   FActive:=Value;
 end;
 
-procedure TDataSet.SetBufferCount(const AValue: Longint);
-Var
-  ShiftCount: Integer;
+procedure TDataSet.RecalcBufListSize;
+
+var
+  i, j, ABufferCount: Integer;
+  DataLink: TDataLink;
+
 begin
 {$ifdef dsdebug}
-  Writeln('in SetBufferCount(',AValue,')');
+  Writeln('Recalculating buffer list size - check cursor');
 {$endif}
-  If (FBufferCount=AValue) Then
-    exit;
-  If AValue<FRecordCount Then
-    Begin
-    If (AValue>0)And(ActiveRecord>AValue-1) Then
+  If Not IsCursorOpen Then
+    Exit;
+{$ifdef dsdebug}
+  Writeln('Recalculating buffer list size');
+{$endif}
+  ABufferCount := DefaultBufferCount;
+  for i := 0 to FDataSources.Count - 1 do
+    for j := 0 to TDataSource(FDataSources[i]).DataLinks.Count - 1 do
       begin
-      // ActiveRecord Will be pointing to a deleted record
-      // Move Buffers to a safe place and then adjust buffer count
-      ShiftCount:=FActiveRecord - Avalue + 1;
-      ShiftBuffers(0, ShiftCount);
-      FActiveRecord:=AValue-1;
-      End;
-    FRecordCount:=AValue;
-    // Current record Will be pointing to a invalid record
-    // if we are not in BOF or EOF state then make current record point
-    // to the last record in buffer
-    If FCurrentRecord<>-1 Then
-      Begin
-      FCurrentRecord:=FRecordCount - 1;
-      if FCurrentRecord=-1 Then
-        InternalFirst;
-      End;
-    End;
-  SetBufListSize(Avalue);
+      DataLink:=TDataLink(TDataSource(FDataSources[i]).DataLinks[j]);
+      if DataLink.BufferCount>ABufferCount then
+        ABufferCount:=DataLink.BufferCount;
+      end;
+
+  If (FBufferCount=ABufferCount) Then
+    exit;
+
+{$ifdef dsdebug}
+  Writeln('Setting buffer list size');
+{$endif}
+
+  if (ABuffercount<FRecordcount) then
+    begin
+    for i := 0 to (FActiveRecord-ABuffercount) do
+      shiftbuffersbackward;
+    FActiverecord := ABuffercount -1;
+    end;
+
+  SetBufListSize(ABufferCount);
   GetNextRecords;
 {$Ifdef dsDebug}
   WriteLn(
@@ -759,7 +738,7 @@ begin
 {$endif}
     ReAllocMem(FBuffers,(Value+1)*SizeOf(PChar));
 {$ifdef dsdebug}
-    Writeln ('   Filling memory :',(Value-FBufferCount)*SizeOf(PChar));
+    Writeln ('   Filling memory :',(Value+1-FBufferCount)*SizeOf(PChar));
 {$endif}
     FillChar(FBuffers[FBufferCount],(Value+1-FBufferCount)*SizeOF(Pchar),#0);
 {$ifdef dsdebug}
@@ -767,16 +746,16 @@ begin
 {$endif}
     Try
 {$ifdef dsdebug}
-      Writeln ('   Assigning buffers :',(Value+1)*SizeOf(PChar));
+      Writeln ('   Assigning buffers :',(Value)*SizeOf(PChar));
 {$endif}
       For I:=FBufferCount to Value do
         FBuffers[i]:=AllocRecordBuffer;
 {$ifdef dsdebug}
-      Writeln ('   Assigned buffers ',FBufferCount,' :',(Value+1)*SizeOf(PChar));
+      Writeln ('   Assigned buffers ',FBufferCount,' :',(Value)*SizeOf(PChar));
 {$endif}
     except
       I:=FBufferCount;
-      While (I<=Value) and (FBuffers[i]<>Nil) do
+      While (I<(Value+1)) and (FBuffers[i]<>Nil) do
         begin
         FreeRecordBuffer(FBuffers[i]);
         Inc(i);
@@ -797,7 +776,7 @@ begin
       end;
     end;
   If Value=-1 then
-    Value:=0;  
+    Value:=0;
   FBufferCount:=Value;
 {$ifdef dsdebug}
   Writeln ('   SetBufListSize: Final FBufferCount=',FBufferCount);
@@ -842,13 +821,13 @@ end;
 Procedure TDataset.SetFilterText(const Value: string);
 
 begin
-  //!! To be implemented
+  FFilterText := value;
 end;
 
 Procedure TDataset.SetFiltered(Value: Boolean);
 
 begin
-  //!! To be implemented
+  FFiltered := value;
 end;
 
 Procedure TDataset.SetFound(const Value: Boolean);
@@ -892,12 +871,6 @@ begin
     end;
 end;
 
-Function TDataset.SetTempState(const Value: TDataSetState): TDataSetState;
-
-begin
-  //!! To be implemented
-end;
-
 Function TDataset.TempBuffer: PChar;
 
 begin
@@ -926,7 +899,7 @@ begin
 {$ifdef dsdebug}
   Writeln ('Active buffer requested. Returning:',ActiveRecord);
 {$endif}
-  Result:=FBuffers[ActiveRecord];
+  Result:=FBuffers[FActiveRecord];
 end;
 
 Procedure TDataset.Append;
@@ -1032,9 +1005,6 @@ begin
     writeln ('Delete: Internaldelete succeeded');
 {$endif}
     FreeFieldBuffers;
-{$ifdef dsdebug}
-    writeln ('Delete: Freeing field buffers');
-{$endif}
     SetState(dsBrowse);
 {$ifdef dsdebug}
     writeln ('Delete: Browse mode set');
@@ -1062,9 +1032,45 @@ end;
 
 Procedure TDataset.DoInsertAppend(DoAppend : Boolean);
 
-Var Buffer : PChar;
-    BookBeforeInsert : TBookmarkStr;
 
+  procedure DoInsert;
+
+  Var BookBeforeInsert : TBookmarkStr;
+      TempBuf : pointer;
+
+  begin
+  // need to scroll up al buffers after current one,
+  // but copy current bookmark to insert buffer.
+  If FRecordcount > 0 then BookBeforeInsert:=Bookmark;
+
+  if FActiveRecord < FRecordCount-1 then
+    begin
+    TempBuf := FBuffers[FBuffercount];
+    move(FBuffers[FActiveRecord],FBuffers[FActiveRecord+1],(Fbuffercount-FActiveRecord)*sizeof(FBuffers[0]));      FBuffers[FActiveRecord]:=TempBuf;
+    end
+  else
+    inc(FActiveRecord);
+
+  // Active buffer is now edit buffer. Initialize.
+  InitRecord(FBuffers[FActiveRecord]);
+  cursorposchanged;
+
+  // Put bookmark in edit buffer.
+  if FRecordCount=0 then
+    begin
+    fEOF := false;
+    SetBookmarkFlag(ActiveBuffer,bfBOF)
+    end
+  else
+    begin
+    fBOF := false;
+    if FRecordcount > 0 then SetBookMarkData(ActiveBuffer,@BookBeforeInsert);
+    end;
+  // update buffer count.
+  If FRecordCount<FBufferCount then
+    Inc(FRecordCount);
+  end;
+  
 begin
   If Not CanModify then
     DatabaseError(SDatasetReadOnly,Self);
@@ -1076,45 +1082,25 @@ begin
 {$ifdef dsdebug}
     Writeln ('going to insert mode');
 {$endif}
-    // need to scroll up al buffers after current one,
-    // but copy current bookmark to insert buffer.
-    BookBeforeInsert:=Bookmark;
-    ShiftBuffers(1,FActiveRecord);
-    // Active buffer is now edit buffer. Initialize.
-    InitRecord(ActiveBuffer);
-    // Put bookmark in edit buffer.
-    if FRecordCount=0 then
-      SetBookmarkFlag(ActiveBuffer,bfBOF)
-    else
-      SetBookMarkData(ActiveBuffer,Pointer(BookBeforeInsert));
-    // update buffer count.
-    If FRecordCount<FBufferCount then
-      Inc(FRecordCount);
+
+    DoInsert;
     end
   else
-    // Tricky, need to get last record and scroll down.
     begin
 {$ifdef dsdebug}
     Writeln ('going to append mode');
 {$endif}
-    Buffer:=FBuffers[0];
-    InitRecord(Buffer);
-    // just mark buffer as last. GetPreviousrecords will do an internallast
-    // Because of this...
-    SetBookMarkFlag(Buffer,bfEOF);
-    FRecordCount:=1;
-{$ifdef dsdebug}
-    Writeln ('DoInsertAppend: getting prior records');
-{$endif}
+    ClearBuffers;
+    InternalLast;
     GetPriorRecords;
-    // update active record.
-    FactiveRecord:=FRecordCount-1;
+    FActiveRecord:=FRecordCount-1;
+    DoInsert;
+    SetBookmarkFlag(ActiveBuffer,bfEOF)
     end;
   SetState(dsInsert);
   try
     DoOnNewRecord;
   except
-    UpdateCursorPos;
     resync([]);
     raise;
   end;
@@ -1137,7 +1123,7 @@ begin
   If State in [dsedit,dsinsert] then exit;
   If FRecordCount = 0 then
     begin
-    Insert;
+    Append;
     Exit;
     end;
   CheckBrowseMode;
@@ -1391,6 +1377,7 @@ Var
   Function ScrollBackward : Integer;
 
   begin
+    if FIsUniDirectional then DatabaseError(SUniDirectional);
     Result:=0;
 {$ifdef dsdebug}
     Writeln('Scrolling backward:',Abs(Distance));
@@ -1432,10 +1419,10 @@ begin
   CheckBrowseMode;
   Result:=0; TheResult:=0;
   PrevRecordCount:=FRecordCount;
-  DoBeforeScroll;
   If ((Distance>0) and FEOF) or
      ((Distance<0) and FBOF) then
     exit;
+  DoBeforeScroll;
   Try
     If Distance>0 then
       Scrolled:=ScrollForward
@@ -1445,13 +1432,13 @@ begin
 {$ifdef dsdebug}
     WriteLn('ActiveRecord=', FActiveRecord,' FEOF=',FEOF,' FBOF=',FBOF);
 {$Endif}
-     If FRecordCount<>PrevRecordCount then
-       DataEvent(deDatasetChange,0)
-     else
-       DataEvent(deDatasetScroll,Scrolled);
-     DoAfterScroll;
+    If FRecordCount<>PrevRecordCount then
+      DataEvent(deDatasetChange,0)
+    else
+      DataEvent(deDatasetScroll,Scrolled);
+    DoAfterScroll;
+    Result:=TheResult;
   end;
-  Result:=TheResult;
 end;
 
 Procedure TDataset.Next;
@@ -1491,18 +1478,16 @@ begin
     CheckRequired;
     DoBeforePost;
     If Not TryDoing(@InternalPost,OnPostError) then exit;
+    cursorposchanged;
 {$ifdef dsdebug}
     writeln ('Post: Internalpost succeeded');
 {$endif}
     FreeFieldBuffers;
-{$ifdef dsdebug}
-    writeln ('Post: Freeing field buffers');
-{$endif}
+    Resync([]);
     SetState(dsBrowse);
 {$ifdef dsdebug}
     writeln ('Post: Browse mode set');
 {$endif}
-    Resync([]);
     DoAfterPost;
     end;
 end;
@@ -1522,33 +1507,6 @@ begin
   Resync([]);
 end;
 
-procedure TDataSet.RecalcBufListSize;
-var
-  i, j, MaxValue: Integer;
-  DataLink: TDataLink;
-begin
-{$ifdef dsdebug}
-  Writeln('Recalculating buffer list size - check cursor');
-{$endif}
-  If Not IsCursorOpen Then
-    Exit;
-{$ifdef dsdebug}
-  Writeln('Recalculating buffer list size');
-{$endif}
-  MaxValue := DefaultBufferCount;
-  for i := 0 to FDataSources.Count - 1 do
-    for j := 0 to TDataSource(FDataSources[i]).DataLinks.Count - 1 do
-      begin
-      DataLink:=TDataLink(TDataSource(FDataSources[i]).DataLinks[j]);
-      if DataLink.BufferCount>MaxValue then
-        MaxValue:=DataLink.BufferCount;
-      end;
-{$ifdef dsdebug}
-   Writeln('calling Setbuffercount');
-{$endif}
-  SetBufferCount(MaxValue); //SetBufListSize(MaxValue);
-end;
-
 Procedure TDataset.RegisterDataSource(ADatasource : TDataSource);
 
 begin
@@ -1559,66 +1517,56 @@ end;
 
 Procedure TDataset.Resync(Mode: TResyncMode);
 
-Var Count,ShiftCount : Longint;
+var i,count : integer;
 
 begin
   // See if we can find the requested record.
 {$ifdef dsdebug}
     Writeln ('Resync called');
 {$endif}
-  If rmExact in Mode then
-    begin
+
+// place the cursor of the underlying dataset to the active record
+  SetCurrentRecord(FActiverecord);
+
+// Now look if the data on the current cursor of the underlying dataset is still available
+  If GetRecord(Fbuffers[0],gmcurrent,True)<>grOk Then
+// If that fails and rmExact is set, then raise an exception
+    If rmExact in Mode then
+      DatabaseError(SNoSuchRecord,Self)
+// else, if rmexact is not set, try to fetch the next  or prior record in the underlying dataset
+    else if (GetRecord(Fbuffers[0],gmnext,True)<>grOk) and
+            (GetRecord(Fbuffers[0],gmprior,True)<>grOk) then
+      begin
 {$ifdef dsdebug}
-    Writeln ('Exact resync');
-{$endif}
-    { throw an exception if not found.
-      Normally the descendant should do this if DoCheck is true. }
-    If GetRecord(Fbuffers[0],gmcurrent,True)<>grOk Then
-      DatabaseError(SNoSuchRecord,Self);
-    end
-  else
-    { Can we find a record in the neighbourhood ?
-      Use Shortcut evaluation for this, or we'll have some funny results. }
-    If (GetRecord(Fbuffers[0],gmcurrent,True)<>grOk) and
-       (GetRecord(Fbuffers[0],gmprior,True)<>grOk) and
-       (GetRecord(Fbuffers[0],gmNext,True)<>grOk) then
-       begin
-{$ifdef dsdebug}
-       Writeln ('Resync: fuzzy resync');
-{$endif}
-       // nothing found, invalidate buffer and bail out.
-       ClearBuffers;
-       DataEvent(deDatasetChange,0);
-       Exit;
-       end;
-{$ifdef dsdebug}
-   Writeln ('Resync: Center in  resync: ',(rmCenter in Mode));
+      Writeln ('Resync: fuzzy resync');
 {$endif}
+      // nothing found, invalidate buffer and bail out.
+      ClearBuffers;
+      DataEvent(deDatasetChange,0);
+      exit;
+      end;
+  FCurrentRecord := 0;
+
+
+// If we've arrived here, FBuffer[0] is the current record
   If (rmCenter in Mode) then
-    ShiftCount:=FbufferCount div 2
+    count := (FRecordCount div 2)
   else
-    // keep current position.
-    ShiftCount:=FActiveRecord;
-  // Reposition on 0
-{$ifdef dsdebug}
-  Writeln ('Resync: activating buffers');
-{$endif}
-  ActivateBuffers;
-  try
-    Count:=0;
-{$ifdef dsdebug}
-    Writeln ('Resync: Getting previous ',ShiftCount,' records');
-{$endif}
-    While (Count<ShiftCount) and GetPriorRecord do
-      Inc(Count);
-    FActiveRecord:=Count;
-    // fill rest of buffers, adjust ActiveBuffer.
-    GetNextRecords;
-    Inc(FActiveRecord,GetPriorRecords);
-  finally
-    // Notify Everyone
-    DataEvent(deDatasetChange,0);
-  end;
+    count := FActiveRecord;
+  i := 0;
+  FRecordcount := 1;
+  FActiveRecord := 0;
+
+// Fill the buffers before the active record
+  while (i < count) and GetPriorRecord do
+    inc(i);
+  FActiveRecord := i;
+// Fill the rest of the buffer
+  getnextrecords;
+// If the buffer is not full yet, try to fetch some more prior records
+  if FRecordcount < FBuffercount then getpriorrecords;
+// That's all folks!
+  DataEvent(deDatasetChange,0);
 end;
 
 Procedure TDataset.SetFields(const Values: array of const);
@@ -1707,48 +1655,24 @@ begin
   Result:=FFieldList.Count;
 end;
 
-Procedure TDataset.ShiftBuffers (Offset, Distance : longint);
+Procedure TDataset.ShiftBuffersBackward;
 
-Var Temp : Pointer;
-    MoveSize : Longint;
-
-  Procedure ShiftBuffersUp;
-  begin
-{$ifdef DSDEBUG}
-    writeln ('Shifting buffers up from ',OffSet,' with distance :',Distance);
-    writeln ('Moving ',(FBufferCount-Distance), ' Buffers at ',Distance);
-{$endif}
-    Move(FBuffers[Offset],Temp^,MoveSize);
-    Move(FBuffers[Offset+Distance],FBuffers[Offset],(FBufferCount-Distance-Offset)*SizeOf(Pchar));
-    Move(Temp^,FBuffers[FBufferCount-Distance-Offset],MoveSize);
-  end;
-
-  Procedure ShiftBuffersDown;
-
-  begin
-    // Distance is NEGATIVE
-{$ifdef DSDEBUG}
-    writeln ('Shifting buffers down with distance :',Abs(Distance));
-    writeln ('Moving ',Movesize div 4,' Buffers at ',FBufferCount+Distance);
-{$endif}
-    Move(FBuffers[FbufferCount+Distance],Temp^ ,MoveSize);
-    Move(FBuffers[0],FBuffers[Abs(Distance)],(FBufferCount+Distance)*SizeOf(Pchar));
-    Move(Temp^ ,FBuffers[0],MoveSize);
-  end;
+var TempBuf : pointer;
 
 begin
-  If Abs(Distance)>=BufferCount then
-    Exit;
-  try
-    MoveSize:=SizeOf(Pchar)*Abs(Distance);
-    GetMem(Temp,MoveSize);
-    If Distance<0 Then
-      ShiftBuffersDown
-    else If Distance>0 then
-      ShiftBuffersUp;
-  Finally
-    FreeMem(temp);
-  end;
+  TempBuf := FBuffers[0];
+  move(FBuffers[1],FBuffers[0],(fbuffercount)*sizeof(FBuffers[0]));
+  FBuffers[buffercount]:=TempBuf;
+end;
+
+Procedure TDataset.ShiftBuffersForward;
+
+var TempBuf : pointer;
+
+begin
+  TempBuf := FBuffers[FBufferCount];
+  move(FBuffers[0],FBuffers[1],(fbuffercount)*sizeof(FBuffers[0]));
+  FBuffers[0]:=TempBuf;
 end;
 
 Procedure TDataset.UnRegisterDataSource(ADatasource : TDatasource);
@@ -1760,7 +1684,10 @@ end;
 
 {
   $Log$
-  Revision 1.17  2004-08-03 19:08:48  michael
+  Revision 1.18  2004-08-13 07:06:02  michael
+  + Rework of buffer management by Joost Van der Sluis
+
+  Revision 1.17  2004/08/03 19:08:48  michael
   + Latest patch from Micha Nelissen
 
   Revision 1.16  2004/08/02 15:13:42  michael
diff --git a/fcl/db/db.pp b/fcl/db/db.pp
index ac89ca48de..8d372e65f9 100644
--- a/fcl/db/db.pp
+++ b/fcl/db/db.pp
@@ -793,7 +793,6 @@ type
     FBeforePost: TDataSetNotifyEvent;
     FBeforeScroll: TDataSetNotifyEvent;
     FBlobFieldCount: Longint;
-    FBookmark: TBookmarkStr;
     FBookmarkSize: Longint;
     FBuffers : TBufferArray;
     FBufferCount: Longint;
@@ -826,23 +825,24 @@ type
     FRecNo: Longint;
     FRecordCount: Longint;
     FRecordSize: Word;
+    FIsUniDirectional: Boolean;
     FState : TDataSetState;
     Procedure DoInsertAppend(DoAppend : Boolean);
     Procedure DoInternalOpen;
     Procedure DoInternalClose;
     Function  GetBuffer (Index : longint) : Pchar;
     Function  GetField (Index : Longint) : TField;
-    procedure RecalcBufListSize;
     Procedure RegisterDataSource(ADatasource : TDataSource);
     Procedure RemoveField (Field : TField);
     Procedure SetActive (Value : Boolean);
-    procedure SetBufferCount(const AValue: Longint);
     Procedure SetField (Index : Longint;Value : TField);
-    Procedure ShiftBuffers (Offset,Distance : Longint);
+    Procedure ShiftBuffersForward;
+    Procedure ShiftBuffersBackward;
     Function  TryDoing (P : TDataOperation; Ev : TDatasetErrorEvent) : Boolean;
     Procedure UnRegisterDataSource(ADatasource : TDatasource);
     Procedure UpdateFieldDefs;
   protected
+    procedure RecalcBufListSize;
     procedure ActivateBuffers; virtual;
     procedure BindFields(Binding: Boolean);
     function  BookmarkAvailable: Boolean;
@@ -898,7 +898,6 @@ type
     procedure Loaded; override;
     procedure OpenCursor(InfoQuery: Boolean); virtual;
     procedure RefreshInternalCalcFields(Buffer: PChar); virtual;
-    Function  RequiredBuffers : longint;
     procedure RestoreState(const Value: TDataSetState);
     procedure SetBookmarkStr(const Value: TBookmarkStr); virtual;
     procedure SetBufListSize(Value: Longint);
@@ -1010,13 +1009,14 @@ type
 //    property Fields[Index: Longint]: TField read GetField write SetField;
     property Found: Boolean read FFound;
     property Modified: Boolean read FModified;
+    property IsUniDirectional: Boolean read FIsUniDirectional write FIsUniDirectional default False;
     property RecordCount: Longint read GetRecordCount;
     property RecNo: Longint read FRecNo write FRecNo;
     property RecordSize: Word read FRecordSize;
     property State: TDataSetState read FState;
     property Fields : TFields Read FFieldList;
-    property Filter: string read FFilterText write FFilterText;
-    property Filtered: Boolean read FFiltered write FFiltered default False;
+    property Filter: string read FFilterText write SetFilterText;
+    property Filtered: Boolean read FFiltered write SetFiltered default False;
     property FilterOptions: TFilterOptions read FFilterOptions write FFilterOptions;
     property Active: Boolean read FActive write SetActive default False;
     property AutoCalcFields: Boolean read FAutoCalcFields write FAutoCalcFields;
@@ -1500,7 +1500,10 @@ end.
 
 {
   $Log$
-  Revision 1.19  2004-07-25 11:32:40  michael
+  Revision 1.20  2004-08-13 07:06:02  michael
+  + Rework of buffer management by Joost Van der Sluis
+
+  Revision 1.19  2004/07/25 11:32:40  michael
   * Patches from Joost van der Sluis
     interbase.pp:
         * Removed unused Fprepared
diff --git a/fcl/db/dbs.inc b/fcl/db/dbs.inc
index e00c1708c8..11fd66a929 100644
--- a/fcl/db/dbs.inc
+++ b/fcl/db/dbs.inc
@@ -39,6 +39,7 @@ Const
   SNoDatasetRegistered = 'No such dataset registered : "%s"';
   SNotConnected = 'Operation cannot be performed on an disconnected database';
   SConnected = 'Operation cannot be performed on an connected database';
+  SUniDirectional = 'Operation cannot be performed on an unidirectional dataset';
   SNoSuchRecord = 'Could not find the requested record.';
   SDatasetReadOnly = 'Dataset is read-only.';
   SNeedField = 'Field %s is required, but not supplied.';
@@ -48,7 +49,10 @@ Const
 
 {
   $Log$
-  Revision 1.5  2003-08-16 16:42:21  michael
+  Revision 1.6  2004-08-13 07:06:02  michael
+  + Rework of buffer management by Joost Van der Sluis
+
+  Revision 1.5  2003/08/16 16:42:21  michael
   + Fixes in TDBDataset etc. Changed MySQLDb to use database as well
 
   Revision 1.4  2002/09/07 15:15:23  peter
diff --git a/fcl/db/odbc/testodbc.mdb b/fcl/db/odbc/testodbc.mdb
index 2dcc6dde289fd0c601cc604265ac49745d37e4fc..fafa587a2fd374102e03f2aa84e75e31e9462047 100644
GIT binary patch
delta 8
PcmZo{U_Gw5;kW<*55og?

literal 81921
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