mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
5ae2656b69
commit c545d544378483bf68c4fb713cd4ec872d0df2c4 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Tue Mar 27 23:13:14 2018 +0200 - Fix MDEV-15577 CONNECT engine JDBC remote index prevents UPDATE Fixed in TDBJDBC::OpenDB because query can be null for updates modified: storage/connect/tabjdbc.cpp commit c4f1fe2e8e74566e9c3296f435448d9f5c718b23 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Wed Mar 14 12:21:17 2018 +0100 - Fix MDEV-15429 CONNECT engine JDBC handling Postgresql UUID type Also handle Postgresql sending type VARCHAR for TEXT column and setting length to b x7FFFFFF when the length is unknown. modified: storage/connect/Client.java modified: storage/connect/JavaWrappers.jar modified: storage/connect/JdbcInterface.java modified: storage/connect/PostgresqlInterface.java modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/mysql-test/connect/r/jdbc_postgresql.result modified: storage/connect/mysql-test/connect/t/jdbc_postgresql.test modified: storage/connect/mysql-test/connect/t/jdbconn.inc modified: storage/connect/plgdbsem.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h added: storage/connect/mysql-test/connect/std_data/JavaWrappers.jar commit 3068bb4882a316c6c32c624609db2bf24ae3ad40 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Mon Feb 26 19:40:27 2018 +0100 Revert to old cmake file to avoid compile error commit da8c1c0bd6a327fd03bd321be3170f468122ef67 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Mon Feb 26 16:13:39 2018 +0100 - Remove warning on not used tabtyp variable in connect_assisted_discovery modified: storage/connect/ha_connect.cc - Fix a bug causing CONNECT to loop when expanding a JSON column when the expanded column value is null or void array. - Adding the FullArray option to JSON tables. - Skipping expanded JSON lines when the expanded column value is null. modified: storage/connect/connect.cc modified: storage/connect/tabdos.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h - Fix MDEV-13353 No file privilege for ODBC, JDBC, MONGO, MAC, WMI file types. modified: storage/connect/ha_connect.cc - Make some Json UDFs to accept a non JSON item as 1st parameter. modified: storage/connect/json.cpp modified: storage/connect/json.h modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h - Update Json UDF tests to cope with above changes. modified: storage/connect/mysql-test/connect/r/json_udf.result modified: storage/connect/mysql-test/connect/r/json_udf_bin.result modified: storage/connect/mysql-test/connect/r/vcol.result modified: storage/connect/mysql-test/connect/t/json_udf.test modified: storage/connect/mysql-test/connect/t/vcol.test - Fix some compiler warning treated as error PlugSubAlloc no more exported because it does throw. modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/jsonudf.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h - Other files modified (?) when going back to wrong merge modified: storage/connect/CMakeLists.txt modified: storage/connect/array.cpp modified: storage/connect/colblk.cpp modified: storage/connect/connect.cc modified: storage/connect/csort.cpp modified: storage/connect/domdoc.cpp modified: storage/connect/filamap.cpp modified: storage/connect/filamgz.cpp modified: storage/connect/filamtxt.cpp modified: storage/connect/filamzip.cpp modified: storage/connect/filter.cpp modified: storage/connect/fmdlex.c modified: storage/connect/jdbconn.cpp modified: storage/connect/macutil.cpp modified: storage/connect/myconn.cpp modified: storage/connect/odbconn.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/plugutil.cpp modified: storage/connect/preparse.h modified: storage/connect/rcmsg.c modified: storage/connect/rcmsg.h modified: storage/connect/reldef.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabmac.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmysql.cpp modified: storage/connect/tabmysql.h modified: storage/connect/tabodbc.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/value.cpp modified: storage/connect/xobject.cpp commit 5095628b31ed8c94bd7c794c6b0162894a9040b1 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Tue Feb 13 14:29:00 2018 +0100 - Fix a bug causing CONNECT to loop when expanding a JSON column when the expanded column value is null or void array. - Adding the FullArray option to JSON tables. - Skipping expanded JSON lines when the expanded column value is null. modified: storage/connect/connect.cc modified: storage/connect/tabdos.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h commit 9896174328da42016735630c893fd09eb128b48e Author: Olivier Bertrand <bertrandop@gmail.com> Date: Fri Feb 2 15:48:57 2018 +0100 - Remove warning on not used tabtyp variable in connect_assisted_discovery modified: storage/connect/ha_connect.cc commit d7e254c05f88173eb04d8dafc813013eb42ccdbe Author: Olivier Bertrand <bertrandop@gmail.com> Date: Wed Jan 31 14:42:45 2018 +0100 - Use delayed load for the MongoDB C Drive on Windows modified: storage/connect/CMakeLists.txt modified: storage/connect/cmgoconn.cpp modified: storage/connect/ha_connect.cc - Add FORCE to the connect_type_conv enum values This will translate binary values to TYPE_STRING modified: storage/connect/checklvl.h modified: storage/connect/ha_connect.cc modified: storage/connect/odbconn.cpp - Change the connect_xtrace variable to from int to set modified: storage/connect/array.cpp modified: storage/connect/blkfil.cpp modified: storage/connect/block.h modified: storage/connect/cmgoconn.cpp modified: storage/connect/colblk.cpp modified: storage/connect/connect.cc modified: storage/connect/filamap.cpp modified: storage/connect/filamdbf.cpp modified: storage/connect/filamfix.cpp modified: storage/connect/filamgz.cpp modified: storage/connect/filamtxt.cpp modified: storage/connect/filamvct.cpp modified: storage/connect/filamzip.cpp modified: storage/connect/filter.cpp modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/inihandl.cpp modified: storage/connect/javaconn.cpp modified: storage/connect/jdbconn.cpp modified: storage/connect/jmgfam.cpp modified: storage/connect/jmgoconn.cpp modified: storage/connect/json.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/libdoc.cpp modified: storage/connect/mongo.cpp modified: storage/connect/mycat.cc modified: storage/connect/myconn.cpp modified: storage/connect/odbconn.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/plugutil.cpp modified: storage/connect/reldef.cpp modified: storage/connect/tabcol.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabext.cpp modified: storage/connect/tabfix.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/table.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmysql.cpp modified: storage/connect/tabodbc.cpp modified: storage/connect/tabpivot.cpp modified: storage/connect/tabsys.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabutil.cpp modified: storage/connect/tabvct.cpp modified: storage/connect/tabwmi.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/user_connect.cc modified: storage/connect/valblk.cpp modified: storage/connect/value.cpp modified: storage/connect/xindex.cpp - Restore connect_enable_mongo variable (but undocumented) modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc modified: storage/connect/mysql-test/connect/r/json_java_2.result modified: storage/connect/mysql-test/connect/r/json_java_3.result modified: storage/connect/mysql-test/connect/r/json_mongo_c.result modified: storage/connect/mysql-test/connect/r/mongo_c.result modified: storage/connect/mysql-test/connect/r/mongo_java_2.result modified: storage/connect/mysql-test/connect/r/mongo_java_3.result modified: storage/connect/mysql-test/connect/r/tbl_thread.result modified: storage/connect/mysql-test/connect/t/mongo.inc modified: storage/connect/mysql-test/connect/t/mongo_test.inc modified: storage/connect/mysql-test/connect/t/tbl_thread.test
236 lines
7.8 KiB
C++
236 lines
7.8 KiB
C++
/*************** Tabjdbc H Declares Source Code File (.H) **************/
|
|
/* Name: TABJDBC.H Version 1.1 */
|
|
/* */
|
|
/* (C) Copyright to the author Olivier BERTRAND 2016-2017 */
|
|
/* */
|
|
/* This file contains the TDBJDBC classes declares. */
|
|
/***********************************************************************/
|
|
#include "colblk.h"
|
|
#include "resource.h"
|
|
#include "jdbccat.h"
|
|
|
|
typedef class JDBCDEF *PJDBCDEF;
|
|
typedef class TDBJDBC *PTDBJDBC;
|
|
typedef class JDBCCOL *PJDBCCOL;
|
|
typedef class TDBXJDC *PTDBXJDC;
|
|
typedef class JSRCCOL *PJSRCCOL;
|
|
|
|
/***********************************************************************/
|
|
/* JDBC table. */
|
|
/***********************************************************************/
|
|
class DllExport JDBCDEF : public EXTDEF { /* Logical table description */
|
|
friend class TDBJDBC;
|
|
friend class TDBXJDC;
|
|
friend class TDBJDRV;
|
|
friend class TDBJTB;
|
|
friend class TDBJDBCL;
|
|
public:
|
|
// Constructor
|
|
JDBCDEF(void);
|
|
|
|
// Implementation
|
|
virtual const char *GetType(void) { return "JDBC"; }
|
|
|
|
// Methods
|
|
virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
|
|
virtual PTDB GetTable(PGLOBAL g, MODE m);
|
|
int ParseURL(PGLOBAL g, char *url, bool b = true);
|
|
bool SetParms(PJPARM sjp);
|
|
|
|
protected:
|
|
// Members
|
|
PSZ Driver; /* JDBC driver */
|
|
PSZ Url; /* JDBC driver URL */
|
|
PSZ Wrapname; /* Java driver name */
|
|
}; // end of JDBCDEF
|
|
|
|
#if !defined(NJDBC)
|
|
#include "jdbconn.h"
|
|
|
|
/***********************************************************************/
|
|
/* This is the JDBC Access Method class declaration for files from */
|
|
/* other DB drivers to be accessed via JDBC. */
|
|
/***********************************************************************/
|
|
class TDBJDBC : public TDBEXT {
|
|
friend class JDBCCOL;
|
|
friend class JDBConn;
|
|
public:
|
|
// Constructor
|
|
TDBJDBC(PJDBCDEF tdp = NULL);
|
|
TDBJDBC(PTDBJDBC tdbp);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_JDBC;}
|
|
virtual PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBJDBC(this);}
|
|
|
|
// Methods
|
|
virtual PTDB Clone(PTABS t);
|
|
virtual bool SetRecpos(PGLOBAL g, int recpos);
|
|
virtual void ResetSize(void);
|
|
virtual PCSZ GetServer(void) { return "JDBC"; }
|
|
virtual int Indexable(void) { return 2; }
|
|
|
|
// 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);
|
|
virtual void CloseDB(PGLOBAL g);
|
|
virtual bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr);
|
|
|
|
protected:
|
|
// Internal functions
|
|
bool MakeInsert(PGLOBAL g);
|
|
bool SetParameters(PGLOBAL g);
|
|
|
|
// Members
|
|
JDBConn *Jcp; // Points to a JDBC connection class
|
|
JDBCCOL *Cnp; // Points to count(*) column
|
|
JDBCPARM Ops; // Additional parameters
|
|
PSZ Wrapname; // Points to Java wrapper name
|
|
bool Prepared; // True when using prepared statement
|
|
bool Werr; // Write error
|
|
bool Rerr; // Rewind error
|
|
}; // end of class TDBJDBC
|
|
|
|
/***********************************************************************/
|
|
/* Class JDBCCOL: JDBC access method column descriptor. */
|
|
/* This A.M. is used for JDBC tables. */
|
|
/***********************************************************************/
|
|
class JDBCCOL : public EXTCOL {
|
|
friend class TDBJDBC;
|
|
friend class JDBConn;
|
|
public:
|
|
// Constructors
|
|
JDBCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "JDBC");
|
|
JDBCCOL(JDBCCOL *colp, PTDB tdbp); // Constructor used in copy process
|
|
|
|
// Implementation
|
|
virtual int GetAmType(void) { return TYPE_AM_JDBC; }
|
|
|
|
// Methods
|
|
//virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
|
|
virtual void ReadColumn(PGLOBAL g);
|
|
virtual void WriteColumn(PGLOBAL g);
|
|
|
|
protected:
|
|
// Constructor for count(*) column
|
|
JDBCCOL(void);
|
|
|
|
// Members
|
|
bool uuid; // For PostgreSQL
|
|
}; // end of class JDBCCOL
|
|
|
|
/***********************************************************************/
|
|
/* This is the JDBC Access Method class declaration that send */
|
|
/* commands to be executed by other DB JDBC drivers. */
|
|
/***********************************************************************/
|
|
class TDBXJDC : public TDBJDBC {
|
|
friend class JSRCCOL;
|
|
friend class JDBConn;
|
|
public:
|
|
// Constructors
|
|
TDBXJDC(PJDBCDEF tdp = NULL);
|
|
|
|
// Implementation
|
|
virtual AMT GetAmType(void) {return TYPE_AM_XDBC;}
|
|
|
|
// Methods
|
|
|
|
// Database routines
|
|
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
|
|
//virtual int GetProgMax(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:
|
|
// Internal functions
|
|
PCMD MakeCMD(PGLOBAL g);
|
|
|
|
// Members
|
|
PCMD Cmdlist; // The commands to execute
|
|
char *Cmdcol; // The name of the Xsrc command column
|
|
int Mxr; // Maximum errors before closing
|
|
int Nerr; // Number of errors so far
|
|
}; // end of class TDBXJDC
|
|
|
|
/***********************************************************************/
|
|
/* Used by table in source execute mode. */
|
|
/***********************************************************************/
|
|
class JSRCCOL : public JDBCCOL {
|
|
friend class TDBXJDC;
|
|
public:
|
|
// Constructors
|
|
JSRCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "JDBC");
|
|
|
|
// Implementation
|
|
virtual int GetAmType(void) {return TYPE_AM_JDBC;}
|
|
|
|
// Methods
|
|
virtual void ReadColumn(PGLOBAL g);
|
|
virtual void WriteColumn(PGLOBAL g);
|
|
|
|
protected:
|
|
// Members
|
|
char *Buffer; // To get returned message
|
|
int Flag; // Column content desc
|
|
}; // end of class JSRCCOL
|
|
|
|
/***********************************************************************/
|
|
/* This is the class declaration for the Drivers catalog table. */
|
|
/***********************************************************************/
|
|
class TDBJDRV : public TDBCAT {
|
|
public:
|
|
// Constructor
|
|
TDBJDRV(PJDBCDEF tdp) : TDBCAT(tdp) {Maxres = tdp->Maxres;}
|
|
|
|
protected:
|
|
// Specific routines
|
|
virtual PQRYRES GetResult(PGLOBAL g);
|
|
|
|
// Members
|
|
int Maxres; // Returned lines limit
|
|
}; // end of class TDBJDRV
|
|
|
|
/***********************************************************************/
|
|
/* This is the class declaration for the tables catalog table. */
|
|
/***********************************************************************/
|
|
class TDBJTB : public TDBJDRV {
|
|
public:
|
|
// Constructor
|
|
TDBJTB(PJDBCDEF tdp);
|
|
|
|
protected:
|
|
// Specific routines
|
|
virtual PQRYRES GetResult(PGLOBAL g);
|
|
|
|
// Members
|
|
PCSZ Schema; // Points to schema name or NULL
|
|
PCSZ Tab; // Points to JDBC table name or pattern
|
|
PCSZ Tabtype; // Points to JDBC table type
|
|
JDBCPARM Ops; // Additional parameters
|
|
}; // end of class TDBJTB
|
|
|
|
/***********************************************************************/
|
|
/* This is the class declaration for the columns catalog table. */
|
|
/***********************************************************************/
|
|
class TDBJDBCL : public TDBJTB {
|
|
public:
|
|
// Constructor
|
|
TDBJDBCL(PJDBCDEF tdp);
|
|
|
|
protected:
|
|
// Specific routines
|
|
virtual PQRYRES GetResult(PGLOBAL g);
|
|
|
|
// Members
|
|
PCSZ Colpat; // Points to catalog column pattern
|
|
}; // end of class TDBJDBCL
|
|
|
|
#endif // !NJDBC
|