Minor bug fixes for vector datatype

Author: sharadraju

lib/connection.js

@@ -43,7 +43,7 @@ const constants = require('./constants.js');
 const settings = require('./settings.js');
 const transformer = require('./transformer.js');
 const types = require('./types.js');
-const oson = require('impl/datahandlers/oson.js');
+const oson = require('./impl/datahandlers/oson.js');
 
 // global mapping of subscriptions; these cannot be tied to a particular
 // connection or pool since subscriptions can be created with one connection

lib/settings.js

@@ -30,7 +30,7 @@ const constants = require('./constants.js');
 const errors = require('./errors.js');
 const types = require('./types.js');
 const nodbUtil = require("./util.js");
-const vector = require('impl/datahandlers/vector.js');
+const vector = require('./impl/datahandlers/vector.js');
 
 class Settings {
 

src/njsVariable.c

@@ -757,11 +757,9 @@ bool njsVariable_setScalarValue(njsVariable *var, uint32_t pos, napi_env env,
     void *buffer;
     njsLob *lob;
     bool check;
-    napi_value arrBuf;
     napi_typedarray_type type;
     void *rawdata = NULL;
     size_t numElem = 0;
-    size_t byteOffset = 0;
 
     // initialization
     data = &var->buffer->dpiVarData[pos];
@@ -793,7 +791,7 @@ bool njsVariable_setScalarValue(njsVariable *var, uint32_t pos, napi_env env,
     if (var->varTypeNum == DPI_ORACLE_TYPE_VECTOR) {
         // only typed arrays are sent
         NJS_CHECK_NAPI(env, napi_get_typedarray_info(env, value, &type,
-                &numElem, &rawdata, &arrBuf, &byteOffset))
+                &numElem, &rawdata, NULL, NULL))
         vectorInfo.numDimensions = (uint32_t)numElem;
         switch (type) {
             case napi_float64_array:
@@ -808,7 +806,7 @@ bool njsVariable_setScalarValue(njsVariable *var, uint32_t pos, napi_env env,
             default:
                 break;
         }
-        vectorInfo.dimensions.asPtr = rawdata + byteOffset;
+        vectorInfo.dimensions.asPtr = rawdata;
         if (dpiVector_setValue(data->value.asVector, &vectorInfo) < 0) {
             return njsBaton_setErrorDPI(baton);
         }

test/dataTypeVector1.js

@@ -1584,4 +1584,25 @@ describe('294. dataTypeVector1.js', function() {
     assert.strictEqual(clobData, arr2.toString('utf8'));
     await connection.execute(testsUtil.sqlDropTable(table));
   }); // 294.59
+
+  it('294.60 insert a float64 typed array created from ArrayBuffer', async function() {
+    const elements = [8.1, 7.2, 6.3, 5.4, 4.5, 3.6, 2.7, 1.8, 9.9, 0.0];
+    const arrBuf = new ArrayBuffer(128);
+
+    // Create typed array of 10 elements from byteOffset 8
+    const float64Arr = new Float64Array(arrBuf, 8, 10);
+
+    // initialize
+    elements.forEach((element, index) => {
+      float64Arr[index] = element;
+    });
+
+    // insert and verify.
+    const binds = { emdbedding: { dir: oracledb.BIND_IN, type: oracledb.DB_TYPE_VECTOR, val: float64Arr } };
+    const sql = `insert into ${tableName} (IntCol, Vector64Col)
+    values(2, :emdbedding)`;
+    await connection.execute(sql, binds);
+    const result = await connection.execute(`select Vector64Col from ${tableName}`);
+    assert.deepStrictEqual(result.rows[0][0], Array.from(float64Arr));
+  }); // 294.60
 });