- MRR + Block Indexing

modified:
  storage/connect/array.h
  storage/connect/catalog.h
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/connect.h
  storage/connect/domdoc.h
  storage/connect/filamap.cpp
  storage/connect/filamap.h
  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/filamzip.cpp
  storage/connect/filamzip.h
  storage/connect/filter.cpp
  storage/connect/filter.h
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/myconn.h
  storage/connect/plgcnx.h
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
  storage/connect/plugutil.c
  storage/connect/preparse.h
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/tabcol.h
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabfix.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabfmt.h
  storage/connect/table.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/taboccur.h
  storage/connect/tabodbc.h
  storage/connect/tabsys.h
  storage/connect/tabtbl.h
  storage/connect/tabutil.h
  storage/connect/tabvct.cpp
  storage/connect/tabvct.h
  storage/connect/tabwmi.h
  storage/connect/tabxml.h
  storage/connect/user_connect.cc
  storage/connect/user_connect.h
  storage/connect/valblk.cpp
  storage/connect/valblk.h
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xindex.cpp
  storage/connect/xindex.h
  storage/connect/xobject.cpp
  storage/connect/xobject.h
  storage/connect/xtable.h

1 files changed, 205 insertions, 221 deletions

diff --git a/storage/connect/colblk.h b/storage/connect/colblk.h
index 1204c4623f7..93d39524362 100644
--- a/storage/connect/colblk.h
+++ b/storage/connect/colblk.h
@@ -1,221 +1,205 @@
-/*************** Colblk H Declares Source Code File (.H) ***************/
-/*  Name: COLBLK.H    Version 1.7                                      */
-/*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          2005-2014    */
-/*                                                                     */
-/*  This file contains the COLBLK and derived classes declares.        */
-/***********************************************************************/
-#ifndef __COLBLK__H
-#define  __COLBLK__H
-
-/***********************************************************************/
-/*  Include required application header files                          */
-/***********************************************************************/
-#include "xobject.h"
-#include "reldef.h"
-
-/***********************************************************************/
-/*  Class COLBLK: Base class for table column descriptors.             */
-/***********************************************************************/
-class DllExport COLBLK : public XOBJECT {
-  friend class TDBPIVOT;
- protected:
-  // Default constructors used by derived classes
-  COLBLK(PCOLDEF cdp = NULL, PTDB tdbp = NULL, int i = 0);
-  COLBLK(PCOL colp, PTDB tdbp = NULL);     // Used in copy process
-  COLBLK(int n) {}     // Used when changing a column class in TDBXML
-
- public:
-  // Implementation
-  virtual int     GetType(void) {return TYPE_COLBLK;}
-  virtual int     GetResultType(void) {return Buf_Type;}
-  virtual int     GetScale(void) {return Format.Prec;}
-  virtual int     GetPrecision(void) {return Precision;}
-  virtual int     GetLength(void) {return Long;}
-  virtual int     GetLengthEx(void);
-  virtual int     GetAmType() {return TYPE_AM_ERROR;}
-  virtual void    SetOk(void) {Status |= BUF_EMPTY;}
-  virtual PTDB    GetTo_Tdb(void) {return To_Tdb;}
-#if defined(BLK_INDX)
-  virtual int     GetClustered(void) {return 0;}
-  virtual int			IsClustered(void) {return FALSE;}
-#endif   // BLK_INDX
-          PCOL    GetNext(void) {return Next;}
-          PSZ     GetName(void) {return Name;}
-          int     GetIndex(void) {return Index;}
-          int     GetOpt(void) {return Opt;}
-          ushort  GetColUse(void) {return ColUse;}
-          ushort  GetColUse(ushort u) {return (ColUse & u);}
-          ushort  GetStatus(void) {return Status;}
-          ushort  GetStatus(ushort u) {return (Status & u);}
-          void    SetColUse(ushort u) {ColUse = u;}
-          void    SetStatus(ushort u) {Status = u;}
-          void    AddColUse(ushort u) {ColUse |= u;}
-          void    AddStatus(ushort u) {Status |= u;}
-          void    SetNext(PCOL cp) {Next = cp;}
-#if defined(MRRBKA_SUPPORT)
-          PXCOL   GetKcol(void) {return To_Kcol;}
-#endif   // MRRBKA_SUPPORT
-          void    SetKcol(PXCOL kcp) {To_Kcol = kcp;}
-          PCOLDEF GetCdp(void) {return Cdp;}
-          PSZ     GetDomain(void) {return (Cdp) ? Cdp->Decode : NULL;}
-          PSZ     GetDesc(void) {return (Cdp) ? Cdp->Desc : NULL;}
-          PSZ     GetFmt(void) {return (Cdp) ? Cdp->Fmt : NULL;}
-          bool    IsUnsigned(void) {return Unsigned;}
-          bool    IsNullable(void) {return Nullable;}
-          void    SetNullable(bool b) {Nullable = b;}
-                  
-  // Methods      
-  virtual void    Reset(void);
-  virtual bool    Compare(PXOB xp);
-  virtual bool    SetFormat(PGLOBAL, FORMAT&);
-  virtual int     CheckColumn(PGLOBAL g, PSQL sqlp, PXOB &xp, int &ag);
-  virtual bool    IsSpecial(void) {return false;}
-  virtual int     CheckSpcCol(PTDB tdbp, int n) {return 2;}
-  virtual bool    CheckSort(PTDB tdbp);
-  virtual bool    Eval(PGLOBAL g);
-  virtual bool    SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-  virtual void    SetTo_Val(PVAL valp) {}
-  virtual void    ReadColumn(PGLOBAL g);
-  virtual void    WriteColumn(PGLOBAL g);
-  virtual void    Print(PGLOBAL g, FILE *, uint);
-  virtual void    Print(PGLOBAL g, char *, uint);
-#if defined(BLK_INDX)
-  virtual bool    VarSize(void) {return false;}
-#endif   // BLK_INDX
-  virtual bool    IsColInside(PCOL colp) {return this == colp;}
-          bool    InitValue(PGLOBAL g);
-
- protected:
-  // Members
-  PCOL    Next;                // Next column in table
-  PSZ     Name;                // Column name
-  PCOLDEF Cdp;                 // To column definition block
-  PTDB    To_Tdb;              // Points to Table Descriptor Block
-  PXCOL   To_Kcol;             // Points to Xindex matching column
-  bool    Nullable;            // True if nullable
-  bool    Unsigned;            // True if unsigned
-  int     Index;               // Column number in table
-  int     Opt;                 // Cluster/sort information
-  int     Buf_Type;            // Data type
-  int     Long;                // Internal length in table
-  int     Precision;           // Column length (as for ODBC)
-  int     Freq;                // Evaluated ceiling of distinct values
-  FORMAT  Format;              // Output format
-  ushort  ColUse;              // Column usage
-  ushort  Status;              // Column read status
-  }; // end of class COLBLK
-
-/***********************************************************************/
-/*  Class SPCBLK: Base class for special column descriptors.           */
-/***********************************************************************/
-class DllExport SPCBLK : public COLBLK {
- public:
-  // Constructor
-  SPCBLK(PCOLUMN cp);
-
-  // Implementation
-  virtual int  GetAmType(void) = 0;
-  virtual  bool GetRnm(void) {return false;}
-
-  // Methods
-  virtual bool IsSpecial(void) {return true;}
-  virtual void ReadColumn(PGLOBAL g) = 0;
-  virtual void WriteColumn(PGLOBAL g);
-
- protected:
-  // Default constructor not to be used
-  SPCBLK(void) : COLBLK(1) {}
-  }; // end of class SPCBLK
-
-/***********************************************************************/
-/*  Class RIDBLK: ROWID special column descriptor.                     */
-/***********************************************************************/
-class DllExport RIDBLK : public SPCBLK {
- public:
-  // Constructor
-  RIDBLK(PCOLUMN cp, bool rnm);
-
-  // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_ROWID;}
-  virtual  bool GetRnm(void) {return Rnm;}
-
-  // Methods
-  virtual void ReadColumn(PGLOBAL g);
-
- protected:
-  bool Rnm;                         // False for RowID, True for RowNum
-  }; // end of class RIDBLK
-
-/***********************************************************************/
-/*  Class FIDBLK: FILEID special column descriptor.                    */
-/***********************************************************************/
-class DllExport FIDBLK : public SPCBLK {
- public:
-  // Constructor
-  FIDBLK(PCOLUMN cp);
-
-  // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_FILID;}
-
-  // Methods
-  virtual void Reset(void) {}       // This is a pseudo constant column
-  virtual int  CheckSpcCol(PTDB tdbp, int n) 
-  {return (n == 2 && tdbp == To_Tdb) ? 1 : 2;}
-  virtual void ReadColumn(PGLOBAL g);
-
- protected:
-  PSZ  Fn;                         // The current To_File of the table
-  }; // end of class FIDBLK
-
-/***********************************************************************/
-/*  Class TIDBLK: TABID special column descriptor.                     */
-/***********************************************************************/
-class DllExport TIDBLK : public SPCBLK {
- public:
-  // Constructor
-  TIDBLK(PCOLUMN cp);
-
-  // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_TABID;}
-
-  // Methods
-  virtual void Reset(void) {}       // This is a pseudo constant column
-  virtual int  CheckSpcCol(PTDB tdbp, int n)
-              {return (n == 3 && tdbp == To_Tdb) ? 1 : 2;}
-  virtual void ReadColumn(PGLOBAL g);
-
- protected:
-  // Default constructor not to be used
-  TIDBLK(void) {}
-
-  // Members
-  PSZ  Tname;                       // The current table name
-  }; // end of class TIDBLK
-
-/***********************************************************************/
-/*  Class SIDBLK: SERVID special column descriptor.                    */
-/***********************************************************************/
-class DllExport SIDBLK : public SPCBLK {
- public:
-  // Constructor
-  SIDBLK(PCOLUMN cp);
-
-  // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_SRVID;}
-
-  // Methods
-  virtual void Reset(void) {}       // This is a pseudo constant column
-  virtual int  CheckSpcCol(PTDB tdbp, int n)
-              {return (n == 3 && tdbp == To_Tdb) ? 1 : 2;}
-  virtual void ReadColumn(PGLOBAL g);
-
- protected:
-  // Default constructor not to be used
-  SIDBLK(void) {}
-
-  // Members
-  PSZ  Sname;                       // The current server name
-  }; // end of class SIDBLK
-
-#endif // __COLBLK__H
+/*************** Colblk H Declares Source Code File (.H) ***************/

