mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +01:00
0219ac1e98
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
182 lines
7 KiB
C++
182 lines
7 KiB
C++
/*************** TabSys H Declares Source Code File (.H) ***************/
|
|
/* Name: TABSYS.H Version 2.3 */
|
|
/* */
|
|
/* (C) Copyright to the author Olivier BERTRAND 2004-2014 */
|
|
/* */
|
|
/* This file contains the XDB system tables classes declares. */
|
|
/***********************************************************************/
|
|
typedef class INIDEF *PINIDEF;
|
|
typedef class TDBINI *PTDBINI;
|
|
typedef class INICOL *PINICOL;
|
|
typedef class TDBXIN *PTDBXIN;
|
|
typedef class XINCOL *PXINCOL;
|
|
|
|
/* --------------------------- INI classes --------------------------- */
|
|
|
|
/***********************************************************************/
|
|
/* INI, XDB and XCL tables. */
|
|
/***********************************************************************/
|
|
class DllExport INIDEF : public TABDEF { /* INI table description */
|
|
friend class TDBINI;
|
|
friend class TDBXIN;
|
|
friend class TDBXTB;
|
|
friend class TDBRTB;
|
|
friend class TDBXCL;
|
|
public:
|
|
// Constructor
|
|
INIDEF(void);
|
|
|
|
// Implementation
|
|
virtual const char *GetType(void) {return "INI";}
|
|
|
|
// Methods
|
|
virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
|
|
virtual PTDB GetTable(PGLOBAL g, MODE m);
|
|
|
|
protected:
|
|
// Members
|
|
char *Fn; /* Path/Name of corresponding file */
|
|
char *Xname; /* The eventual table name */
|
|
char Layout; /* R: Row, C: Column */
|
|
int Ln; /* Length of section list buffer */
|
|
}; // end of INIDEF
|
|
|
|
/***********************************************************************/
|
|
/* This is the class declaration for the INI tables. */
|
|
/* These are tables represented by a INI like file. */
|
|
/***********************************************************************/
|
|
class TDBINI : public TDBASE {
|
|
friend class INICOL;
|
|
public:
|
|
// Constructor
|
|
TDBINI(PINIDEF tdp);
|
|
TDBINI(PTDBINI tdbp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_INI;}
|
|
virtual PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBINI(this);}
|
|
|
|
// Methods
|
|
virtual PTDB CopyOne(PTABS t);
|
|
virtual int GetRecpos(void) {return N;}
|
|
virtual int GetProgCur(void) {return N;}
|
|
//virtual int GetAffectedRows(void) {return 0;}
|
|
virtual PSZ GetFile(PGLOBAL g) {return Ifile;}
|
|
virtual void SetFile(PGLOBAL g, PSZ fn) {Ifile = fn;}
|
|
virtual void ResetDB(void) {Seclist = Section = NULL; N = 0;}
|
|
virtual void ResetSize(void) {MaxSize = -1; Seclist = NULL;}
|
|
virtual int RowNumber(PGLOBAL g, bool b = false) {return N;}
|
|
char *GetSeclist(PGLOBAL g);
|
|
|
|
// Database routines
|
|
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
|
|
virtual int Cardinality(PGLOBAL g);
|
|
virtual int GetMaxSize(PGLOBAL g);
|
|
virtual bool OpenDB(PGLOBAL g);
|
|
virtual int ReadDB(PGLOBAL g);
|
|
virtual int WriteDB(PGLOBAL g);
|
|
virtual int DeleteDB(PGLOBAL g, int irc);
|
|
virtual void CloseDB(PGLOBAL g);
|
|
|
|
protected:
|
|
// Members
|
|
char *Ifile; // The INI file
|
|
char *Seclist; // The section list
|
|
char *Section; // The current section
|
|
int Seclen; // Length of seclist buffer
|
|
int N; // The current section index
|
|
}; // end of class TDBINI
|
|
|
|
/***********************************************************************/
|
|
/* Class INICOL: XDB table access method column descriptor. */
|
|
/***********************************************************************/
|
|
class INICOL : public COLBLK {
|
|
public:
|
|
// Constructors
|
|
INICOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PSZ am = "INI");
|
|
INICOL(INICOL *colp, PTDB tdbp); // Constructor used in copy process
|
|
|
|
// Implementation
|
|
virtual int GetAmType(void) {return TYPE_AM_INI;}
|
|
virtual void SetTo_Val(PVAL valp) {To_Val = valp;}
|
|
|
|
// Methods
|
|
virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
|
|
virtual void ReadColumn(PGLOBAL g);
|
|
virtual void WriteColumn(PGLOBAL g);
|
|
virtual void AllocBuf(PGLOBAL g);
|
|
|
|
protected:
|
|
// Default constructor not to be used
|
|
INICOL(void) {}
|
|
|
|
// Members
|
|
char *Valbuf; // To the key value buffer
|
|
int Flag; // Tells what set in value
|
|
int Long; // Buffer length
|
|
PVAL To_Val; // To value used for Update/Insert
|
|
}; // end of class INICOL
|
|
|
|
/* --------------------------- XINI class ---------------------------- */
|
|
|
|
/***********************************************************************/
|
|
/* This is the class declaration for the XINI tables. */
|
|
/* These are tables represented by a INI like file */
|
|
/* having 3 columns Section, Key, and Value. */
|
|
/***********************************************************************/
|
|
class TDBXIN : public TDBINI {
|
|
friend class XINCOL;
|
|
public:
|
|
// Constructor
|
|
TDBXIN(PINIDEF tdp);
|
|
TDBXIN(PTDBXIN tdbp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_INI;}
|
|
virtual PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBXIN(this);}
|
|
|
|
// Methods
|
|
virtual PTDB CopyOne(PTABS t);
|
|
virtual int GetRecpos(void);
|
|
virtual bool SetRecpos(PGLOBAL g, int recpos);
|
|
virtual void ResetDB(void)
|
|
{Seclist = Section = Keycur = NULL; N = 0; Oldsec = -1;}
|
|
char *GetKeylist(PGLOBAL g, char *sec);
|
|
|
|
// Database routines
|
|
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
|
|
virtual int Cardinality(PGLOBAL g);
|
|
virtual bool OpenDB(PGLOBAL g);
|
|
virtual int ReadDB(PGLOBAL g);
|
|
virtual int WriteDB(PGLOBAL g);
|
|
virtual int DeleteDB(PGLOBAL g, int irc);
|
|
|
|
protected:
|
|
// Members
|
|
char *Keylist; // The key list
|
|
char *Keycur; // The current key
|
|
int Keylen; // Length of keylist buffer
|
|
short Oldsec; // Last current section
|
|
}; // end of class TDBXIN
|
|
|
|
/***********************************************************************/
|
|
/* Class XINCOL: XIN table access method column descriptor. */
|
|
/***********************************************************************/
|
|
class XINCOL : public INICOL {
|
|
public:
|
|
// Constructors
|
|
XINCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PSZ am = "INI");
|
|
XINCOL(XINCOL *colp, PTDB tdbp); // Constructor used in copy process
|
|
|
|
// Implementation
|
|
|
|
// Methods
|
|
virtual void ReadColumn(PGLOBAL g);
|
|
virtual void WriteColumn(PGLOBAL g);
|
|
|
|
protected:
|
|
// Default constructor not to be used
|
|
XINCOL(void) {}
|
|
|
|
// Members
|
|
}; // end of class XINICOL
|