mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 07:14:17 +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
102 lines
3.8 KiB
C++
102 lines
3.8 KiB
C++
/***********************************************************************/
|
|
/* MYCONN.H Olivier Bertrand 2007-2013 */
|
|
/* */
|
|
/* This is the declaration file for the MySQL connection class and */
|
|
/* a few utility functions used to communicate with MySQL. */
|
|
/* */
|
|
/* DO NOT define DLL_EXPORT in your application so these items are */
|
|
/* declared are imported from the Myconn DLL. */
|
|
/***********************************************************************/
|
|
#if defined(WIN32)
|
|
#include <winsock.h>
|
|
#else // !WIN32
|
|
#include <sys/socket.h>
|
|
#endif // !WIN32
|
|
#include <mysql.h>
|
|
#include <errmsg.h>
|
|
#include "myutil.h"
|
|
|
|
#if defined(WIN32) && defined(MYCONN_EXPORTS)
|
|
#if defined(DLL_EXPORT)
|
|
#define DllItem _declspec(dllexport)
|
|
#else // !DLL_EXPORT
|
|
#define DllItem _declspec(dllimport)
|
|
#endif // !DLL_EXPORT
|
|
#else // !WIN32 || !MYCONN_EXPORTS
|
|
#define DllItem
|
|
#endif // !WIN32
|
|
|
|
#define MYSQL_ENABLED 0x00000001
|
|
#define MYSQL_LOGON 0x00000002
|
|
|
|
typedef class MYSQLC *PMYC;
|
|
|
|
/***********************************************************************/
|
|
/* Prototypes of info functions. */
|
|
/***********************************************************************/
|
|
PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
|
|
const char *user, const char *pwd,
|
|
const char *table, const char *colpat,
|
|
int port, bool info);
|
|
|
|
PQRYRES SrcColumns(PGLOBAL g, const char *host, const char *db,
|
|
const char *user, const char *pwd,
|
|
const char *srcdef, int port);
|
|
|
|
uint GetDefaultPort(void);
|
|
|
|
/* -------------------------- MYCONN class --------------------------- */
|
|
|
|
/***********************************************************************/
|
|
/* MYSQLC exported/imported class. A MySQL connection. */
|
|
/***********************************************************************/
|
|
class DllItem MYSQLC {
|
|
friend class TDBMYSQL;
|
|
friend class MYSQLCOL;
|
|
friend class TDBMYEXC;
|
|
// Construction
|
|
public:
|
|
MYSQLC(void);
|
|
|
|
// Implementation
|
|
int GetRows(void) {return m_Rows;}
|
|
bool Connected(void);
|
|
|
|
// Methods
|
|
int GetResultSize(PGLOBAL g, PSZ sql);
|
|
int GetTableSize(PGLOBAL g, PSZ query);
|
|
int Open(PGLOBAL g, const char *host, const char *db,
|
|
const char *user= "root", const char *pwd= "*",
|
|
int pt= 0);
|
|
int KillQuery(ulong id);
|
|
int ExecSQL(PGLOBAL g, const char *query, int *w = NULL);
|
|
int ExecSQLcmd(PGLOBAL g, const char *query, int *w);
|
|
#if defined(MYSQL_PREPARED_STATEMENTS)
|
|
int PrepareSQL(PGLOBAL g, const char *query);
|
|
int ExecStmt(PGLOBAL g);
|
|
int BindParams(PGLOBAL g, MYSQL_BIND *bind);
|
|
#endif // MYSQL_PREPARED_STATEMENTS
|
|
PQRYRES GetResult(PGLOBAL g, bool pdb = FALSE);
|
|
int Fetch(PGLOBAL g, int pos);
|
|
char *GetCharField(int i);
|
|
int GetFieldLength(int i);
|
|
void Rewind(void);
|
|
void FreeResult(void);
|
|
void Close(void);
|
|
|
|
protected:
|
|
MYSQL_FIELD *GetNextField(void);
|
|
void DataSeek(my_ulonglong row);
|
|
|
|
// Members
|
|
MYSQL *m_DB; // The return from MySQL connection
|
|
MYSQL_STMT *m_Stmt; // Prepared statement handle
|
|
MYSQL_RES *m_Res; // Points to MySQL Result
|
|
MYSQL_ROW m_Row; // Point to current row
|
|
int m_Rows; // The number of rows of the result
|
|
int N;
|
|
int m_Fields; // The number of result fields
|
|
int m_Afrw; // The number of affected rows
|
|
bool m_Use; // Use or store result set
|
|
}; // end of class MYSQLC
|
|
|