Optimization with Easy Connect String processing

Author: sharadraju

doc/src/release_notes.rst

@@ -19,6 +19,9 @@ Common Changes
 Thin Mode Changes
 ++++++++++++++++++
 
+#) Internal code refactoring to improve connection performance when using
+   input easy connection Strings.
+
 #)  Fixed bug that throws an 'ORA-01000' error when a query is executed multiple
     times even though query returned errors like 'NJS-119', 'NJS-016'.
 

lib/thin/sqlnet/ezConnectResolver.js

@@ -26,7 +26,6 @@
 
 'use strict';
 
-const {lookup} = require('dns').promises;
 const errors = require("../../errors.js");
 
 // The host information pattern of the EZConnect URL format.
@@ -71,14 +70,7 @@ const DESCRIPTION_PARAMS = ["ENABLE", "FAILOVER", "LOAD_BALANCE",
 class EZConnectResolver {
   constructor(url) {
     this.URL_PROPS_ALIAS = this.initializeUrlAlias();
-    const jdbcUrlPrefix = url.indexOf('@');
-    if (jdbcUrlPrefix != -1) {
-      this.url = url.substring(jdbcUrlPrefix + 1);
-      this.urlPrefix = url.substring(0, jdbcUrlPrefix + 1);
-    } else {
-      this.url = url;
-      this.urlPrefix = "";
-    }
+    this.url = url;
     this.resolvedUrl = '';
     this.connectionProps = new Map();
     this.urlProps = new Map();
@@ -89,8 +81,8 @@ class EZConnectResolver {
  * Returns the resolved long TNS String.
  * @return Resolved TNS URL.
  */
-  async getResolvedUrl() {
-    await this.parse();
+  getResolvedUrl() {
+    this.parse();
     return this.resolvedUrl;
   }
 
@@ -99,29 +91,22 @@ class EZConnectResolver {
    * After parsing the extended settings if the remaining part of the URL is in
    * EZConnectURL format then resolve it to long TNS url format.
    */
-  async parse() {
+  parse() {
     // First try to parse the extended settings part of the URL.
     let parsedUrl = this.parseExtendedSettings(this.url);
     if (this.connectionProps.size === 0 && this.urlProps.size === 0) {
       // If we have not parsed anything then use the received url as is.
       parsedUrl = this.url;
     }
-
-    if (parsedUrl.startsWith("(")) {
-      // Skip resolve the URL if it is in TNS format,
-      // TNS format starts with '('
-      this.resolvedUrl = this.urlPrefix + parsedUrl;
-    } else {
-      // Try to resolve the EZConnectURL to Long TNS URL.
-      this.resolvedUrl = this.urlPrefix + await this.resolveToLongURLFormat(parsedUrl);
-    }
+    // Try to resolve the EZConnectURL to Long TNS URL.
+    this.resolvedUrl = this.resolveToLongURLFormat(parsedUrl);
   }
   /**
   * Translate the given ezconnect url format to Long TNS format.
   * @param url EZConnect URL
   * @return Returns resolved TNS url.
   */
-  async resolveToLongURLFormat(url) {
+  resolveToLongURLFormat(url) {
     // URL is in the following format
     // [protocol://]host1[,host13][:port1][,host2:port2][/service_name][:server][/instance_name]
 
@@ -151,7 +136,7 @@ class EZConnectResolver {
     const proxyHost = this.urlProps.get("HTTPS_PROXY");
     const proxyPort = this.urlProps.get("HTTPS_PROXY_PORT");
     const addressInfo =
-      await this.buildAddressList(hostInfo, protocol, proxyHost, proxyPort);
+      this.buildAddressList(hostInfo, protocol, proxyHost, proxyPort);
 
     const connectionIdPrefix =
       this.urlProps.get("CONNECTION_ID_PREFIX");
@@ -210,10 +195,8 @@ class EZConnectResolver {
 * @param proxyPort proxy server port [optional].
 * @return address information of the DESCRIPTION node.
 */
-  async buildAddressList(hostInfo, protocol,
+  buildAddressList(hostInfo, protocol,
     proxyHost, proxyPort) {
-    let shost = '';
-    let ipcnt = 0;
     const builder = new Array();
     let proxyInfo = '';
     if (proxyHost != null) {
@@ -239,7 +222,6 @@ class EZConnectResolver {
         }
         for (const hname in hostnames) {
           addressListBuilder.push(this.getAddrStr(hostnames[hname], port, protocol, proxyInfo));
-          shost = hostnames[hname];
           addressNodeCount++;
         }
       }
@@ -253,21 +235,6 @@ class EZConnectResolver {
       else
         builder.push(parts.join(''));
     }
-    if (naddr == 1) {
-      shost = shost.trim();
-      // If it is IPV6 format address then remove the enclosing '[' and ']'
-      if (shost.startsWith("[") && shost.endsWith("]"))
-        shost = shost.substring(1, shost.length - 1);
-      try {
-        await lookup(shost);
-        ipcnt++;
-      } catch {
-        // nothing
-      }
-      if (ipcnt == 0) {
-        errors.throwErr(errors.ERR_INVALID_EZCONNECT_SYNTAX, 'could not resolve hostname', shost);
-      }
-    }
 
     if (addressLists.length < 2 && naddr > 1) {
       this.lb = true;

lib/thin/sqlnet/networkSession.js

@@ -71,29 +71,23 @@ async function resolveConnectStr(connectString, configDir) {
   const connStr = connectString.trim();
   let resolvedVal = connStr;
   if ((connStr.indexOf(')') == -1) || (connStr.indexOf('(') != 0)) {
-    try {
-      /* Try through ezconnect */
+    if ((connStr.indexOf(':') != -1) || (connStr.indexOf('/') != -1)) {
       const ezcnObj = new EzConnect(connStr);
-      resolvedVal = await ezcnObj.getResolvedUrl();
-    } catch (err) {
-      try {
-        /* try tns alias */
-        const namesFilePath = tnsnamesFilePath(configDir);
-        const p = await nlParamParser.initializeNlpa(namesFilePath);
-        resolvedVal = p.get(connStr.toUpperCase());
-        if (!resolvedVal)
-          errors.throwErr(errors.ERR_TNS_ENTRY_NOT_FOUND, connStr, configDir ? configDir + '/tnsnames.ora' : process.env.TNS_ADMIN + '/tnsnames.ora');
-        resolvedVal = resolvedVal.getListElement(0);
-      } catch (err1) {
-        if ((connStr.indexOf(':') != -1) || (connStr.indexOf('/') != -1)) {
-          throw err;
-        } else {
-          throw err1;
-        }
-      }
+      resolvedVal = ezcnObj.getResolvedUrl();
+      return resolvedVal;
+    } else {
+      //try tns alias
+      const namesFilePath = tnsnamesFilePath(configDir);
+      const p = await nlParamParser.initializeNlpa(namesFilePath);
+      resolvedVal = p.get(connStr.toUpperCase());
+      if (!resolvedVal)
+        errors.throwErr(errors.ERR_TNS_ENTRY_NOT_FOUND, connStr, configDir ? configDir + '/tnsnames.ora' : process.env.TNS_ADMIN + '/tnsnames.ora');
+      resolvedVal = resolvedVal.getListElement(0);
     }
+
   }
   return resolvedVal;
+
 }
 
 async function resolveAddress(connStr, configDir) {