This is a major update that fixes most of the issues and bugs that

have been created by the last addition of new CONNECT features.
The version previous to this one is a preliminary test version and
should not be distributed.

- Handle indexed UPDATE/DELETE. Previously this was just tested and
  an error message send when it could not be done. Now CONNECT can
  do it in all the cases. It is done by a MRR like tchnique by making
  a list of all update or delete to do, sort them, then execute them.
modified:
  storage/connect/array.cpp
  storage/connect/array.h
  storage/connect/filamap.cpp
  storage/connect/filamap.h
  storage/connect/filamdbf.cpp
  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/filamzip.cpp
  storage/connect/filamzip.h
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h

- Differenciate Cardinality that returns a true or estimated table size
  and GetMaxSize that return a value equal or greater than the table
  row number. This fixes the errors of non matching opt files.
modified:
  storage/connect/connect.cc
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabfix.cpp
  storage/connect/table.cpp
  storage/connect/tabmac.h
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h
  storage/connect/tabpivot.h
  storage/connect/tabtbl.cpp
  storage/connect/tabtbl.h
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/tabwmi.h
  storage/connect/xtable.h

- Fix some errors and issues when making index and opt files.
  Erase opt and index files for void tables.
  Fix wrong calculation of Block and Last in MakeBlockValues.
  Invalidate indexes before making opt file.
  Fully handle blocked variable tables. Make opt file for blocked
  variable tables even when they have no optimised colums.
modified:
  storage/connect/tabdos.cpp
  storage/connect/xindex.h

- Fix some errors making index
  Return an error when the allocation is too small (should not
  really occur now that GetMaxSize is sure)
  Don't use XXROW index for DBF tables because of soft deleted lines.
modified:
  storage/connect/xindex.cpp

- Typo
modified:
  storage/connect/macutil.cpp
  storage/connect/tabdos.h
  storage/connect/tabsys.cpp
  storage/connect/tabsys.h

1 files changed, 210 insertions, 196 deletions

diff --git a/storage/connect/filamtxt.h b/storage/connect/filamtxt.h
index abe8f2f2324..83c93ecc6f2 100644
--- a/storage/connect/filamtxt.h
+++ b/storage/connect/filamtxt.h
@@ -1,196 +1,210 @@
-/************** FilAMTxt H Declares Source Code File (.H) **************/

-/*  Name: FILAMTXT.H    Version 1.2                                    */

-/*                                                                     */

-/*  (C) Copyright to the author Olivier BERTRAND          2005-2012    */

-/*                                                                     */

-/*  This file contains the file access method classes declares.        */

-/***********************************************************************/

-

-#ifndef __FILAMTXT_H

-#define __FILAMTXT_H

-

-#include "block.h"

-

-typedef class TXTFAM *PTXF;

-typedef class DOSFAM *PDOSFAM;

-typedef class BLKFAM *PBLKFAM;

-typedef class DOSDEF *PDOSDEF;

-typedef class TDBDOS *PTDBDOS;

-

-/***********************************************************************/

-/*  This is the base class for all file access method classes.         */

-/***********************************************************************/

