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, 115 insertions, 113 deletions

diff --git a/storage/connect/filamap.h b/storage/connect/filamap.h
index ccdbf6cb8bd..7d3203d7ff2 100644
--- a/storage/connect/filamap.h
+++ b/storage/connect/filamap.h
@@ -1,113 +1,115 @@
-/*************** FilAMap H Declares Source Code File (.H) **************/

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

-/*                                                                     */

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

-/*                                                                     */

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

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

-#ifndef __FILAMAP_H

-#define __FILAMAP_H

-

-#include "block.h"

-#include "filamtxt.h"

-

-typedef class MAPFAM *PMAPFAM;

-

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

-/*  This is the variable file access method using file mapping.        */

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

-class DllExport MAPFAM : public TXTFAM {

- public:

-  // Constructor

-  MAPFAM(PDOSDEF tdp);

-  MAPFAM(PMAPFAM tmfp);

-

-  // Implementation

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

-  virtual int   GetPos(void);

-  virtual int   GetNextPos(void);

-  virtual PTXF  Duplicate(PGLOBAL g)

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

-

-  // Methods

-  virtual void  Reset(void);

-  virtual int   GetFileLength(PGLOBAL g);

-  virtual int   Cardinality(PGLOBAL g) {return (g) ? -1 : 0;}

-  virtual int   MaxBlkSize(PGLOBAL g, int s) {return s;}

-  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 bool  DeferReading(void) {return false;}

-  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:

-  // Members

-  char *Memory;               // Pointer on file mapping view.

-  char *Mempos;               // Position of next data to read

-  char *Fpos;                  // Position of last read record

-  char *Tpos;                 // Target Position for delete move

-  char *Spos;                 // Start position for delete move

-  char *Top;                  // Mark end of file mapping view

-  }; // end of class MAPFAM

-

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

-/*  This is the blocked file access method using file mapping.         */

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

-class DllExport MBKFAM : public MAPFAM {

- public:

-  // Constructor

-  MBKFAM(PDOSDEF tdp);

-  MBKFAM(PMAPFAM tmfp) : MAPFAM(tmfp) {}

-

-  // Implementation

-  virtual PTXF Duplicate(PGLOBAL g)

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

-

-  // Methods

-  virtual void Reset(void);

-  virtual int  Cardinality(PGLOBAL g);

-  virtual int  MaxBlkSize(PGLOBAL g, int s)

-                {return TXTFAM::MaxBlkSize(g, s);}

-  virtual int  GetRowID(void);

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

-  virtual int  ReadBuffer(PGLOBAL g);

-  virtual void Rewind(void);

-

- protected:

-  // No additional members

-  }; // end of class MBKFAM

-

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

-/*  This is the fixed file access method using file mapping.           */

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

-class DllExport MPXFAM : public MBKFAM {

- public:

-  // Constructor

-  MPXFAM(PDOSDEF tdp);

-  MPXFAM(PMAPFAM tmfp) : MBKFAM(tmfp) {}

-

-  // Implementation

-  virtual int   GetPos(void);

-  virtual PTXF  Duplicate(PGLOBAL g)

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

-

-  // Methods

-  virtual int   Cardinality(PGLOBAL g) {return TXTFAM::Cardinality(g);}

-  virtual int   MaxBlkSize(PGLOBAL g, int s)

-                {return TXTFAM::MaxBlkSize(g, s);}

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

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

-  virtual int   ReadBuffer(PGLOBAL g);

-  virtual int   WriteBuffer(PGLOBAL g);

-

- protected:

-  // No additional members

-  }; // end of class MPXFAM

-

-#endif // __FILAMAP_H

