Skip to content

M
MariaDB
Commit a982f59b authored by Olivier Bertrand's avatar Olivier Bertrand
Browse files
Options

- JDBC using separate jmethodID for data types 

  Some DEBUG tests
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
parent 2f2797e5
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 35 deletions
storage/connect/jdbconn.cpp
View file @ a982f59b
...@@ -62,6 +62,9 @@ extern char *ClassPath; // The connect_class_path global variable value ...@@ -62,6 +62,9 @@ extern char *ClassPath; // The connect_class_path global variable value
void *JDBConn::LibJvm = NULL; void *JDBConn::LibJvm = NULL;
CRTJVM JDBConn::CreateJavaVM = NULL; CRTJVM JDBConn::CreateJavaVM = NULL;
GETJVM JDBConn::GetCreatedJavaVMs = NULL; GETJVM JDBConn::GetCreatedJavaVMs = NULL;
#if defined(_DEBUG)
GETDEF JDBConn::GetDefaultJavaVMInitArgs = NULL;
#endif // _DEBUG
/***********************************************************************/ /***********************************************************************/
/* Some macro's (should be defined elsewhere to be more accessible) */ /* Some macro's (should be defined elsewhere to be more accessible) */
...@@ -646,6 +649,7 @@ JDBConn::JDBConn(PGLOBAL g, TDBJDBC *tdbp) ...@@ -646,6 +649,7 @@ JDBConn::JDBConn(PGLOBAL g, TDBJDBC *tdbp)
job = nullptr; // The JdbcInterface class object job = nullptr; // The JdbcInterface class object
xqid = xuid = xid = grs = readid = fetchid = typid = errid = nullptr; xqid = xuid = xid = grs = readid = fetchid = typid = errid = nullptr;
prepid = xpid = pcid = nullptr; prepid = xpid = pcid = nullptr;
chrfldid = intfldid = dblfldid = fltfldid = datfldid = bigfldid = nullptr;
//m_LoginTimeout = DEFAULT_LOGIN_TIMEOUT; //m_LoginTimeout = DEFAULT_LOGIN_TIMEOUT;
//m_QueryTimeout = DEFAULT_QUERY_TIMEOUT; //m_QueryTimeout = DEFAULT_QUERY_TIMEOUT;
//m_UpdateOptions = 0; //m_UpdateOptions = 0;
...@@ -811,6 +815,9 @@ void JDBConn::ResetJVM(void) ...@@ -811,6 +815,9 @@ void JDBConn::ResetJVM(void)
LibJvm = NULL; LibJvm = NULL;
CreateJavaVM = NULL; CreateJavaVM = NULL;
GetCreatedJavaVMs = NULL; GetCreatedJavaVMs = NULL;
#if defined(_DEBUG)
GetDefaultJavaVMInitArgs = NULL;
#endif // _DEBUG
} // endif LibJvm } // endif LibJvm
} // end of ResetJVM } // end of ResetJVM
...@@ -851,6 +858,14 @@ bool JDBConn::GetJVM(PGLOBAL g) ...@@ -851,6 +858,14 @@ bool JDBConn::GetJVM(PGLOBAL g)
sprintf(g->Message, MSG(PROCADD_ERROR), GetLastError(), "JNI_GetCreatedJavaVMs"); sprintf(g->Message, MSG(PROCADD_ERROR), GetLastError(), "JNI_GetCreatedJavaVMs");
FreeLibrary((HMODULE)LibJvm); FreeLibrary((HMODULE)LibJvm);
LibJvm = NULL; LibJvm = NULL;
#if defined(_DEBUG)
} else if (!(GetDefaultJavaVMInitArgs = (GETDEF)GetProcAddress((HINSTANCE)LibJvm,
"JNI_GetDefaultJavaVMInitArgs"))) {
sprintf(g->Message, MSG(PROCADD_ERROR), GetLastError(),
"JNI_GetDefaultJavaVMInitArgs");
FreeLibrary((HMODULE)LibJvm);
LibJvm = NULL;
#endif // _DEBUG
} // endif LibJvm } // endif LibJvm
#else // !__WIN__ #else // !__WIN__
const char *error = NULL; const char *error = NULL;
...@@ -874,7 +889,15 @@ bool JDBConn::GetJVM(PGLOBAL g) ...@@ -874,7 +889,15 @@ bool JDBConn::GetJVM(PGLOBAL g)
sprintf(g->Message, MSG(GET_FUNC_ERR), "JNI_GetCreatedJavaVMs", SVP(error)); sprintf(g->Message, MSG(GET_FUNC_ERR), "JNI_GetCreatedJavaVMs", SVP(error));
dlclose(LibJvm); dlclose(LibJvm);
LibJvm = NULL; LibJvm = NULL;
} // endif LibJvm #if defined(_DEBUG)
} else if (!(GetDefaultJavaVMInitArgs = (GETDEF)dlsym(LibJvm,
"JNI_GetDefaultJavaVMInitArgs"))) {
error = dlerror();
sprintf(g->Message, MSG(GET_FUNC_ERR), "JNI_GetDefaultJavaVMInitArgs", SVP(error));
dlclose(LibJvm);
LibJvm = NULL;
#endif // _DEBUG
} // endif LibJvm
#endif // !__WIN__ #endif // !__WIN__
} // endif LibJvm } // endif LibJvm
...@@ -919,13 +942,17 @@ int JDBConn::Open(PJPARM sop) ...@@ -919,13 +942,17 @@ int JDBConn::Open(PJPARM sop)
#if defined(__WIN__) #if defined(__WIN__)
sep = ';'; sep = ';';
#define N 1
//#define N 2
//#define N 3
#else #else
sep = ':'; sep = ':';
#define N 1
#endif #endif
//================== prepare loading of Java VM ============================ //================== prepare loading of Java VM ============================
JavaVMInitArgs vm_args; // Initialization arguments JavaVMInitArgs vm_args; // Initialization arguments
JavaVMOption* options = new JavaVMOption[1]; // JVM invocation options JavaVMOption* options = new JavaVMOption[N]; // JVM invocation options
// where to find java .class // where to find java .class
if (ClassPath && *ClassPath) { if (ClassPath && *ClassPath) {
...@@ -945,9 +972,20 @@ int JDBConn::Open(PJPARM sop) ...@@ -945,9 +972,20 @@ int JDBConn::Open(PJPARM sop)
} // endif trace } // endif trace
options[0].optionString = jpop->GetStr(); options[0].optionString = jpop->GetStr();
//options[1].optionString = "-verbose:jni"; #if N == 2
options[1].optionString = "-Xcheck:jni";
#endif
#if N == 3
options[1].optionString = "-Xms256M";
options[2].optionString = "-Xmx512M";
#endif
#if defined(_DEBUG)
vm_args.version = JNI_VERSION_1_2; // minimum Java version
rc = GetDefaultJavaVMInitArgs(&vm_args);
#else
vm_args.version = JNI_VERSION_1_6; // minimum Java version vm_args.version = JNI_VERSION_1_6; // minimum Java version
vm_args.nOptions = 1; // number of options #endif // _DEBUG
vm_args.nOptions = N; // number of options
vm_args.options = options; vm_args.options = options;
vm_args.ignoreUnrecognized = false; // invalid options make the JVM init fail vm_args.ignoreUnrecognized = false; // invalid options make the JVM init fail
...@@ -985,8 +1023,10 @@ int JDBConn::Open(PJPARM sop) ...@@ -985,8 +1023,10 @@ int JDBConn::Open(PJPARM sop)
} // endif rc } // endif rc
//=============== Display JVM version ======================================= //=============== Display JVM version =======================================
//jint ver = env->GetVersion(); #if defined(_DEBUG)
//cout << ((ver>>16)&0x0f) << "."<<(ver&0x0f) << endl; jint ver = env->GetVersion();
printf("JVM Version %d.%d\n", ((ver>>16)&0x0f), (ver&0x0f));
#endif //_DEBUG
// try to find the JdbcInterface class // try to find the JdbcInterface class
jdi = env->FindClass("JdbcInterface"); jdi = env->FindClass("JdbcInterface");
...@@ -1251,7 +1291,6 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) ...@@ -1251,7 +1291,6 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val)
jlong dtv; jlong dtv;
jstring cn, jn = nullptr; jstring cn, jn = nullptr;
jobject dob; jobject dob;
jmethodID fldid = nullptr;
if (rank == 0) if (rank == 0)
if (!name || (jn = env->NewStringUTF(name)) == nullptr) { if (!name || (jn = env->NewStringUTF(name)) == nullptr) {
...@@ -1271,11 +1310,8 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) ...@@ -1271,11 +1310,8 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val)
case 12: // VARCHAR case 12: // VARCHAR
case -1: // LONGVARCHAR case -1: // LONGVARCHAR
case 1: // CHAR case 1: // CHAR
fldid = env->GetMethodID(jdi, "StringField", if (!gmID(g, chrfldid, "StringField", "(ILjava/lang/String;)Ljava/lang/String;")) {
"(ILjava/lang/String;)Ljava/lang/String;"); cn = (jstring)env->CallObjectMethod(job, chrfldid, (jint)rank, jn);
if (fldid != nullptr) {
cn = (jstring)env->CallObjectMethod(job, fldid, (jint)rank, jn);
if (cn) { if (cn) {
const char *field = env->GetStringUTFChars(cn, (jboolean)false); const char *field = env->GetStringUTFChars(cn, (jboolean)false);
...@@ -1292,10 +1328,8 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) ...@@ -1292,10 +1328,8 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val)
case 4: // INTEGER case 4: // INTEGER
case 5: // SMALLINT case 5: // SMALLINT
case -6: // TINYINT case -6: // TINYINT
fldid = env->GetMethodID(jdi, "IntField", "(ILjava/lang/String;)I"); if (!gmID(g, intfldid, "IntField", "(ILjava/lang/String;)I"))
val->SetValue((int)env->CallIntMethod(job, intfldid, rank, jn));
if (fldid != nullptr)
val->SetValue((int)env->CallIntMethod(job, fldid, rank, jn));
else else
val->Reset(); val->Reset();
...@@ -1303,20 +1337,16 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) ...@@ -1303,20 +1337,16 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val)
case 8: // DOUBLE case 8: // DOUBLE
case 2: // NUMERIC case 2: // NUMERIC
case 3: // DECIMAL case 3: // DECIMAL
fldid = env->GetMethodID(jdi, "DoubleField", "(ILjava/lang/String;)D"); if (!gmID(g, dblfldid, "DoubleField", "(ILjava/lang/String;)D"))
val->SetValue((double)env->CallDoubleMethod(job, dblfldid, rank, jn));
if (fldid != nullptr)
val->SetValue((double)env->CallDoubleMethod(job, fldid, rank, jn));
else else
val->Reset(); val->Reset();
break; break;
case 7: // REAL case 7: // REAL
case 6: // FLOAT case 6: // FLOAT
fldid = env->GetMethodID(jdi, "FloatField", "(ILjava/lang/String;)F"); if (!gmID(g, fltfldid, "FloatField", "(ILjava/lang/String;)F"))
val->SetValue((float)env->CallFloatMethod(job, fltfldid, rank, jn));
if (fldid != nullptr)
val->SetValue((float)env->CallFloatMethod(job, fldid, rank, jn));
else else
val->Reset(); val->Reset();
...@@ -1324,11 +1354,9 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) ...@@ -1324,11 +1354,9 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val)
case 91: // DATE case 91: // DATE
case 92: // TIME case 92: // TIME
case 93: // TIMESTAMP case 93: // TIMESTAMP
fldid = env->GetMethodID(jdi, "TimestampField", if (!gmID(g, datfldid, "TimestampField",
"(ILjava/lang/String;)Ljava/sql/Timestamp;"); "(ILjava/lang/String;)Ljava/sql/Timestamp;")) {
dob = env->CallObjectMethod(job, datfldid, (jint)rank, jn);
if (fldid != nullptr) {
dob = env->CallObjectMethod(job, fldid, (jint)rank, jn);
if (dob) { if (dob) {
jclass jts = env->FindClass("java/sql/Timestamp"); jclass jts = env->FindClass("java/sql/Timestamp");
...@@ -1354,10 +1382,8 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) ...@@ -1354,10 +1382,8 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val)
break; break;
case -5: // BIGINT case -5: // BIGINT
fldid = env->GetMethodID(jdi, "BigintField", "(ILjava/lang/String;)J"); if (!gmID(g, bigfldid, "BigintField", "(ILjava/lang/String;)J"))
val->SetValue((long long)env->CallLongMethod(job, bigfldid, (jint)rank, jn));
if (fldid != nullptr)
val->SetValue((long long)env->CallLongMethod(job, fldid, (jint)rank, jn));
else else
val->Reset(); val->Reset();
......
storage/connect/jdbconn.h
View file @ a982f59b
...@@ -53,6 +53,9 @@ typedef struct tagJCATPARM { ...@@ -53,6 +53,9 @@ typedef struct tagJCATPARM {
typedef jint(JNICALL *CRTJVM) (JavaVM **, void **, void *); typedef jint(JNICALL *CRTJVM) (JavaVM **, void **, void *);
typedef jint(JNICALL *GETJVM) (JavaVM **, jsize, jsize *); typedef jint(JNICALL *GETJVM) (JavaVM **, jsize, jsize *);
#if defined(_DEBUG)
typedef jint(JNICALL *GETDEF) (void *);
#endif // _DEBUG
// JDBC connection to a data source // JDBC connection to a data source
class TDBJDBC; class TDBJDBC;
...@@ -109,8 +112,15 @@ class JDBConn : public BLOCK { ...@@ -109,8 +112,15 @@ class JDBConn : public BLOCK {
public: public:
// Set static variables // Set static variables
static void SetJVM(void) static void SetJVM(void) {
{ LibJvm = NULL; CreateJavaVM = NULL; GetCreatedJavaVMs = NULL; } LibJvm = NULL;
CreateJavaVM = NULL;
GetCreatedJavaVMs = NULL;
#if defined(_DEBUG)
GetDefaultJavaVMInitArgs = NULL;
#endif // _DEBUG
} // end of SetJVM
static void ResetJVM(void); static void ResetJVM(void);
static bool GetJVM(PGLOBAL g); static bool GetJVM(PGLOBAL g);
...@@ -135,6 +145,9 @@ class JDBConn : public BLOCK { ...@@ -135,6 +145,9 @@ class JDBConn : public BLOCK {
#endif // !__WIN__ #endif // !__WIN__
static CRTJVM CreateJavaVM; static CRTJVM CreateJavaVM;
static GETJVM GetCreatedJavaVMs; static GETJVM GetCreatedJavaVMs;
#if defined(_DEBUG)
static GETDEF GetDefaultJavaVMInitArgs;
#endif // _DEBUG
PGLOBAL m_G; PGLOBAL m_G;
TDBJDBC *m_Tdb; TDBJDBC *m_Tdb;
JavaVM *jvm; // Pointer to the JVM (Java Virtual Machine) JavaVM *jvm; // Pointer to the JVM (Java Virtual Machine)
...@@ -152,6 +165,12 @@ class JDBConn : public BLOCK { ...@@ -152,6 +165,12 @@ class JDBConn : public BLOCK {
jmethodID xpid; // The ExecutePrep method ID jmethodID xpid; // The ExecutePrep method ID
jmethodID pcid; // The ClosePrepStmt method ID jmethodID pcid; // The ClosePrepStmt method ID
jmethodID errid; // The GetErrmsg method ID jmethodID errid; // The GetErrmsg method ID
jmethodID chrfldid; // The StringField method ID
jmethodID intfldid; // The IntField method ID
jmethodID dblfldid; // The DoubleField method ID
jmethodID fltfldid; // The FloatField method ID
jmethodID datfldid; // The TimestampField method ID
jmethodID bigfldid; // The BigintField method ID
//DWORD m_LoginTimeout; //DWORD m_LoginTimeout;
//DWORD m_QueryTimeout; //DWORD m_QueryTimeout;
//DWORD m_UpdateOptions; //DWORD m_UpdateOptions;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7