-class DllExport TXTFAM : public BLOCK {

-  friend class TDBDOS;

-  friend class TDBCSV;

-  friend class TDBFIX;

-  friend class TDBVCT;

-  friend class DOSCOL;

-  friend class BINCOL;

-  friend class VCTCOL;

- public:

-  // Constructor

-  TXTFAM(PDOSDEF tdp);

-  TXTFAM(PTXF txfp);

-

-  // Implementation

-  virtual AMT   GetAmType(void) = 0;

-  virtual int   GetPos(void) = 0;

-  virtual int   GetNextPos(void) = 0;

-  virtual PTXF  Duplicate(PGLOBAL g) = 0;

-  virtual bool  GetUseTemp(void) {return false;}

-  virtual int   GetDelRows(void) {return DelRows;}

-          int   GetCurBlk(void) {return CurBlk;}

-          void  SetTdbp(PTDBDOS tdbp) {Tdbp = tdbp;}

-          int   GetBlock(void) {return Block;}

-          void  SetBlkPos(int *bkp) {BlkPos = bkp;}

-          void  SetNrec(int n) {Nrec = n;}

-          char *GetBuf(void) {return To_Buf;}

-          int   GetRows(void) {return Rows;}

-          bool  IsBlocked(void) {return Blocked;}

-

-  // Methods

-  virtual void  Reset(void);

-  virtual int   GetFileLength(PGLOBAL g);

-  virtual int   Cardinality(PGLOBAL g);

-  virtual int   MaxBlkSize(PGLOBAL g, int s);

-  virtual bool  AllocateBuffer(PGLOBAL g) {return false;}

-  virtual void  ResetBuffer(PGLOBAL g) {}

-  virtual int   GetNerr(void) {return 0;}

-  virtual int   GetRowID(void) = 0;

-  virtual bool  RecordPos(PGLOBAL g) = 0;

-  virtual bool  SetPos(PGLOBAL g, int recpos) = 0;

-  virtual int   SkipRecord(PGLOBAL g, bool header) = 0;

-  virtual bool  OpenTableFile(PGLOBAL g) = 0;

-  virtual bool  DeferReading(void) {IsRead = false; return true;}

-  virtual int   ReadBuffer(PGLOBAL g) = 0;

-  virtual int   WriteBuffer(PGLOBAL g) = 0;

-  virtual int   DeleteRecords(PGLOBAL g, int irc) = 0;

-  virtual void  CloseTableFile(PGLOBAL g, bool abort) = 0;

-  virtual void  Rewind(void) = 0;

-

- protected:

-  // Members

-  PTDBDOS Tdbp;              // To table class

-  PSZ     To_File;           // Points to table file name

-  PFBLOCK To_Fb;             // Pointer to file block

-  bool    Placed;            // true if Recpos was externally set

-  bool    IsRead;            // false for deferred reading

-  bool    Blocked;           // true if using blocked I/O

-  char   *To_Buf;            // Points to I/O buffer

-  void   *DelBuf;            // Buffer used to move lines in Delete

-  int    *BlkPos;            // To array of block positions

-  int     BlkLen;            // Current block length

-  int     Buflen;            // Buffer length

-  int     Dbflen;            // Delete buffer length

-  int     Rows;              // Number of rows read so far

-  int     DelRows;           // Number of deleted rows

-  int     Headlen;           // Number of bytes in header

-  int     Lrecl;             // Logical Record Length

-  int     Block;             // Number of blocks in table

-  int     Last;              // Number of elements of last block

-  int     Nrec;              // Number of records in buffer

-  int     OldBlk;            // Index of last read block

-  int     CurBlk;            // Index of current block

-  int     CurNum;            // Current buffer line number

-  int     ReadBlks;          // Number of blocks read (selected)

-  int     Rbuf;              // Number of lines read in buffer

-  int     Modif;             // Number of modified lines in block

-  int     Blksize;           // Size of padded blocks

-  int     Ending;            // Length of line end

-  bool    Padded;            // true if fixed size blocks are padded

-  bool    Eof;               // true if an EOF (0xA) character exists

-  char   *CrLf;              // End of line character(s)

-  }; // end of class TXTFAM

-

-/***********************************************************************/

-/*  This is the DOS/UNIX Access Method class declaration for standard  */

-/*  text files with variable record format (DOS, CSV, FMT)             */

-/***********************************************************************/

-class DllExport DOSFAM : public TXTFAM {

- public:

-  // Constructor

-  DOSFAM(PDOSDEF tdp);

-  DOSFAM(PDOSFAM txfp);

-

-  // Implementation

-  virtual AMT   GetAmType(void) {return TYPE_AM_DOS;}

-  virtual bool  GetUseTemp(void) {return UseTemp;}

-  virtual int   GetPos(void);

-  virtual int   GetNextPos(void);

-  virtual PTXF  Duplicate(PGLOBAL g)

-                  {return (PTXF)new(g) DOSFAM(this);}

-

-  // Methods

-  virtual void  Reset(void);

-  virtual int   GetFileLength(PGLOBAL g);

-  virtual int   Cardinality(PGLOBAL g);

-  virtual int   MaxBlkSize(PGLOBAL g, int s);

-  virtual bool  AllocateBuffer(PGLOBAL g);

-  virtual int   GetRowID(void);

-  virtual bool  RecordPos(PGLOBAL g);

-  virtual bool  SetPos(PGLOBAL g, int recpos);

-  virtual int   SkipRecord(PGLOBAL g, bool header);

-  virtual bool  OpenTableFile(PGLOBAL g);

-  virtual int   ReadBuffer(PGLOBAL g);

-  virtual int   WriteBuffer(PGLOBAL g);

-  virtual int   DeleteRecords(PGLOBAL g, int irc);

-  virtual void  CloseTableFile(PGLOBAL g, bool abort);

-  virtual void  Rewind(void);

-

- protected:

-  virtual bool  OpenTempFile(PGLOBAL g);

-  virtual bool  MoveIntermediateLines(PGLOBAL g, bool *b);

-  virtual int   RenameTempFile(PGLOBAL g, bool abort);

-

-  // Members

-  FILE   *Stream;             // Points to Dos file structure

-  FILE   *T_Stream;           // Points to temporary file structure

-  PFBLOCK To_Fbt;             // Pointer to temp file block

-  int     Fpos;               // Position of last read record

-  int     Tpos;               // Target Position for delete move

-  int     Spos;               // Start position for delete move

-  bool    UseTemp;            // True to use a temporary file in Delete

-  bool    Bin;                // True to force binary mode

-  }; // end of class DOSFAM

