Add Map technique comparisons

Author: BobdenOs

hana/lib/deep-queries.js

@@ -31,9 +31,9 @@ async function onDeep(req, next) {
 }
 
 const hasDeep = (q, target) => {
-  if(q.INSERT && !q.INSERT.entries) return false
-  if(q.UPSERT && !q.UPSERT.entries) return false
-  for(const _ in target.compositions) return true
+  if (q.INSERT && !q.INSERT.entries) return false
+  if (q.UPSERT && !q.UPSERT.entries) return false
+  for (const _ in target.compositions) return true
   return false
 }
 
@@ -50,12 +50,15 @@ const getDeepQueries = async function (query, target) {
   const getEntries = (query) => {
     const cqn2sql = new this.class.CQN2SQL(this)
     cqn2sql.cqn = query
+    const entries = query.INSERT
+      ? query.INSERT.entries
+      : query.UPSERT.entries
+    if (entries[0] instanceof Readable) {
+      entries[0].type = 'json'
+      return entries[0]
+    }
     return Readable.from(
-      cqn2sql.INSERT_entries_stream(
-        query.INSERT
-          ? query.INSERT.entries
-          : query.UPSERT.entries
-      ),
+      cqn2sql.INSERT_entries_stream(entries),
       { ObjectMode: false },
     )
   }

test/scenarios/maps/clob.cds

@@ -0,0 +1,5 @@
+using {cuid} from '@sap/cds/common';
+
+entity Map : cuid {
+  map : cds.Map;
+}

test/scenarios/maps/clob.test.js

@@ -0,0 +1,51 @@
+const cds = require('../../cds.js')
+const { Readable } = require('stream')
+
+const { gen, rows } = require('./data.js')
+const { run } = require('./perf.js')
+
+describe('Map - CLOB', () => {
+  const { expect } = cds.test(__dirname, __dirname + '/clob.cds')
+
+  test('perf', async () => {
+    const { Map } = cds.entities
+
+    console.log('Starting Insert...')
+    const s = performance.now()
+    await INSERT(Readable.from(gen(), { objectMode: false })).into(Map)
+    const dur = performance.now() - s
+    console.log('Finished Insert:', dur, '(', (rows / dur), 'rows/ms)')
+
+    const [{ count: rowCount }] = await cds.ql`SELECT count() from ${Map}`
+    expect(rowCount).eq(rows)
+    console.log('Validated Insert.')
+
+    /* HANA
+Starting Insert...
+Finished Insert: 10261.39113 ( 3.19332920701172 rows/ms)
+Validated Insert.
+$top=30              avg: 3 ms cold: 30 ms
+ID='1'               avg: 3 ms cold: 34 ms
+    */
+
+    /* postgres
+Starting Insert...
+Finished Insert: 13024.595653 ( 2.51585545325182 rows/ms)
+Validated Insert.
+$top=30              avg: 6 ms cold: 9 ms
+ID='1'               avg: 0 ms cold: 4 ms
+    */
+
+    /* sqlite
+Starting Insert...
+Finished Insert: 2072.096841 ( 15.813932704123069 rows/ms)
+Validated Insert.
+$top=30              avg: 1 ms cold: 2 ms
+ID='1'               avg: 0 ms cold: 1 ms
+    */
+
+    await run('$top=30', cds.ql`SELECT ID, map FROM ${Map} LIMIT ${30}`)
+    await run(`ID='1'`, cds.ql`SELECT ID, map FROM ${Map} WHERE ID=${'1'} LIMIT ${1}`)
+  })
+
+})

test/scenarios/maps/comp.cds

@@ -0,0 +1,8 @@
+using {cuid} from '@sap/cds/common';
+
+entity Map : cuid {
+  map : Composition of many {
+          key ![key] : String(255);
+              value  : String(5000);
+        }
+}

test/scenarios/maps/comp.test.js

@@ -0,0 +1,38 @@
+const cds = require('../../cds.js')
+const { Readable } = require('stream')
+
+const { gen, rows, maps } = require('./data.js')
+const { run } = require('./perf.js')
+
+describe('Map - Composition', () => {
+  const { expect } = cds.test(__dirname, __dirname + '/comp.cds')
+
+  test('perf', async () => {
+    const { Map } = cds.entities
+    let s, dur
+
+    console.log('Starting Insert...')
+    s = performance.now()
+    await INSERT(Readable.from(gen(), { objectMode: false })).into(Map)
+    dur = performance.now() - s
+    console.log('Finished Insert:', dur, '(', (rows / dur), 'rows/ms)')
+
+    const [{ count: rowCount }] = await cds.ql`SELECT count() FROM ${Map}`
+    const [{ count: mapCount }] = await cds.ql`SELECT count() FROM ${Map}.map`
+    expect(rowCount).eq(rows)
+    expect(mapCount).eq(maps * rows)
+    console.log('Validated Insert.')
+
+    /*
+Starting Insert...
+Finished Insert: 28935.987634 ( 1.1324306747179196 rows/ms)
+Validated Insert.
+$top=30              avg: 18 ms cold: 165 ms
+ID='1'               avg: 4 ms cold: 83 ms
+    */
+
+    await run('$top=30', cds.ql`SELECT ID, map {*} FROM ${Map} LIMIT ${30}`)
+    await run(`ID='1'`, cds.ql`SELECT ID, map {*} FROM ${Map} WHERE ID=${'1'} LIMIT ${1}`)
+  })
+
+})

test/scenarios/maps/data.js

@@ -0,0 +1,21 @@
+const rows = 1 << 15
+const maps = 1e2
+const gen = function* () {
+  yield '['
+  let sep = ''
+  for (let ID = 0; ID < rows; ID++) {
+    let row = `${sep}{"ID":${ID},"map":[`
+    let rowSep = ''
+    for (let key = 0; key < maps; key++) {
+      if (rowSep) row += rowSep
+      else rowSep = ','
+      row += `{"up__ID":"${ID}","key":"${key}","value":"a value for \\"${key}\\""}`
+    }
+    row += ']}'
+    yield row
+    sep = ','
+  }
+  yield ']'
+}
+
+module.exports = { rows, maps, gen }

test/scenarios/maps/docs.cds

@@ -0,0 +1,8 @@
+using {cuid} from '@sap/cds/common';
+
+entity Map : cuid {
+  map : Composition of many {
+          key ![key] : String(255);
+              value  : String(5000);
+        }
+}