mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
e6fcd72309
commit 6a6a1f37798 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Fri Jan 4 12:31:52 2019 +0100 - Fix a few bug mainly concerning discovery and call from OEM (and prepare new table types) modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h modified: storage/connect/tabxml.cpp modified: storage/connect/tabxml.h - Fix wrong line estimate modified: storage/connect/mysql-test/connect/r/part_table.result modified: storage/connect/mysql-test/connect/t/part_table.test commit bd7d2e912d9 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Tue Dec 4 23:35:09 2018 +0100 Fix wrong version number commit 4933680e7ab Author: Olivier Bertrand <bertrandop@gmail.com> Date: Sun Dec 2 00:25:05 2018 +0100 - Make PlugSubAlloc to be exportable Suppress unused parameter from PlugSubSet modified: storage/connect/global.h modified: storage/connect/plugutil.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/user_connect.cc - Fix a bug making column catalog XML tables fail modified: storage/connect/tabxml.cpp - Comment out wrong message modified: storage/connect/ha_connect.cc - Update error message when sorting an ODBC table fails modified: storage/connect/tabodbc.cpp - Add error message when gettting an address from an OEM fails. modified: storage/connect/reldef.cpp - Make some modifications useful for OEM module writting Export discovery functions for CSV, JDBC and XML Remove unuseful include from tabjson.h Move TDBXML::data_charset function from header file to source modified: storage/connect/tabfmt.h modified: storage/connect/tabjson.h modified: storage/connect/tabxml.cpp modified: storage/connect/tabxml.h - Update test result modified: storage/connect/mysql-test/connect/r/jdbc_oracle.result
191 lines
7.1 KiB
C++
191 lines
7.1 KiB
C++
/*************** TabFmt H Declares Source Code File (.H) ***************/
|
|
/* Name: TABFMT.H Version 2.5 */
|
|
/* */
|
|
/* (C) Copyright to the author Olivier BERTRAND 2001-2016 */
|
|
/* */
|
|
/* This file contains the CSV and FMT classes declares. */
|
|
/***********************************************************************/
|
|
#include "xtable.h" // Base class declares
|
|
#include "tabdos.h"
|
|
|
|
typedef class TDBFMT *PTDBFMT;
|
|
|
|
/***********************************************************************/
|
|
/* Functions used externally. */
|
|
/***********************************************************************/
|
|
DllExport PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info);
|
|
|
|
/***********************************************************************/
|
|
/* CSV table. */
|
|
/***********************************************************************/
|
|
class DllExport CSVDEF : public DOSDEF { /* Logical table description */
|
|
friend class TDBCSV;
|
|
friend class TDBCCL;
|
|
friend PQRYRES CSVColumns(PGLOBAL, PCSZ, PTOS, bool);
|
|
public:
|
|
// Constructor
|
|
CSVDEF(void);
|
|
|
|
// Implementation
|
|
virtual const char *GetType(void) {return "CSV";}
|
|
char GetSep(void) {return Sep;}
|
|
char GetQot(void) {return Qot;}
|
|
|
|
// Methods
|
|
virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
|
|
virtual PTDB GetTable(PGLOBAL g, MODE mode);
|
|
|
|
protected:
|
|
// Members
|
|
bool Fmtd; /* true for formatted files */
|
|
//bool Accept; /* true if wrong lines are accepted */
|
|
bool Header; /* true if first line contains headers */
|
|
//int Maxerr; /* Maximum number of bad records */
|
|
int Quoted; /* Quoting level for quoted fields */
|
|
char Sep; /* Separator for standard CSV files */
|
|
char Qot; /* Character for quoted strings */
|
|
}; // end of CSVDEF
|
|
|
|
/***********************************************************************/
|
|
/* This is the DOS/UNIX Access Method class declaration for files */
|
|
/* that are CSV files with columns separated by the Sep character. */
|
|
/***********************************************************************/
|
|
class DllExport TDBCSV : public TDBDOS {
|
|
friend class CSVCOL;
|
|
friend class MAPFAM;
|
|
friend PQRYRES CSVColumns(PGLOBAL, PCSZ, PTOS, bool);
|
|
public:
|
|
// Constructor
|
|
TDBCSV(PCSVDEF tdp, PTXF txfp);
|
|
TDBCSV(PGLOBAL g, PTDBCSV tdbp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_CSV;}
|
|
virtual PTDB Duplicate(PGLOBAL g)
|
|
{return (PTDB)new(g) TDBCSV(g, this);}
|
|
|
|
// Methods
|
|
virtual PTDB Clone(PTABS t);
|
|
//virtual bool IsUsingTemp(PGLOBAL g);
|
|
virtual int GetBadLines(void) {return (int)Nerr;}
|
|
|
|
// Database routines
|
|
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
|
|
virtual bool OpenDB(PGLOBAL g);
|
|
virtual int WriteDB(PGLOBAL g);
|
|
virtual int CheckWrite(PGLOBAL g);
|
|
virtual int ReadBuffer(PGLOBAL g); // Physical file read
|
|
|
|
// Specific routines
|
|
virtual int EstimatedLength(void);
|
|
virtual bool SkipHeader(PGLOBAL g);
|
|
virtual bool CheckErr(void);
|
|
|
|
protected:
|
|
virtual bool PrepareWriting(PGLOBAL g);
|
|
|
|
// Members
|
|
PSZ *Field; // Field to write to current line
|
|
int *Offset; // Column offsets for current record
|
|
int *Fldlen; // Column field length for current record
|
|
bool *Fldtyp; // true for numeric fields
|
|
int Fields; // Number of fields to handle
|
|
int Nerr; // Number of bad records
|
|
int Maxerr; // Maximum number of bad records
|
|
int Quoted; // Quoting level for quoted fields
|
|
bool Accept; // true if bad lines are accepted
|
|
bool Header; // true if first line contains column headers
|
|
char Sep; // Separator
|
|
char Qot; // Quoting character
|
|
}; // end of class TDBCSV
|
|
|
|
/***********************************************************************/
|
|
/* Class CSVCOL: CSV access method column descriptor. */
|
|
/* This A.M. is used for Comma Separated V(?) files. */
|
|
/***********************************************************************/
|
|
class DllExport CSVCOL : public DOSCOL {
|
|
friend class TDBCSV;
|
|
friend class TDBFMT;
|
|
public:
|
|
// Constructors
|
|
CSVCOL(PGLOBAL g, PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i);
|
|
CSVCOL(CSVCOL *colp, PTDB tdbp); // Constructor used in copy process
|
|
|
|
// Implementation
|
|
virtual int GetAmType() {return TYPE_AM_CSV;}
|
|
|
|
// Methods
|
|
virtual bool VarSize(void);
|
|
virtual void ReadColumn(PGLOBAL g);
|
|
virtual void WriteColumn(PGLOBAL g);
|
|
|
|
protected:
|
|
// Default constructor not to be used
|
|
CSVCOL(void) {}
|
|
|
|
// Members
|
|
int Fldnum; // Field ordinal number (0 based)
|
|
}; // end of class CSVCOL
|
|
|
|
/***********************************************************************/
|
|
/* This is the DOS/UNIX Access Method class declaration for files */
|
|
/* whose record format is described by a Format keyword. */
|
|
/***********************************************************************/
|
|
class DllExport TDBFMT : public TDBCSV {
|
|
friend class CSVCOL;
|
|
//friend class FMTCOL;
|
|
public:
|
|
// Standard constructor
|
|
TDBFMT(PCSVDEF tdp, PTXF txfp) : TDBCSV(tdp, txfp)
|
|
{FldFormat = NULL; To_Fld = NULL; FmtTest = NULL; Linenum = 0;}
|
|
|
|
// Copy constructor
|
|
TDBFMT(PGLOBAL g, PTDBFMT tdbp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_FMT;}
|
|
virtual PTDB Duplicate(PGLOBAL g)
|
|
{return (PTDB)new(g) TDBFMT(g, this);}
|
|
|
|
// Methods
|
|
virtual PTDB Clone(PTABS t);
|
|
|
|
// Database routines
|
|
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
|
|
//virtual int GetMaxSize(PGLOBAL g);
|
|
virtual bool OpenDB(PGLOBAL g);
|
|
virtual int WriteDB(PGLOBAL g);
|
|
//virtual int CheckWrite(PGLOBAL g);
|
|
virtual int ReadBuffer(PGLOBAL g); // Physical file read
|
|
|
|
// Specific routines
|
|
virtual int EstimatedLength(void);
|
|
|
|
protected:
|
|
virtual bool PrepareWriting(PGLOBAL g)
|
|
{sprintf(g->Message, MSG(TABLE_READ_ONLY), "FMT"); return true;}
|
|
|
|
// Members
|
|
PSZ *FldFormat; // Field read format
|
|
void *To_Fld; // To field test buffer
|
|
int *FmtTest; // Test on ending by %n or %m
|
|
int Linenum; // Last read line
|
|
}; // end of class TDBFMT
|
|
|
|
/***********************************************************************/
|
|
/* This is the class declaration for the CSV catalog table. */
|
|
/***********************************************************************/
|
|
class DllExport TDBCCL : public TDBCAT {
|
|
public:
|
|
// Constructor
|
|
TDBCCL(PCSVDEF tdp);
|
|
|
|
protected:
|
|
// Specific routines
|
|
virtual PQRYRES GetResult(PGLOBAL g);
|
|
|
|
// Members
|
|
PTOS Topt;
|
|
}; // end of class TDBCCL
|
|
|
|
/* ------------------------- End of TabFmt.H ------------------------- */
|