+/*  Name: COLBLK.H    Version 1.7                                      */

+/*                                                                     */

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

+/*                                                                     */

+/*  This file contains the COLBLK and derived classes declares.        */

+/***********************************************************************/

+#ifndef __COLBLK__H

+#define  __COLBLK__H

+

+/***********************************************************************/

+/*  Include required application header files                          */

+/***********************************************************************/

+#include "xobject.h"

+#include "reldef.h"

+

+/***********************************************************************/

+/*  Class COLBLK: Base class for table column descriptors.             */

+/***********************************************************************/

+class DllExport COLBLK : public XOBJECT {

+  friend class TDBPIVOT;

+ protected:

+  // Default constructors used by derived classes

+  COLBLK(PCOLDEF cdp = NULL, PTDB tdbp = NULL, int i = 0);

+  COLBLK(PCOL colp, PTDB tdbp = NULL);     // Used in copy process

+  COLBLK(int n) {}     // Used when changing a column class in TDBXML

+

+ public:

+  // Implementation

+  virtual int     GetType(void) {return TYPE_COLBLK;}

+  virtual int     GetResultType(void) {return Buf_Type;}

+  virtual int     GetScale(void) {return Format.Prec;}

+  virtual int     GetPrecision(void) {return Precision;}

+  virtual int     GetLength(void) {return Long;}

+  virtual int     GetLengthEx(void);

+  virtual int     GetAmType() {return TYPE_AM_ERROR;}

+  virtual void    SetOk(void) {Status |= BUF_EMPTY;}

+  virtual PTDB    GetTo_Tdb(void) {return To_Tdb;}

+  virtual int     GetClustered(void) {return 0;}

+  virtual int     IsClustered(void) {return FALSE;}

+          PCOL    GetNext(void) {return Next;}

+          PSZ     GetName(void) {return Name;}

+          int     GetIndex(void) {return Index;}

+          ushort  GetColUse(void) {return ColUse;}

+          int     GetOpt(void) {return Opt;}

+          ushort  GetColUse(ushort u) {return (ColUse & u);}

+          ushort  GetStatus(void) {return Status;}

+          ushort  GetStatus(ushort u) {return (Status & u);}

+          void    SetColUse(ushort u) {ColUse = u;}

+          void    SetStatus(ushort u) {Status = u;}

+          void    AddColUse(ushort u) {ColUse |= u;}

+          void    AddStatus(ushort u) {Status |= u;}

+          void    SetNext(PCOL cp) {Next = cp;}

+          PXCOL   GetKcol(void) {return To_Kcol;}

+          void    SetKcol(PXCOL kcp) {To_Kcol = kcp;}

+          PCOLDEF GetCdp(void) {return Cdp;}

+          PSZ     GetDomain(void) {return (Cdp) ? Cdp->Decode : NULL;}

+          PSZ     GetDesc(void) {return (Cdp) ? Cdp->Desc : NULL;}

+          PSZ     GetFmt(void) {return (Cdp) ? Cdp->Fmt : NULL;}

+          bool    IsUnsigned(void) {return Unsigned;}

+          bool    IsNullable(void) {return Nullable;}

+          void    SetNullable(bool b) {Nullable = b;}

+

+  // Methods

+  virtual void    Reset(void);

+  virtual bool    Compare(PXOB xp);

+  virtual bool    SetFormat(PGLOBAL, FORMAT&);

+  virtual bool    IsSpecial(void) {return false;}

+  virtual bool    Eval(PGLOBAL g);

+  virtual bool    SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);

