Optimization to ignore long release string during connection

This commit is contained in:
Christopher Jones 2020-02-16 10:59:16 +11:00
parent 6691d57169
commit 2027f08b4e
1 changed files with 2 additions and 8 deletions

View File

@ -1482,17 +1482,14 @@ static napi_value njsConnection_getModule(napi_env env,
static napi_value njsConnection_getOracleServerVersion(napi_env env, static napi_value njsConnection_getOracleServerVersion(napi_env env,
napi_callback_info info) napi_callback_info info)
{ {
uint32_t releaseStringLength;
dpiVersionInfo versionInfo; dpiVersionInfo versionInfo;
const char *releaseString;
njsConnection *conn; njsConnection *conn;
if (!njsUtils_validateGetter(env, info, (njsBaseInstance**) &conn)) if (!njsUtils_validateGetter(env, info, (njsBaseInstance**) &conn))
return NULL; return NULL;
if (!conn->handle) if (!conn->handle)
return NULL; return NULL;
if (dpiConn_getServerVersion(conn->handle, &releaseString, if (dpiConn_getServerVersion(conn->handle, NULL, NULL, &versionInfo) < 0) {
&releaseStringLength, &versionInfo) < 0) {
njsUtils_throwErrorDPI(env, conn->oracleDb); njsUtils_throwErrorDPI(env, conn->oracleDb);
return NULL; return NULL;
} }
@ -1507,9 +1504,7 @@ static napi_value njsConnection_getOracleServerVersion(napi_env env,
static napi_value njsConnection_getOracleServerVersionString(napi_env env, static napi_value njsConnection_getOracleServerVersionString(napi_env env,
napi_callback_info info) napi_callback_info info)
{ {
uint32_t releaseStringLength;
dpiVersionInfo versionInfo; dpiVersionInfo versionInfo;
const char *releaseString;
char versionString[40]; char versionString[40];
njsConnection *conn; njsConnection *conn;
@ -1517,8 +1512,7 @@ static napi_value njsConnection_getOracleServerVersionString(napi_env env,
return NULL; return NULL;
if (!conn->handle) if (!conn->handle)
return NULL; return NULL;
if (dpiConn_getServerVersion(conn->handle, &releaseString, if (dpiConn_getServerVersion(conn->handle, NULL, NULL, &versionInfo) < 0) {
&releaseStringLength, &versionInfo) < 0) {
njsUtils_throwErrorDPI(env, conn->oracleDb); njsUtils_throwErrorDPI(env, conn->oracleDb);
return NULL; return NULL;
} }