- 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, 169 insertions, 171 deletions

diff --git a/storage/connect/filamzip.h b/storage/connect/filamzip.h
index 67d9553a4e6..8111bc1ad97 100644
--- a/storage/connect/filamzip.h
+++ b/storage/connect/filamzip.h
@@ -1,171 +1,169 @@
-/************** FilAmZip H Declares Source Code File (.H) **************/
-/*  Name: FILAMZIP.H    Version 1.1                                    */
-/*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          2005-2012    */
-/*                                                                     */
-/*  This file contains the GZIP access method classes declares.        */
-/***********************************************************************/
-#ifndef __FILAMZIP_H
-#define __FILAMZIP_H
-
-#include "zlib.h"
-
-typedef class ZIPFAM *PZIPFAM;
-typedef class ZBKFAM *PZBKFAM;
-typedef class ZIXFAM *PZIXFAM;
-typedef class ZLBFAM *PZLBFAM;
-
-/***********************************************************************/
-/*  This is the access method class declaration for not optimized      */
-/*  variable record length files compressed using the gzip library     */
-/*  functions. File is accessed record by record (row).                */
-/***********************************************************************/
-class DllExport ZIPFAM : public TXTFAM {
-//  friend class DOSCOL;
- public:
-  // Constructor
-  ZIPFAM(PDOSDEF tdp) : TXTFAM(tdp) {Zfile = NULL; Zpos = 0;}
-  ZIPFAM(PZIPFAM txfp);
-
-  // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_ZIP;}
-  virtual int  GetPos(void);
-  virtual int  GetNextPos(void);
-  virtual PTXF Duplicate(PGLOBAL g)
-                {return (PTXF)new(g) ZIPFAM(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 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);
-  virtual void Rewind(void);
-
- protected:
-          int  Zerror(PGLOBAL g);    // GZ error function
-
-  // Members
-  gzFile  Zfile;              // Points to GZ file structure
-  z_off_t Zpos;               // Uncompressed file position
-  }; // end of class ZIPFAM
-
-/***********************************************************************/
-/*  This is the access method class declaration for optimized variable */
-/*  record length files compressed using the gzip library functions.   */
-/*  The File is accessed by block (requires an opt file).              */
-/***********************************************************************/
-class DllExport ZBKFAM : public ZIPFAM {
- public:
-  // Constructor
-  ZBKFAM(PDOSDEF tdp);
-  ZBKFAM(PZBKFAM txfp);
-
-  // Implementation
-  virtual int  GetPos(void);
-  virtual int  GetNextPos(void) {return 0;}
-  virtual PTXF Duplicate(PGLOBAL g)
-                {return (PTXF)new(g) ZBKFAM(this);}
-
-  // Methods
-  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 int  SkipRecord(PGLOBAL g, bool header);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g);
-  virtual void Rewind(void);
-
- protected:
-  // Members
-  char *CurLine;              // Position of current line in buffer
-  char *NxtLine;              // Position of Next    line in buffer
-  bool  Closing;              // True when closing on Insert
-  }; // end of class ZBKFAM
-
-/***********************************************************************/
-/*  This is the access method class declaration for fixed record       */
-/*  length files compressed using the gzip library functions.          */
-/*  The file is always accessed by block.                              */
-/***********************************************************************/
-class DllExport ZIXFAM : public ZBKFAM {
- public:
-  // Constructor
-  ZIXFAM(PDOSDEF tdp);
-  ZIXFAM(PZIXFAM txfp) : ZBKFAM(txfp) {}
-
-  // Implementation
-  virtual int  GetNextPos(void) {return 0;}
-  virtual PTXF Duplicate(PGLOBAL g)
-                {return (PTXF)new(g) ZIXFAM(this);}
-
-  // Methods
-  virtual int  Cardinality(PGLOBAL g);
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-
- protected:
-  // No additional Members
-  }; // end of class ZIXFAM
-
-#if defined(BLK_INDX)
-/***********************************************************************/
-/*  This is the DOS/UNIX Access Method class declaration for PlugDB    */
-/*  fixed/variable files compressed using the zlib library functions.  */
-/*  Physically these are written and read using the same technique     */
-/*  than blocked variable files, only the contain of each block is     */
-/*  compressed using the deflate zlib function. The purpose of this    */
-/*  specific format is to have a fast mechanism for direct access of   */
-/*  records so blocked optimization is fast and direct access (joins)  */
-/*  is allowed. Note that the block length is written ahead of each    */
-/*  block to enable reading when optimization file is not available.   */
-/***********************************************************************/
-class DllExport ZLBFAM : public BLKFAM {
- public:
-  // Constructor
-  ZLBFAM(PDOSDEF tdp);
-  ZLBFAM(PZLBFAM txfp);
-
-  // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_ZLIB;}
-  virtual int  GetPos(void);
-  virtual int  GetNextPos(void);
-  virtual PTXF Duplicate(PGLOBAL g)
-                  {return (PTXF)new(g) ZLBFAM(this);}
-  inline  void SetOptimized(bool b) {Optimized = b;}
-
-  // Methods
-  virtual int  GetFileLength(PGLOBAL g);
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual void CloseTableFile(PGLOBAL g);
-  virtual void Rewind(void);
-
- protected:
-          bool WriteCompressedBuffer(PGLOBAL g);
-          int  ReadCompressedBuffer(PGLOBAL g, void *rdbuf);
-
-  // Members
-  z_streamp Zstream;          // Compression/decompression stream
-  Byte     *Zbuffer;          // Compressed block buffer
-  int      *Zlenp;            // Pointer to block length
-  bool      Optimized;        // true when opt file is available
-  }; // end of class ZLBFAM
-#endif   // BLK_INDX
-
-#endif // __FILAMZIP_H
+/************** FilAmZip H Declares Source Code File (.H) **************/