+  virtual void    SetTo_Val(PVAL valp) {}

+  virtual void    ReadColumn(PGLOBAL g);

+  virtual void    WriteColumn(PGLOBAL g);

+  virtual void    Print(PGLOBAL g, FILE *, uint);

+  virtual void    Print(PGLOBAL g, char *, uint);

+  virtual bool    VarSize(void) {return false;}

+          bool    InitValue(PGLOBAL g);

+

+ protected:

+  // Members

+  PCOL    Next;                // Next column in table

+  PSZ     Name;                // Column name

+  PCOLDEF Cdp;                 // To column definition block

+  PTDB    To_Tdb;              // Points to Table Descriptor Block

+  PXCOL   To_Kcol;             // Points to Xindex matching column

+  bool    Nullable;            // True if nullable

+  bool    Unsigned;            // True if unsigned

+  int     Index;               // Column number in table

+  int     Opt;                 // Cluster/sort information

+  int     Buf_Type;            // Data type

+  int     Long;                // Internal length in table

+  int     Precision;           // Column length (as for ODBC)

+  int     Freq;                // Evaluated ceiling of distinct values

+  FORMAT  Format;              // Output format

+  ushort  ColUse;              // Column usage

+  ushort  Status;              // Column read status

+  }; // end of class COLBLK

