mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
1904284361
1) Support of partitioning by connect. A table can be partitioned by files, this is an enhanced MULTIPLE table. It can be also partitioned by sub-tables like TBL and this enables table sharding. 2) Handling a CONNECT bug that causes in some cases extraneous rows to remain in the table after an UPDATE or DELETE when the command uses indexing (for not fixed file tables). Until a real fix is done, CONNECT tries to ignore indexing and if it cannot do it abort the command with an error message. - Add tests on partitioning added: storage/connect/mysql-test/connect/r/part_file.result storage/connect/mysql-test/connect/r/part_table.result storage/connect/mysql-test/connect/t/part_file.test storage/connect/mysql-test/connect/t/part_table.test - Temporary fix modified: sql/sql_partition.cc - Add partition support modified: storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/reldef.cpp storage/connect/reldef.h storage/connect/tabdos.cpp - Add functions ha_connect::IsUnique and ha_connect::CheckColumnList modified: storage/connect/ha_connect.cc storage/connect/ha_connect.h - Prevent updating a partition table column that is part of the partition function (outward tables only) modified: storage/connect/ha_connect.cc - Support INSERT/UPDATE/DELETE for PROXY tables modified: storage/connect/tabutil.cpp - Handle the bug on updating rows via indexing. Waiting for a real fix, Don't use indexing when possible else raise an error and abort. modified: storage/connect/ha_connect.cc - dbuserp->UseTemp set to TMP_AUTO modified: storage/connect/connect.cc - Add members nox, abort and only modified: storage/connect/ha_connect.cc storage/connect/ha_connect.h - Add arguments nox and abort to CntCloseTable modified: storage/connect/connect.cc storage/connect/connect.h storage/connect/filamap.cpp storage/connect/filamap.h storage/connect/filamdbf.cpp 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/ha_connect.cc - Add arguments abort to CloseTableFile and RenameTempFile modified: storage/connect/filamap.cpp storage/connect/filamap.h storage/connect/filamdbf.cpp 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/tabdos.cpp storage/connect/tabdos.h storage/connect/tabvct.cpp storage/connect/xtable.h - Fix info->records when file does not exists modified: storage/connect/connect.cc - Close XML table when opened for info modified: storage/connect/connect.cc - Add function VCTFAM::GetFileLength modified: storage/connect/filamvct.cpp storage/connect/filamvct.h - Column option DISTRIB -> ENUM modified: storage/connect/ha_connect.cc - Options connect, query_string and partname allways available modified: storage/connect/ha_connect.cc - Add function MYSQLC::GetTableSize modified: storage/connect/myconn.cpp storage/connect/myconn.h - Add new special columns (PARTNAME, FNAME, FPATH, FTYPE and FDISK) modified: storage/connect/colblk.cpp storage/connect/colblk.h storage/connect/plgdbsem.h storage/connect/table.cpp - Add function ExtractFromPath modified: storage/connect/colblk.cpp storage/connect/plgdbsem.h storage/connect/plgdbutl.cpp - Enhance Cardinality for some table types modified: storage/connect/tabdos.cpp storage/connect/tabmysql.cpp storage/connect/tabmysql.h storage/connect/tabodbc.cpp storage/connect/tabodbc.h storage/connect/tabsys.cpp storage/connect/tabsys.h storage/connect/xindex.cpp storage/connect/xindex.h storage/connect/xtable.h - Add test on special column modified: storage/connect/tabfmt.cpp - Add new files (added for block indexing) modified: storage/connect/CMakeLists.txt
196 lines
8.1 KiB
C++
196 lines
8.1 KiB
C++
/************** FilAMTxt H Declares Source Code File (.H) **************/
|
|
/* Name: FILAMTXT.H Version 1.2 */
|
|
/* */
|
|
/* (C) Copyright to the author Olivier BERTRAND 2005-2012 */
|
|
/* */
|
|
/* This file contains the file access method classes declares. */
|
|
/***********************************************************************/
|
|
|
|
#ifndef __FILAMTXT_H
|
|
#define __FILAMTXT_H
|
|
|
|
#include "block.h"
|
|
|
|
typedef class TXTFAM *PTXF;
|
|
typedef class DOSFAM *PDOSFAM;
|
|
typedef class BLKFAM *PBLKFAM;
|
|
typedef class DOSDEF *PDOSDEF;
|
|
typedef class TDBDOS *PTDBDOS;
|
|
|
|
/***********************************************************************/
|
|
/* This is the base class for all file access method classes. */
|
|
/***********************************************************************/
|
|
class DllExport TXTFAM : public BLOCK {
|
|
friend class TDBDOS;
|
|
friend class TDBCSV;
|
|
friend class TDBFIX;
|
|
friend class TDBVCT;
|
|
friend class DOSCOL;
|
|
friend class BINCOL;
|
|
friend class VCTCOL;
|
|
public:
|
|
// Constructor
|
|
TXTFAM(PDOSDEF tdp);
|
|
TXTFAM(PTXF txfp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) = 0;
|
|
virtual int GetPos(void) = 0;
|
|
virtual int GetNextPos(void) = 0;
|
|
virtual PTXF Duplicate(PGLOBAL g) = 0;
|
|
virtual bool GetUseTemp(void) {return false;}
|
|
virtual int GetDelRows(void) {return DelRows;}
|
|
int GetCurBlk(void) {return CurBlk;}
|
|
void SetTdbp(PTDBDOS tdbp) {Tdbp = tdbp;}
|
|
int GetBlock(void) {return Block;}
|
|
void SetBlkPos(int *bkp) {BlkPos = bkp;}
|
|
void SetNrec(int n) {Nrec = n;}
|
|
char *GetBuf(void) {return To_Buf;}
|
|
int GetRows(void) {return Rows;}
|
|
bool IsBlocked(void) {return Blocked;}
|
|
|
|
// Methods
|
|
virtual void Reset(void);
|
|
virtual int GetFileLength(PGLOBAL g);
|
|
virtual int Cardinality(PGLOBAL g);
|
|
virtual int MaxBlkSize(PGLOBAL g, int s);
|
|
virtual bool AllocateBuffer(PGLOBAL g) {return false;}
|
|
virtual void ResetBuffer(PGLOBAL g) {}
|
|
virtual int GetNerr(void) {return 0;}
|
|
virtual int GetRowID(void) = 0;
|
|
virtual bool RecordPos(PGLOBAL g) = 0;
|
|
virtual bool SetPos(PGLOBAL g, int recpos) = 0;
|
|
virtual int SkipRecord(PGLOBAL g, bool header) = 0;
|
|
virtual bool OpenTableFile(PGLOBAL g) = 0;
|
|
virtual bool DeferReading(void) {IsRead = false; return true;}
|
|
virtual int ReadBuffer(PGLOBAL g) = 0;
|
|
virtual int WriteBuffer(PGLOBAL g) = 0;
|
|
virtual int DeleteRecords(PGLOBAL g, int irc) = 0;
|
|
virtual void CloseTableFile(PGLOBAL g, bool abort) = 0;
|
|
virtual void Rewind(void) = 0;
|
|
|
|
protected:
|
|
// Members
|
|
PTDBDOS Tdbp; // To table class
|
|
PSZ To_File; // Points to table file name
|
|
PFBLOCK To_Fb; // Pointer to file block
|
|
bool Placed; // true if Recpos was externally set
|
|
bool IsRead; // false for deferred reading
|
|
bool Blocked; // true if using blocked I/O
|
|
char *To_Buf; // Points to I/O buffer
|
|
void *DelBuf; // Buffer used to move lines in Delete
|
|
int *BlkPos; // To array of block positions
|
|
int BlkLen; // Current block length
|
|
int Buflen; // Buffer length
|
|
int Dbflen; // Delete buffer length
|
|
int Rows; // Number of rows read so far
|
|
int DelRows; // Number of deleted rows
|
|
int Headlen; // Number of bytes in header
|
|
int Lrecl; // Logical Record Length
|
|
int Block; // Number of blocks in table
|
|
int Last; // Number of elements of last block
|
|
int Nrec; // Number of records in buffer
|
|
int OldBlk; // Index of last read block
|
|
int CurBlk; // Index of current block
|
|
int CurNum; // Current buffer line number
|
|
int ReadBlks; // Number of blocks read (selected)
|
|
int Rbuf; // Number of lines read in buffer
|
|
int Modif; // Number of modified lines in block
|
|
int Blksize; // Size of padded blocks
|
|
int Ending; // Length of line end
|
|
bool Padded; // true if fixed size blocks are padded
|
|
bool Eof; // true if an EOF (0xA) character exists
|
|
char *CrLf; // End of line character(s)
|
|
}; // end of class TXTFAM
|
|
|
|
/***********************************************************************/
|
|
/* This is the DOS/UNIX Access Method class declaration for standard */
|
|
/* text files with variable record format (DOS, CSV, FMT) */
|
|
/***********************************************************************/
|
|
class DllExport DOSFAM : public TXTFAM {
|
|
public:
|
|
// Constructor
|
|
DOSFAM(PDOSDEF tdp);
|
|
DOSFAM(PDOSFAM txfp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_DOS;}
|
|
virtual bool GetUseTemp(void) {return UseTemp;}
|
|
virtual int GetPos(void);
|
|
virtual int GetNextPos(void);
|
|
virtual PTXF Duplicate(PGLOBAL g)
|
|
{return (PTXF)new(g) DOSFAM(this);}
|
|
|
|
// Methods
|
|
virtual void Reset(void);
|
|
virtual int GetFileLength(PGLOBAL g);
|
|
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 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, bool abort);
|
|
virtual void Rewind(void);
|
|
|
|
protected:
|
|
virtual bool OpenTempFile(PGLOBAL g);
|
|
virtual bool MoveIntermediateLines(PGLOBAL g, bool *b);
|
|
virtual int RenameTempFile(PGLOBAL g, bool abort);
|
|
|
|
// Members
|
|
FILE *Stream; // Points to Dos file structure
|
|
FILE *T_Stream; // Points to temporary file structure
|
|
PFBLOCK To_Fbt; // Pointer to temp file block
|
|
int Fpos; // Position of last read record
|
|
int Tpos; // Target Position for delete move
|
|
int Spos; // Start position for delete move
|
|
bool UseTemp; // True to use a temporary file in Delete
|
|
bool Bin; // True to force binary mode
|
|
}; // end of class DOSFAM
|
|
|
|
/***********************************************************************/
|
|
/* This is the DOS/UNIX Access Method class declaration for standard */
|
|
/* text files with variable record format (DOS, CSV, FMT) */
|
|
/***********************************************************************/
|
|
class DllExport BLKFAM : public DOSFAM {
|
|
public:
|
|
// Constructor
|
|
BLKFAM(PDOSDEF tdp);
|
|
BLKFAM(PBLKFAM txfp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_BLK;}
|
|
virtual int GetPos(void);
|
|
virtual int GetNextPos(void);
|
|
virtual PTXF Duplicate(PGLOBAL g)
|
|
{return (PTXF)new(g) BLKFAM(this);}
|
|
|
|
// Methods
|
|
virtual void Reset(void);
|
|
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 bool SetPos(PGLOBAL g, int recpos);
|
|
virtual int SkipRecord(PGLOBAL g, bool header);
|
|
virtual int ReadBuffer(PGLOBAL g);
|
|
virtual int WriteBuffer(PGLOBAL g);
|
|
virtual void CloseTableFile(PGLOBAL g, bool abort);
|
|
virtual void Rewind(void);
|
|
|
|
protected:
|
|
// Members
|
|
char *CurLine; // Position of current line in buffer
|
|
char *NxtLine; // Position of Next line in buffer
|
|
char *OutBuf; // Buffer to write in temporary file
|
|
bool Closing; // True when closing on Update
|
|
}; // end of class BLKFAM
|
|
|
|
#endif // __FILAMTXT_H
|