-

-/***********************************************************************/

-/*  This is the DOS/UNIX Access Method class declaration for standard  */

-/*  text files with variable record format (DOS, CSV, FMT)             */

-/***********************************************************************/

-class DllExport BLKFAM : public DOSFAM {

- public:

-  // Constructor

-  BLKFAM(PDOSDEF tdp);

-  BLKFAM(PBLKFAM txfp);

-

-  // Implementation

-  virtual AMT   GetAmType(void) {return TYPE_AM_BLK;}

-  virtual int   GetPos(void);

-  virtual int   GetNextPos(void);

-  virtual PTXF  Duplicate(PGLOBAL g)

-                  {return (PTXF)new(g) BLKFAM(this);}

-

-  // Methods

-  virtual void  Reset(void);

-  virtual int   Cardinality(PGLOBAL g);

-  virtual int   MaxBlkSize(PGLOBAL g, int s);

-  virtual bool  AllocateBuffer(PGLOBAL g);

-  virtual int   GetRowID(void);

-  virtual bool  RecordPos(PGLOBAL g);

-  virtual bool  SetPos(PGLOBAL g, int recpos);

-  virtual int   SkipRecord(PGLOBAL g, bool header);

-  virtual int   ReadBuffer(PGLOBAL g);

-  virtual int   WriteBuffer(PGLOBAL g);

-  virtual void  CloseTableFile(PGLOBAL g, bool abort);

-  virtual void  Rewind(void);

-

- protected:

-  // Members

-  char *CurLine;              // Position of current line in buffer

-  char *NxtLine;              // Position of Next    line in buffer

-  char *OutBuf;               // Buffer to write in temporary file

-  bool  Closing;              // True when closing on Update

-  }; // end of class BLKFAM

-

-#endif // __FILAMTXT_H