+

+/***********************************************************************/

+/*  Class SPCBLK: Base class for special column descriptors.           */

+/***********************************************************************/

+class DllExport SPCBLK : public COLBLK {

+ public:

+  // Constructor

+  SPCBLK(PCOLUMN cp);

+

+  // Implementation

+  virtual int  GetAmType(void) = 0;

+  virtual  bool GetRnm(void) {return false;}

+

+  // Methods

+  virtual bool IsSpecial(void) {return true;}

+  virtual void ReadColumn(PGLOBAL g) = 0;

+  virtual void WriteColumn(PGLOBAL g);

+

+ protected:

+  // Default constructor not to be used

+  SPCBLK(void) : COLBLK(1) {}

+  }; // end of class SPCBLK

+

+/***********************************************************************/

+/*  Class RIDBLK: ROWID special column descriptor.                     */

+/***********************************************************************/

+class DllExport RIDBLK : public SPCBLK {

+ public:

+  // Constructor

+  RIDBLK(PCOLUMN cp, bool rnm);

+

+  // Implementation

+  virtual int  GetAmType(void) {return TYPE_AM_ROWID;}

+  virtual  bool GetRnm(void) {return Rnm;}

+

+  // Methods

+  virtual void ReadColumn(PGLOBAL g);

+

+ protected:

+  bool Rnm;                         // False for RowID, True for RowNum

+  }; // end of class RIDBLK

+

+/***********************************************************************/

+/*  Class FIDBLK: FILEID special column descriptor.                    */

+/***********************************************************************/

+class DllExport FIDBLK : public SPCBLK {

+ public:

+  // Constructor

+  FIDBLK(PCOLUMN cp);

+

+  // Implementation

+  virtual int  GetAmType(void) {return TYPE_AM_FILID;}

+

+  // Methods

+  virtual void Reset(void) {}       // This is a pseudo constant column

+  virtual void ReadColumn(PGLOBAL g);

+

+ protected:

+  PSZ  Fn;                         // The current To_File of the table

+  }; // end of class FIDBLK

+

+/***********************************************************************/

+/*  Class TIDBLK: TABID special column descriptor.                     */

+/***********************************************************************/

+class DllExport TIDBLK : public SPCBLK {

+ public:

+  // Constructor

+  TIDBLK(PCOLUMN cp);

+

+  // Implementation

+  virtual int  GetAmType(void) {return TYPE_AM_TABID;}

+

+  // Methods

+  virtual void Reset(void) {}       // This is a pseudo constant column

+  virtual void ReadColumn(PGLOBAL g);

+

+ protected:

+  // Default constructor not to be used

+  TIDBLK(void) {}

+

+  // Members

+  PSZ  Tname;                       // The current table name

+  }; // end of class TIDBLK

+

+/***********************************************************************/

+/*  Class SIDBLK: SERVID special column descriptor.                    */

+/***********************************************************************/

+class DllExport SIDBLK : public SPCBLK {

+ public:

+  // Constructor

+  SIDBLK(PCOLUMN cp);

+

+  // Implementation

+  virtual int  GetAmType(void) {return TYPE_AM_SRVID;}

+

+  // Methods

+  virtual void Reset(void) {}       // This is a pseudo constant column

+  virtual void ReadColumn(PGLOBAL g);

+

+ protected:

+  // Default constructor not to be used

+  SIDBLK(void) {}

+

+  // Members

+  PSZ  Sname;                       // The current server name

+  }; // end of class SIDBLK

+

+#endif // __COLBLK__H