- 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, 121 insertions, 123 deletions

diff --git a/storage/connect/tabvct.h b/storage/connect/tabvct.h
index f1c0a8a3a98..e15150ab356 100644
--- a/storage/connect/tabvct.h
+++ b/storage/connect/tabvct.h
@@ -1,123 +1,121 @@
-/*************** TabVct H Declares Source Code File (.H) ***************/
-/*  Name: TABVCT.H    Version 3.4                                      */
-/*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          1999-2011    */
-/*                                                                     */
-/*  This file contains the TDBVCT class  declares.                     */
-/***********************************************************************/
-#ifndef __TABVCT__
-#define __TABVCT__
-
-#include "tabfix.h"
-#if defined(UNIX)
-//#include <string.h.SUNWCCh>
-#endif
-
-typedef class TDBVCT *PTDBVCT;
-typedef class VCTCOL *PVCTCOL;
-
-/***********************************************************************/
-/*  VCT table.                                                         */
-/***********************************************************************/
-class DllExport VCTDEF : public DOSDEF {  /* Logical table description */
-  friend class VCTFAM;
-  friend class VECFAM;
-  friend class VMPFAM;
- public:
-  // Constructor
-  VCTDEF(void) {Split = Estimate = Header = 0;}
-
-  // Implementation
-  virtual const char *GetType(void) {return "VCT";}
-  int  GetEstimate(void) {return Estimate;}
-
-  // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE mode);
-
- protected:
-  // Specific file erase routine for vertical tables
-//virtual bool Erase(char *filename);
-          int  MakeFnPattern(char *fpat);
-
-  // Members
-  int     Split;              /* Columns in separate files             */
-  int     Estimate;           /* Estimated maximum size of table       */
-  int     Header;              /* 0: no, 1: separate, 2: in data file   */
-  }; // end of VCTDEF
-
-/***********************************************************************/
-/*  This is the DOS/UNIX Access Method class declaration for files     */
-/*  in blocked vector format. In each block containing "Elements"      */
-/*  records, values of each columns are consecutively stored (vector). */
-/***********************************************************************/
-class DllExport TDBVCT : public TDBFIX {
-  friend class VCTCOL;
-  friend class VCTFAM;
-  friend class VCMFAM;
-  friend class VECFAM;
-  friend class VMPFAM;
- public:
-  // Constructors
-  TDBVCT(PVCTDEF tdp, PTXF txfp);
-  TDBVCT(PGLOBAL g, PTDBVCT tdbp);
-
-  // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_VCT;}
-  virtual PTDB Duplicate(PGLOBAL g)
-                {return (PTDB)new(g) TDBVCT(g, this);}
-
-  // Methods
-  virtual PTDB CopyOne(PTABS t);
-
-  // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual void CloseDB(PGLOBAL g);
-
- protected:
-  // Members
-  }; // end of class TDBVCT
-
-/***********************************************************************/
-/*  Class VCTCOL: VCT access method column descriptor.                 */
-/*  This A.M. is used for file having column wise organization.        */
-/***********************************************************************/
-class DllExport VCTCOL : public DOSCOL {
-  friend class TDBVCT;
-  friend class VCTFAM;
-  friend class VCMFAM;
-  friend class VECFAM;
-  friend class VMPFAM;
-  friend class BGVFAM;
- public:
-  // Constructors
-  VCTCOL(PGLOBAL g, PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i);
-  VCTCOL(VCTCOL *colp, PTDB tdbp); // Constructor used in copy process
-
-  // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_VCT;}
-
-  // Methods
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
-  virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-  virtual void SetOk(void); 
-
- protected:
-  virtual void ReadBlock(PGLOBAL g);
-  virtual void WriteBlock(PGLOBAL g);
-
-  VCTCOL(void) {}        // Default constructor not to be used
-
-  // Members
-  PVBLK Blk;             // Block buffer
-  int   Clen;            // Internal length in table
-  int   ColBlk;          // Block pointed by column
-  int   ColPos;          // Last position read
-  int   Modif;           // Number of modified lines in block
-  }; // end of class VCTCOL
-
-#endif // __TABVCT__
-
+/*************** TabVct H Declares Source Code File (.H) ***************/

