- Modifies the way indexed UPDATE/DELETE are sorted in order to execute

  them sorted by file position. Firstly a new value is stored in indexes
  to know if they are sorted, preventing to do the sorting when it is not
  needed. Secondly, almost all in now done in connect instead of being
  done by the different file access method classes. This pepares the future
  use of temporary files for all table types and also fix the bug that was
  occuring when partially using a multi-column index because of false MRR
  like call of position followed by unsorted rnd_pos no more using indexing.
modified:
  storage/connect/connect.cc
  storage/connect/filamap.cpp
  storage/connect/filamap.h
  storage/connect/filamdbf.cpp
  storage/connect/filamdbf.h
  storage/connect/filamfix.cpp
  storage/connect/filamfix.h
  storage/connect/filamtxt.cpp
  storage/connect/filamtxt.h
  storage/connect/filamvct.cpp
  storage/connect/filamvct.h
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabfix.h
  storage/connect/tabfmt.cpp
  storage/connect/tabfmt.h
  storage/connect/xindex.cpp
  storage/connect/xindex.h
  storage/connect/xtable.h

1 files changed, 31 insertions, 5 deletions

diff --git a/storage/connect/filamdbf.cpp b/storage/connect/filamdbf.cpp
index 5d01ee06df0..50a97739002 100644
--- a/storage/connect/filamdbf.cpp
+++ b/storage/connect/filamdbf.cpp
@@ -750,6 +750,36 @@ bool DBFFAM::CopyHeader(PGLOBAL g)
   return rc;
   } // end of CopyHeader
 
+#if 0 // Not useful when UseTemp is false.
+/***********************************************************************/
+/*  Mark the line to delete with '*' (soft delete).                    */
+/*  NOTE: this is not ready for UseTemp.                               */
+/***********************************************************************/
+int DBFFAM::InitDelete(PGLOBAL g, int fpos, int spos)
+  {
+  int rc = RC_FX;
+  size_t lrecl = (size_t)Lrecl;
+
+  if (Nrec != 1)
+    strcpy(g->Message, "Cannot delete in block mode");
+  else if (fseek(Stream, Headlen + fpos * Lrecl, SEEK_SET))
+    sprintf(g->Message, MSG(FSETPOS_ERROR), 0);
+  else if (fread(To_Buf, 1, lrecl, Stream) != lrecl)
+    sprintf(g->Message, MSG(READ_ERROR), To_File, strerror(errno));
+  else
+    *To_Buf = '*';
+
+  if (fseek(Stream, Headlen + fpos * Lrecl, SEEK_SET))
+    sprintf(g->Message, MSG(FSETPOS_ERROR), 0);
+  else if (fwrite(To_Buf, 1, lrecl, Stream) != lrecl)
+    sprintf(g->Message, MSG(FWRITE_ERROR), strerror(errno));
+  else
+    rc = RC_NF;     // Ok, Nothing else to do 
+
+  return rc;
+  } // end of InitDelete
+#endif // 0
+
 /***********************************************************************/
 /*  Data Base delete line routine for DBF access methods.              */
 /*  Deleted lines are just flagged in the first buffer character.      */
@@ -760,16 +790,12 @@ int DBFFAM::DeleteRecords(PGLOBAL g, int irc)
     // T_Stream is the temporary stream or the table file stream itself
     if (!T_Stream)
       if (UseTemp) {
-        if ((Indxd = Tdbp->GetKindex() != NULL)) {
-          strcpy(g->Message, "DBF indexed udate using temp file NIY");
-          return RC_FX;
-        } else if (OpenTempFile(g))
+        if (OpenTempFile(g))
           return RC_FX;
 
         if (CopyHeader(g))           // For DBF tables
           return RC_FX;
 
-//      Indxd = Tdbp->GetKindex() != NULL;
       } else
         T_Stream = Stream;