mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
bcfb5b2de9
modified: storage/connect/ha_connect.cc - Include MONGO in all Java enabled distributions Mongo will be enabled only for 10.2 and 10.3 modified: storage/connect/CMakeLists.txt - Change JDBC_SUPPORT to JAVA_SUPPORT which also replaces MONGO_SUPPORT MONGO_SUPPORT is now just used to enable the MONGO table type modified: storage/connect/filter.cpp modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h modified: storage/connect/mongo.cpp modified: storage/connect/mycat.cc modified: storage/connect/plgdbutl.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h - Move MakeSelector function from FILTER to mongo.cpp modified: storage/connect/filter.cpp modified: storage/connect/filter.h modified: storage/connect/cmgoconn.cpp modified: storage/connect/jmgoconn.cpp modified: storage/connect/mongo.cpp - Do mongo_init only on first use of the MongoDB C Driver This will permit to delay load the mongo lib on Windows modified: storage/connect/cmgoconn.cpp modified: storage/connect/cmgoconn.h modified: storage/connect/ha_connect.cc - Replace NEW_VAR by a test on MYSQL_VERSION_ID modified: storage/connect/ha_connect.cc - Suppress enable_mongo session variable modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc - Make some function headers identical in .h and .cc file (replacing const char* by PCSZ) modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h - Change a parameter type from uchar* to const uchar* (for ScanRecord and CheckRecord) modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h - Changes on LIKE and NOT LIKE does not fix a bug yet modified: storage/connect/ha_connect.cc - Suppress PIVOT_SUPPORT (PIVOT type is unconditionnal) modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc - Change the strz function from inline to static modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h - export the JavaConn class and the MgoColumns and IsNum functions modified: storage/connect/javaconn.h modified: storage/connect/json.h modified: storage/connect/mongo.h - Fix MDEV-13924 modified: storage/connect/jdbconn.cpp - Make a temporary fix for the compiler bug in CalculateArray modified: storage/connect/jsonudf.cpp modified: storage/connect/tabjson.cpp - Typo modified: storage/connect/jdbccat.h modified: storage/connect/reldef.h modified: storage/connect/tabext.h modified: storage/connect/tabjmg.cpp modified: storage/connect/tabxml.h modified: storage/connect/valblk.h modified: storage/connect/value.h modified: storage/connect/xtable.h - Fix a bug in MONGO tests by changing 'MONGO' to $TYPE modified: storage/connect/mysql-test/connect/t/mongo_test.inc - Record test results to reflect all changes 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
129 lines
4.6 KiB
C++
129 lines
4.6 KiB
C++
/***********************************************************************/
|
|
/* JavaConn.h : header file for the Java connection classes. */
|
|
/***********************************************************************/
|
|
|
|
/***********************************************************************/
|
|
/* Included C-definition files required by the interface. */
|
|
/***********************************************************************/
|
|
#include "block.h"
|
|
#include "jdbccat.h"
|
|
|
|
/***********************************************************************/
|
|
/* Java native interface. */
|
|
/***********************************************************************/
|
|
#include <jni.h>
|
|
|
|
/***********************************************************************/
|
|
/* Constants and defines. */
|
|
/***********************************************************************/
|
|
// Miscellaneous sizing info
|
|
#define MAX_NUM_OF_MSG 10 // Max number of error messages
|
|
//efine MAX_CURRENCY 30 // Max size of Currency($) string
|
|
#define MAX_TNAME_LEN 32 // Max size of table names
|
|
//efine MAX_FNAME_LEN 256 // Max size of field names
|
|
//efine MAX_STRING_INFO 256 // Max size of string from SQLGetInfo
|
|
//efine MAX_DNAME_LEN 256 // Max size of Recordset names
|
|
//efine MAX_CONNECT_LEN 512 // Max size of Connect string
|
|
//efine MAX_CURSOR_NAME 18 // Max size of a cursor name
|
|
//efine DEFAULT_FIELD_TYPE 0 // TYPE_NULL
|
|
|
|
#if !defined(__WIN__)
|
|
typedef unsigned char *PUCHAR;
|
|
#endif // !__WIN__
|
|
|
|
enum JCATINFO {
|
|
JCAT_TAB = 1, // JDBC Tables
|
|
JCAT_COL = 2, // JDBC Columns
|
|
JCAT_KEY = 3, // JDBC PrimaryKeys
|
|
};
|
|
|
|
/***********************************************************************/
|
|
/* This structure is used to control the catalog functions. */
|
|
/***********************************************************************/
|
|
typedef struct tagJCATPARM {
|
|
JCATINFO Id; // Id to indicate function
|
|
PQRYRES Qrp; // Result set pointer
|
|
PCSZ DB; // Database (Schema)
|
|
PCSZ Tab; // Table name or pattern
|
|
PCSZ Pat; // Table type or column pattern
|
|
} JCATPARM;
|
|
|
|
typedef jint(JNICALL *CRTJVM) (JavaVM **, void **, void *);
|
|
typedef jint(JNICALL *GETJVM) (JavaVM **, jsize, jsize *);
|
|
#if defined(_DEBUG)
|
|
typedef jint(JNICALL *GETDEF) (void *);
|
|
#endif // _DEBUG
|
|
|
|
//class JAVAConn;
|
|
|
|
/***********************************************************************/
|
|
/* JAVAConn class. */
|
|
/***********************************************************************/
|
|
class DllExport JAVAConn : public BLOCK {
|
|
friend class TDBJMG;
|
|
friend class JMGDISC;
|
|
private:
|
|
JAVAConn(); // Standard (unused) constructor
|
|
|
|
public:
|
|
// Constructor
|
|
JAVAConn(PGLOBAL g, PCSZ wrapper);
|
|
|
|
// Set static variables
|
|
static void SetJVM(void) {
|
|
LibJvm = NULL;
|
|
CreateJavaVM = NULL;
|
|
GetCreatedJavaVMs = NULL;
|
|
#if defined(_DEBUG)
|
|
GetDefaultJavaVMInitArgs = NULL;
|
|
#endif // _DEBUG
|
|
} // end of SetJVM
|
|
|
|
static void ResetJVM(void);
|
|
static bool GetJVM(PGLOBAL g);
|
|
|
|
// Implementation
|
|
public:
|
|
//virtual ~JAVAConn();
|
|
bool IsOpen(void) { return m_Opened; }
|
|
bool IsConnected(void) { return m_Connected; }
|
|
|
|
// Java operations
|
|
protected:
|
|
bool gmID(PGLOBAL g, jmethodID& mid, const char *name, const char *sig);
|
|
bool Check(jint rc = 0);
|
|
|
|
public:
|
|
virtual void AddJars(PSTRG jpop, char sep) = 0;
|
|
virtual bool Connect(PJPARM sop) = 0;
|
|
virtual bool Open(PGLOBAL g);
|
|
virtual bool MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options,
|
|
PCSZ filter, bool pipe) = 0;
|
|
virtual void Close(void);
|
|
|
|
protected:
|
|
// Members
|
|
#if defined(__WIN__)
|
|
static HANDLE LibJvm; // Handle to the jvm DLL
|
|
#else // !__WIN__
|
|
static void *LibJvm; // Handle for the jvm shared library
|
|
#endif // !__WIN__
|
|
static CRTJVM CreateJavaVM;
|
|
static GETJVM GetCreatedJavaVMs;
|
|
#if defined(_DEBUG)
|
|
static GETDEF GetDefaultJavaVMInitArgs;
|
|
#endif // _DEBUG
|
|
PGLOBAL m_G;
|
|
JavaVM *jvm; // Pointer to the JVM (Java Virtual Machine)
|
|
JNIEnv *env; // Pointer to native interface
|
|
jclass jdi; // Pointer to the java wrapper class
|
|
jobject job; // The java wrapper class object
|
|
jmethodID errid; // The GetErrmsg method ID
|
|
PFBLOCK fp;
|
|
bool m_Opened;
|
|
bool m_Connected;
|
|
PCSZ DiscFunc;
|
|
PCSZ Msg;
|
|
PCSZ m_Wrap;
|
|
int m_Rows;
|
|
}; // end of JAVAConn class definition
|