+/*  Name: TABVCT.H    Version 3.4                                      */

+/*                                                                     */

+/*  (C) Copyright to the author Olivier BERTRAND          1999-2011    */

+/*                                                                     */

+/*  This file contains the TDBVCT class  declares.                     */

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

+#ifndef __TABVCT__

+#define __TABVCT__

+

+#include "tabfix.h"

+#if defined(UNIX)

+//#include <string.h.SUNWCCh>

+#endif

+

+typedef class TDBVCT *PTDBVCT;

+typedef class VCTCOL *PVCTCOL;

+

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

+/*  VCT table.                                                         */

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

+class DllExport VCTDEF : public DOSDEF {  /* Logical table description */

+  friend class VCTFAM;

+  friend class VECFAM;

+  friend class VMPFAM;

+ public:

+  // Constructor

+  VCTDEF(void) {Split = Estimate = Header = 0;}

+

+  // Implementation

+  virtual const char *GetType(void) {return "VCT";}

+  int  GetEstimate(void) {return Estimate;}

+

+  // Methods

+  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);

+  virtual PTDB GetTable(PGLOBAL g, MODE mode);

+

+ protected:

+          int  MakeFnPattern(char *fpat);

+

+  // Members

+  int     Split;              /* Columns in separate files             */

+  int     Estimate;           /* Estimated maximum size of table       */

+  int     Header;              /* 0: no, 1: separate, 2: in data file   */

+  }; // end of VCTDEF

+

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

+/*  This is the DOS/UNIX Access Method class declaration for files     */

+/*  in blocked vector format. In each block containing "Elements"      */

+/*  records, values of each columns are consecutively stored (vector). */

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

+class DllExport TDBVCT : public TDBFIX {

+  friend class VCTCOL;

+  friend class VCTFAM;

+  friend class VCMFAM;

+  friend class VECFAM;

+  friend class VMPFAM;

+ public:

+  // Constructors

+  TDBVCT(PVCTDEF tdp, PTXF txfp);

+  TDBVCT(PGLOBAL g, PTDBVCT tdbp);

+

+  // Implementation

+  virtual AMT  GetAmType(void) {return TYPE_AM_VCT;}

+  virtual PTDB Duplicate(PGLOBAL g)

+                {return (PTDB)new(g) TDBVCT(g, this);}

+

+  // Methods

+  virtual PTDB CopyOne(PTABS t);

+

+  // Database routines

+  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);

+  virtual bool OpenDB(PGLOBAL g);

+  virtual int  ReadDB(PGLOBAL g);

+  virtual void CloseDB(PGLOBAL g);

+

+ protected:

+  // Members

+  }; // end of class TDBVCT

+

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

+/*  Class VCTCOL: VCT access method column descriptor.                 */

+/*  This A.M. is used for file having column wise organization.        */

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

+class DllExport VCTCOL : public DOSCOL {

+  friend class TDBVCT;

+  friend class VCTFAM;

+  friend class VCMFAM;

+  friend class VECFAM;

+  friend class VMPFAM;

+  friend class BGVFAM;

+ public:

+  // Constructors

+  VCTCOL(PGLOBAL g, PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i);

+  VCTCOL(VCTCOL *colp, PTDB tdbp); // Constructor used in copy process

+

+  // Implementation

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

+

+  // Methods

+  virtual void ReadColumn(PGLOBAL g);

+  virtual void WriteColumn(PGLOBAL g);

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

+  virtual void SetOk(void);

+

+ protected:

+  virtual void ReadBlock(PGLOBAL g);

+  virtual void WriteBlock(PGLOBAL g);

+

+  VCTCOL(void) {}        // Default constructor not to be used

+

+  // Members

+  PVBLK Blk;             // Block buffer

+  int   Clen;            // Internal length in table

+  int   ColBlk;          // Block pointed by column

+  int   ColPos;          // Last position read

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

+  }; // end of class VCTCOL

+

+#endif // __TABVCT__

+