Adjusted code to use the new API for getting SODA collection names using ODPI-C latest version

Author: sharadraju

binding.gyp

@@ -53,6 +53,7 @@
              "odpi/src/dpiSodaDoc.c",
              "odpi/src/dpiSodaDocCursor.c",
              "odpi/src/dpiStmt.c",
+             "odpi/src/dpiStringList.c",
              "odpi/src/dpiSubscr.c",
              "odpi/src/dpiUtils.c",
              "odpi/src/dpiVar.c"

src/njsBaton.c

@@ -223,7 +223,11 @@ void njsBaton_free(njsBaton *baton, napi_env env)
         free(baton->lob);
         baton->lob = NULL;
     }
-    NJS_FREE_AND_CLEAR(baton->sodaCollNames);
+    if (baton->sodaCollNames) {
+        dpiContext_freeStringList(baton->globals->context,
+                baton->sodaCollNames);
+        NJS_FREE_AND_CLEAR(baton->sodaCollNames);
+    }
     if (!baton->jsBufferRef) {
         NJS_FREE_AND_CLEAR(baton->bufferPtr);
     }

src/njsModule.h

@@ -332,7 +332,7 @@ struct njsBaton {
     const char **bindNames;
     uint32_t *bindNameLengths;
     dpiSodaOperOptions *sodaOperOptions;
-    dpiSodaCollNames *sodaCollNames;
+    dpiStringList *sodaCollNames;
     njsLobBuffer *lob;
 
     // ODPI-C handles (requires release)

src/njsSodaDatabase.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -216,7 +216,7 @@ static void njsSodaDatabase_finalize(napi_env env, void *finalizeData,
 //-----------------------------------------------------------------------------
 NJS_NAPI_METHOD_IMPL_ASYNC(njsSodaDatabase_getCollectionNames, 1, NULL)
 {
-    baton->sodaCollNames = calloc(1, sizeof(dpiSodaCollNames));
+    baton->sodaCollNames = calloc(1, sizeof(dpiStringList));
     if (!baton->sodaCollNames)
         return njsUtils_throwInsufficientMemory(env);
     if (!njsUtils_getNamedPropertyString(env, args[0], "startsWith",
@@ -241,9 +241,7 @@ static bool njsSodaDatabase_getCollectionNamesAsync(njsBaton *baton)
     if (dpiSodaDb_getCollectionNames(db->handle, baton->startsWith,
             (uint32_t) baton->startsWithLength, (uint32_t) baton->limit,
             DPI_SODA_FLAGS_DEFAULT, baton->sodaCollNames) < 0) {
-        njsBaton_setErrorDPI(baton);
-        dpiSodaDb_freeCollectionNames(db->handle, baton->sodaCollNames);
-        return false;
+        return njsBaton_setErrorDPI(baton);
     }
     return true;
 }
@@ -256,34 +254,20 @@ static bool njsSodaDatabase_getCollectionNamesAsync(njsBaton *baton)
 static bool njsSodaDatabase_getCollectionNamesPostAsync(njsBaton *baton,
         napi_env env, napi_value *result)
 {
-    njsSodaDatabase *db = (njsSodaDatabase*) baton->callingInstance;
     napi_value value;
-    bool ok = true;
     uint32_t i;
 
     // create array for the collection names
-    if (napi_create_array_with_length(env, baton->sodaCollNames->numNames,
-            result) != napi_ok)
-        ok = false;
+    NJS_CHECK_NAPI(env, napi_create_array_with_length(env,
+            baton->sodaCollNames->numStrings, result))
 
     // populate it with the collection names
-    for (i = 0; ok && i < baton->sodaCollNames->numNames; i++) {
-
-        // create string for collection name at that index
-        if (napi_create_string_utf8(env, baton->sodaCollNames->names[i],
-                baton->sodaCollNames->nameLengths[i], &value) != napi_ok) {
-            ok = false;
-            break;
-        }
-
-        // add it to the array
-        if (napi_set_element(env, *result, i, value) != napi_ok)
-            ok = false;
-
+    for (i = 0; i < baton->sodaCollNames->numStrings; i++) {
+        NJS_CHECK_NAPI(env, napi_create_string_utf8(env,
+                baton->sodaCollNames->strings[i],
+                baton->sodaCollNames->stringLengths[i], &value))
+        NJS_CHECK_NAPI(env, napi_set_element(env, *result, i, value))
     }
-    dpiSodaDb_freeCollectionNames(db->handle, baton->sodaCollNames);
-    if (!ok)
-        return false;
 
     return true;
 }