+/*************** FilAMap H Declares Source Code File (.H) **************/
+/*  Name: FILAMAP.H     Version 1.3                                    */
+/*                                                                     */
+/*  (C) Copyright to the author Olivier BERTRAND          2005-2014    */
+/*                                                                     */
+/*  This file contains the MAP file access method classes declares.    */
+/***********************************************************************/
+#ifndef __FILAMAP_H
+#define __FILAMAP_H
+
+#include "block.h"
+#include "filamtxt.h"
+
+typedef class MAPFAM *PMAPFAM;
+
+/***********************************************************************/
+/*  This is the variable file access method using file mapping.        */
+/***********************************************************************/
+class DllExport MAPFAM : public TXTFAM {
+ public:
+  // Constructor
+  MAPFAM(PDOSDEF tdp);
+  MAPFAM(PMAPFAM tmfp);
+
+  // Implementation
+  virtual AMT   GetAmType(void) {return TYPE_AM_MAP;}
+  virtual int   GetPos(void);
+  virtual int   GetNextPos(void);
+  virtual PTXF  Duplicate(PGLOBAL g)
+                  {return (PTXF)new(g) MAPFAM(this);}
+
+  // Methods
+  virtual void  Reset(void);
+  virtual int   GetFileLength(PGLOBAL g);
+  virtual int   Cardinality(PGLOBAL g) {return (g) ? -1 : 0;}
+  virtual int   MaxBlkSize(PGLOBAL g, int s) {return s;}
+  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 bool  DeferReading(void) {return false;}
+  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:
+          bool  MakeDeletedFile(PGLOBAL g);
+
+  // Members
+  char *Memory;               // Pointer on file mapping view.
+  char *Mempos;               // Position of next data to read
+  char *Fpos;                 // Position of last read record
+  char *Tpos;                 // Target Position for delete move
+  char *Spos;                 // Start position for delete move
+  char *Top;                  // Mark end of file mapping view
+  }; // end of class MAPFAM
+
+/***********************************************************************/
+/*  This is the blocked file access method using file mapping.         */
+/***********************************************************************/
+class DllExport MBKFAM : public MAPFAM {
+ public:
+  // Constructor
+  MBKFAM(PDOSDEF tdp);
+  MBKFAM(PMAPFAM tmfp) : MAPFAM(tmfp) {}
+
+  // Implementation
+  virtual PTXF Duplicate(PGLOBAL g)
+                  {return (PTXF)new(g) MBKFAM(this);}
+
+  // Methods
+  virtual void Reset(void);
+  virtual int  Cardinality(PGLOBAL g);
+  virtual int  MaxBlkSize(PGLOBAL g, int s)
+                {return TXTFAM::MaxBlkSize(g, s);}
+  virtual int  GetRowID(void);
+  virtual int  SkipRecord(PGLOBAL g, bool header);
+  virtual int  ReadBuffer(PGLOBAL g);
+  virtual void Rewind(void);
+
+ protected:
+  // No additional members
+  }; // end of class MBKFAM
+
+/***********************************************************************/
+/*  This is the fixed file access method using file mapping.           */
+/***********************************************************************/
+class DllExport MPXFAM : public MBKFAM {
+ public:
+  // Constructor
+  MPXFAM(PDOSDEF tdp);
+  MPXFAM(PMAPFAM tmfp) : MBKFAM(tmfp) {}
+
+  // Implementation
+  virtual int   GetPos(void);
+  virtual PTXF  Duplicate(PGLOBAL g)
+                  {return (PTXF)new(g) MPXFAM(this);}
+
+  // Methods
+  virtual int   Cardinality(PGLOBAL g) {return TXTFAM::Cardinality(g);}
+  virtual int   MaxBlkSize(PGLOBAL g, int s)
+                {return TXTFAM::MaxBlkSize(g, s);}
+  virtual bool  SetPos(PGLOBAL g, int recpos);
+  virtual bool  DeferReading(void) {return false;}
+  virtual int   ReadBuffer(PGLOBAL g);
+  virtual int   WriteBuffer(PGLOBAL g);
+
+ protected:
+  // No additional members
+  }; // end of class MPXFAM
+
+#endif // __FILAMAP_H