+/*  Name: FILAMZIP.H    Version 1.2                                    */

+/*                                                                     */

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

+/*                                                                     */

+/*  This file contains the GZIP access method classes declares.        */

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

+#ifndef __FILAMZIP_H

+#define __FILAMZIP_H

+

+#include "zlib.h"

+

+typedef class ZIPFAM *PZIPFAM;

+typedef class ZBKFAM *PZBKFAM;

+typedef class ZIXFAM *PZIXFAM;

+typedef class ZLBFAM *PZLBFAM;

+

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

+/*  This is the access method class declaration for not optimized      */

+/*  variable record length files compressed using the gzip library     */

+/*  functions. File is accessed record by record (row).                */

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

+class DllExport ZIPFAM : public TXTFAM {

+//  friend class DOSCOL;

+ public:

+  // Constructor

+  ZIPFAM(PDOSDEF tdp) : TXTFAM(tdp) {Zfile = NULL; Zpos = 0;}

+  ZIPFAM(PZIPFAM txfp);

+

+  // Implementation

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

+  virtual int  GetPos(void);

+  virtual int  GetNextPos(void);

+  virtual PTXF Duplicate(PGLOBAL g)

+                {return (PTXF)new(g) ZIPFAM(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 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);

+  virtual void Rewind(void);

+

+ protected:

+          int  Zerror(PGLOBAL g);    // GZ error function

+

+  // Members

+  gzFile  Zfile;              // Points to GZ file structure

+  z_off_t Zpos;               // Uncompressed file position

+  }; // end of class ZIPFAM

+

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

+/*  This is the access method class declaration for optimized variable */

+/*  record length files compressed using the gzip library functions.   */

+/*  The File is accessed by block (requires an opt file).              */

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

+class DllExport ZBKFAM : public ZIPFAM {

+ public:

+  // Constructor

+  ZBKFAM(PDOSDEF tdp);

+  ZBKFAM(PZBKFAM txfp);

+

+  // Implementation

+  virtual int  GetPos(void);

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

+  virtual PTXF Duplicate(PGLOBAL g)

+                {return (PTXF)new(g) ZBKFAM(this);}

+

+  // Methods

+  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 int  SkipRecord(PGLOBAL g, bool header);

+  virtual int  ReadBuffer(PGLOBAL g);

+  virtual int  WriteBuffer(PGLOBAL g);

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

+  virtual void CloseTableFile(PGLOBAL g);

+  virtual void Rewind(void);

+

+ protected:

+  // Members

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

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

+  bool  Closing;              // True when closing on Insert

+  }; // end of class ZBKFAM

+

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

+/*  This is the access method class declaration for fixed record       */

+/*  length files compressed using the gzip library functions.          */

+/*  The file is always accessed by block.                              */

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

+class DllExport ZIXFAM : public ZBKFAM {

+ public:

+  // Constructor

+  ZIXFAM(PDOSDEF tdp);

+  ZIXFAM(PZIXFAM txfp) : ZBKFAM(txfp) {}

+

+  // Implementation

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

+  virtual PTXF Duplicate(PGLOBAL g)

+                {return (PTXF)new(g) ZIXFAM(this);}

+

+  // Methods

+  virtual int  Cardinality(PGLOBAL g);

+  virtual bool AllocateBuffer(PGLOBAL g);

+  virtual int  ReadBuffer(PGLOBAL g);

+  virtual int  WriteBuffer(PGLOBAL g);

+

+ protected:

+  // No additional Members

+  }; // end of class ZIXFAM

+

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

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

+/*  fixed/variable files compressed using the zlib library functions.  */

+/*  Physically these are written and read using the same technique     */

+/*  than blocked variable files, only the contain of each block is     */

+/*  compressed using the deflate zlib function. The purpose of this    */

+/*  specific format is to have a fast mechanism for direct access of   */

+/*  records so blocked optimization is fast and direct access (joins)  */

+/*  is allowed. Note that the block length is written ahead of each    */

+/*  block to enable reading when optimization file is not available.   */

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

+class DllExport ZLBFAM : public BLKFAM {

+ public:

+  // Constructor

+  ZLBFAM(PDOSDEF tdp);

+  ZLBFAM(PZLBFAM txfp);

+

+  // Implementation

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

+  virtual int  GetPos(void);

+  virtual int  GetNextPos(void);

+  virtual PTXF Duplicate(PGLOBAL g)

+                  {return (PTXF)new(g) ZLBFAM(this);}

+  inline  void SetOptimized(bool b) {Optimized = b;}

+

+  // Methods

+  virtual int  GetFileLength(PGLOBAL g);

+  virtual bool AllocateBuffer(PGLOBAL g);

+  virtual int  ReadBuffer(PGLOBAL g);

+  virtual int  WriteBuffer(PGLOBAL g);

+  virtual void CloseTableFile(PGLOBAL g);

+  virtual void Rewind(void);

+

+ protected:

+          bool WriteCompressedBuffer(PGLOBAL g);

+          int  ReadCompressedBuffer(PGLOBAL g, void *rdbuf);

+

+  // Members

+  z_streamp Zstream;          // Compression/decompression stream

+  Byte     *Zbuffer;          // Compressed block buffer

+  int      *Zlenp;            // Pointer to block length

+  bool      Optimized;        // true when opt file is available

+  }; // end of class ZLBFAM

+

+#endif // __FILAMZIP_H