+/************** FilAMTxt H Declares Source Code File (.H) **************/
+/*  Name: FILAMTXT.H    Version 1.3                                    */
+/*                                                                     */
+/*  (C) Copyright to the author Olivier BERTRAND          2005-2014    */
+/*                                                                     */
+/*  This file contains the file access method classes declares.        */
+/***********************************************************************/
+
+#ifndef __FILAMTXT_H
+#define __FILAMTXT_H
+
+#include "block.h"
+#include "array.h"
+
+typedef class TXTFAM *PTXF;
+typedef class DOSFAM *PDOSFAM;
+typedef class BLKFAM *PBLKFAM;
+typedef class DOSDEF *PDOSDEF;
+typedef class TDBDOS *PTDBDOS;
+
+/***********************************************************************/
+/*  This is the base class for all file access method classes.         */
+/***********************************************************************/
+class DllExport TXTFAM : public BLOCK {
+  friend class TDBDOS;
+  friend class TDBCSV;
+  friend class TDBFIX;
+  friend class TDBVCT;
+  friend class DOSCOL;
+  friend class BINCOL;
+  friend class VCTCOL;
+ public:
+  // Constructor
+  TXTFAM(PDOSDEF tdp);
+  TXTFAM(PTXF txfp);
+
+  // Implementation
+  virtual AMT   GetAmType(void) = 0;
+  virtual int   GetPos(void) = 0;
+  virtual int   GetNextPos(void) = 0;
+  virtual PTXF  Duplicate(PGLOBAL g) = 0;
+  virtual bool  GetUseTemp(void) {return false;}
+  virtual int   GetDelRows(void) {return DelRows;}
+          int   GetCurBlk(void) {return CurBlk;}
+          void  SetTdbp(PTDBDOS tdbp) {Tdbp = tdbp;}
+          int   GetBlock(void) {return Block;}
+          void  SetBlkPos(int *bkp) {BlkPos = bkp;}
+          void  SetNrec(int n) {Nrec = n;}
+          char *GetBuf(void) {return To_Buf;}
+          int   GetRows(void) {return Rows;}
+          bool  IsBlocked(void) {return Blocked;}
+
+  // Methods
+  virtual void  Reset(void);
+  virtual int   GetFileLength(PGLOBAL g);
+  virtual int   Cardinality(PGLOBAL g);
+  virtual int   MaxBlkSize(PGLOBAL g, int s);
+  virtual bool  AllocateBuffer(PGLOBAL g) {return false;}
+  virtual void  ResetBuffer(PGLOBAL g) {}
+  virtual int   GetNerr(void) {return 0;}
+  virtual int   GetRowID(void) = 0;
+  virtual bool  RecordPos(PGLOBAL g) = 0;
+  virtual bool  SetPos(PGLOBAL g, int recpos) = 0;
+  virtual int   SkipRecord(PGLOBAL g, bool header) = 0;
+  virtual bool  OpenTableFile(PGLOBAL g) = 0;
+  virtual bool  DeferReading(void) {IsRead = false; return true;}
+  virtual int   ReadBuffer(PGLOBAL g) = 0;
+  virtual int   WriteBuffer(PGLOBAL g) = 0;
+  virtual int   DeleteRecords(PGLOBAL g, int irc) = 0;
+  virtual void  CloseTableFile(PGLOBAL g, bool abort) = 0;
+  virtual void  Rewind(void) = 0;
+
+ protected:
+          bool  AddListValue(PGLOBAL g, int type, void *val, PPARM *top);
+
+  // Members
+  PTDBDOS Tdbp;              // To table class
+  PSZ     To_File;           // Points to table file name
+  PFBLOCK To_Fb;             // Pointer to file block
+  PPARM   To_Pos;            // Pointer to position list
+  PPARM   To_Sos;            // Pointer to start position list
+  PPARM   To_Upd;            // Pointer to udated line list
+  PARRAY  Posar;             // Pointer to position array
+  PARRAY  Sosar;             // Pointer to start position array
+  PARRAY  Updar;             // Pointer to udated lines array
+  bool    Placed;            // true if Recpos was externally set
+  bool    IsRead;            // false for deferred reading
+  bool    Blocked;           // true if using blocked I/O
+  char   *To_Buf;            // Points to I/O buffer
+  void   *DelBuf;            // Buffer used to move lines in Delete
+  int    *BlkPos;            // To array of block positions
+  int     BlkLen;            // Current block length
+  int     Buflen;            // Buffer length
+  int     Dbflen;            // Delete buffer length
+  int     Rows;              // Number of rows read so far
+  int     DelRows;           // Number of deleted rows
+  int     Headlen;           // Number of bytes in header
+  int     Lrecl;             // Logical Record Length
+  int     Block;             // Number of blocks in table
+  int     Last;              // Number of elements of last block
+  int     Nrec;              // Number of records in buffer
+  int     OldBlk;            // Index of last read block
+  int     CurBlk;            // Index of current block
+  int     CurNum;            // Current buffer line number
+  int     ReadBlks;          // Number of blocks read (selected)
+  int     Rbuf;              // Number of lines read in buffer
+  int     Modif;             // Number of modified lines in block
+  int     Blksize;           // Size of padded blocks
+  int     Ending;            // Length of line end
+  bool    Padded;            // true if fixed size blocks are padded
+  bool    Eof;               // true if an EOF (0xA) character exists
+  bool    Indxd;             // True for indexed UPDATE/DELETE
+  bool    Abort;             // To abort on error
+  char   *CrLf;              // End of line character(s)
+  }; // end of class TXTFAM
+
+/***********************************************************************/
+/*  This is the DOS/UNIX Access Method class declaration for standard  */
+/*  text files with variable record format (DOS, CSV, FMT)             */
+/***********************************************************************/
+class DllExport DOSFAM : public TXTFAM {
+ public:
+  // Constructor
+  DOSFAM(PDOSDEF tdp);
+  DOSFAM(PDOSFAM txfp);
+  DOSFAM(PBLKFAM tdfp, PDOSDEF tdp);
+
+  // Implementation
+  virtual AMT   GetAmType(void) {return TYPE_AM_DOS;}
+  virtual bool  GetUseTemp(void) {return UseTemp;}
+  virtual int   GetPos(void);
+  virtual int   GetNextPos(void);
+  virtual PTXF  Duplicate(PGLOBAL g)
+                  {return (PTXF)new(g) DOSFAM(this);}
+
+  // Methods
+  virtual void  Reset(void);
+  virtual int   GetFileLength(PGLOBAL g);
+  virtual int   Cardinality(PGLOBAL g);
+  virtual int   MaxBlkSize(PGLOBAL g, int s);
+  virtual bool  AllocateBuffer(PGLOBAL g);
+  virtual int   GetRowID(void);
+  virtual bool  RecordPos(PGLOBAL g);
+  virtual bool  SetPos(PGLOBAL g, int recpos);
+  virtual int   SkipRecord(PGLOBAL g, bool header);
+  virtual bool  OpenTableFile(PGLOBAL g);
+  virtual int   ReadBuffer(PGLOBAL g);
+  virtual int   WriteBuffer(PGLOBAL g);
+  virtual int   DeleteRecords(PGLOBAL g, int irc);
+  virtual void  CloseTableFile(PGLOBAL g, bool abort);
+  virtual void  Rewind(void);
+
+ protected:
+  virtual bool  OpenTempFile(PGLOBAL g);
+  virtual bool  MoveIntermediateLines(PGLOBAL g, bool *b);
+  virtual int   RenameTempFile(PGLOBAL g);
+  virtual bool  MakeUpdatedFile(PGLOBAL g);
+  virtual bool  MakeDeletedFile(PGLOBAL g);
+
+  // Members
+  FILE   *Stream;             // Points to Dos file structure
+  FILE   *T_Stream;           // Points to temporary file structure
+  PFBLOCK To_Fbt;             // Pointer to temp file block
+  int     Fpos;               // Position of last read record
+  int     Tpos;               // Target Position for delete move
+  int     Spos;               // Start position for update/delete move
+  bool    UseTemp;            // True to use a temporary file in Upd/Del
+  bool    Bin;                // True to force binary mode
+  }; // end of class DOSFAM
+
+/***********************************************************************/
+/*  This is the DOS/UNIX Access Method class declaration for standard  */
+/*  text files with variable record format (DOS, CSV, FMT)             */
+/***********************************************************************/
+class DllExport BLKFAM : public DOSFAM {
+ public:
+  // Constructor
+  BLKFAM(PDOSDEF tdp);
+  BLKFAM(PBLKFAM txfp);
+
+  // Implementation
+  virtual AMT   GetAmType(void) {return TYPE_AM_BLK;}
+  virtual int   GetPos(void);
+  virtual int   GetNextPos(void);
+  virtual PTXF  Duplicate(PGLOBAL g)
+                  {return (PTXF)new(g) BLKFAM(this);}
+
+  // Methods
+  virtual void  Reset(void);
+  virtual int   Cardinality(PGLOBAL g);
+  virtual int   MaxBlkSize(PGLOBAL g, int s);
+  virtual bool  AllocateBuffer(PGLOBAL g);
+  virtual int   GetRowID(void);
+  virtual bool  RecordPos(PGLOBAL g);
+  virtual bool  SetPos(PGLOBAL g, int recpos);
+  virtual int   SkipRecord(PGLOBAL g, bool header);
+  virtual int   ReadBuffer(PGLOBAL g);
+  virtual int   WriteBuffer(PGLOBAL g);
+  virtual void  CloseTableFile(PGLOBAL g, bool abort);
+  virtual void  Rewind(void);
+
+ protected:
+  // Members
+  char *CurLine;              // Position of current line in buffer
+  char *NxtLine;              // Position of Next    line in buffer
+  char *OutBuf;               // Buffer to write in temporary file
+  bool  Closing;              // True when closing on Update
+  }; // end of class BLKFAM
+
+#endif // __FILAMTXT_H