@live-change/db 0.6.2 → 0.6.4

package/lib/Database.js

@@ -4,6 +4,7 @@ const Log = require('./Log.js')
 const queryGet = require('./queryGet.js')
 const queryObservable = require('./queryObservable.js')
 const getRandomValues = require('get-random-values')
+const nextTick = require('next-tick')
 
 const ReactiveDao = require("@live-change/dao")
 
@@ -60,9 +61,9 @@ class Database {
   }
 
   generateUid() {
-    const array = new Uint8Array(16)
+    const array = new Uint8Array(8)
     getRandomValues(array)
-    return array.map (b => b.toString (16).padStart (2, "0")).join ("")
+    return [...array].map (b => b.toString(16).padStart (2, "0")).join ("")
   }
 
   store(name, config) {
@@ -280,7 +281,7 @@ class Database {
     const config = this.config.indexes[name]
     console.error("INDEX", name, "unhandledRejection", reason, "CODE:\n", config?.code)
     console.error("DELETING INDEX", name)
-    process.nextTick(() => {
+    nextTick(() => {
       if(!config) {
         console.error("INDEX", name, "IS ALREADY DELETED")
         console.trace("ALREADY DELETED")

package/lib/Index.js

@@ -3,6 +3,7 @@ const ReactiveDao = require("@live-change/dao")
 const Table = require('./Table.js')
 const queryGet = require('./queryGet.js')
 const profileLog = require('./profileLog.js')
+const nextTick = require('next-tick')
 const queryObservable = require('./queryObservable.js')
 const { ChangeStream } = require('./ChangeStream.js')
 
@@ -183,12 +184,11 @@ class TableReader extends ChangeStream {
       //console.log("READ OP LOG", this.prefix, "RANGE", JSON.stringify(this.opLogObservableRange))
       this.opLogObservable = this.opLog.rangeObservable(this.opLogObservableRange)
       /// NEXT TICK BECAUSE IT CAN FINISH BEFORE EVENT START xD
-      process.nextTick(() => this.opLogObservable.observe(this))
+      nextTick(() => this.opLogObservable.observe(this))
     })
     return this.opLogPromise
   }
   set(value) {
-    //if(this.prefix == 'table_triggers') console.log("TABLE", this.prefix, "READER SET", value)
     if(!value) return
     this.opLogBuffer = value.slice()
     //console.log("PROMISE", this.opLogPromise)
@@ -209,7 +209,6 @@ class TableReader extends ChangeStream {
     this.opLogReader.handleSignal()
   }
   push(object) {
-    //if(this.prefix == 'table_triggers') console.log("TABLE", this.prefix, " READER PUSH", object)
     if(this.disposed) return
     this.opLogBuffer.push(object)
     this.opLogReader.handleSignal()
@@ -240,7 +239,6 @@ class TableReader extends ChangeStream {
     }
   }
   async readTo(endKey) {
-    //if(this.prefix == 'table_triggers') console.log("RT", endKey, "IN", this.opLogBuffer)
     let lastKey = null
     while(this.opLogBuffer[0] && this.opLogBuffer[0].id <= endKey) {
       const next = this.opLogBuffer.shift()
@@ -249,7 +247,6 @@ class TableReader extends ChangeStream {
         await this.change(next, null, next.id, next.id)
       } else {
         const op = next.operation
-        //if(this.prefix == 'table_triggers') console.log("HANDLE OP LOG OPERATION", next)
         if(op) {
           if(op.type == 'put') {
             await this.change(op.object, op.oldObject, op.object.id, next.id)
@@ -267,7 +264,6 @@ class TableReader extends ChangeStream {
         await this.readOpLog(this.opLogObservable.list[this.opLogObservable.list.length - 1].id)
         //console.log("READ TO RESULT, OP LOG PROMISE:", this.opLogPromise)
       }
-      //console.log("RT", endKey, "IN", this.opLogBuffer)
     }
     return lastKey
   }
@@ -326,7 +322,6 @@ class OpLogReader {
   }
   async readMore() {
     this.readingMore = true
-    //if(this.indexName == 'triggers_new') console.log("READING TRIGGERS STARTED!")
     do {
       while(true) {
         this.gotSignals = false
@@ -336,9 +331,9 @@ class OpLogReader {
         let possibleNextKeys = await Promise.all(
             this.tableReaders.map(async tr => ({ reader: tr, key: await tr.nextKey() }))
         )
-        //if(this.indexName == 'triggers_new') console.log("GOT NEXT KEYS")
+        //console.log("GOT NEXT KEYS")
         if(this.disposed) return
-        //if(this.indexName == 'triggers_new') console.log("POSSIBLE NEXT KEYS", possibleNextKeys.map(({key, reader}) => [reader.prefix, key]))
+        //console.log("POSSIBLE NEXT KEYS", possibleNextKeys.map(({key, reader}) => [reader.prefix, key]))
         if(possibleNextKeys.length == 0) { /// It could happen when oplog is cleared
           return
         }
@@ -348,9 +343,10 @@ class OpLogReader {
             next = possibleKey
           }
         }
-        //if(this.indexName == 'triggers_new') console.log("NEXT KEY", next && next.reader && next.reader.prefix, next && next.key)
+        //console.log("NEXT", next)
+        //console.log("NEXT KEY", next && next.reader && next.reader.prefix, next && next.key)
         const lastKey = '\xFF\xFF\xFF\xFF'
-        //if(this.indexName == 'triggers_new') console.log("NEXT", !!next, "KEY", next && next.key, lastKey)
+        //console.log("NEXT", !!next, "KEY", next && next.key, lastKey)
         if(!next || next.key == lastKey) break // nothing to read
         let otherReaderNext = null
         for(const possibleKey of possibleNextKeys) {
@@ -358,13 +354,12 @@ class OpLogReader {
               && (!otherReaderNext || possibleKey.key < otherReaderNext.key))
             otherReaderNext = possibleKey
         }
-        //if(this.indexName == 'triggers_new')
-        //  console.log("OTHER READ NEXT", otherReaderNext && otherReaderNext.reader && otherReaderNext.reader.prefix,
-        //    otherReaderNext && otherReaderNext.key)
+        /*console.log("OTHER READ NEXT", otherReaderNext && otherReaderNext.reader && otherReaderNext.reader.prefix,
+            otherReaderNext && otherReaderNext.key)*/
         let readEnd = (otherReaderNext && otherReaderNext.key) // Read to next other reader key
             || (((''+(now - 1))).padStart(16, '0'))+':' // or to current timestamp
         if(readEnd < next) {
-          readEnd = next+'\xff'
+          readEnd = next.key+'\xff'
         }
 
         if((next.key||'') < this.currentKey) {
@@ -372,24 +367,23 @@ class OpLogReader {
           console.error("time travel", next.key, this.currentKey)
           //process.exit(1) /// TODO: do something about it!
         }
-        //if(this.indexName == 'triggers_new') console.log("CKN", this.currentKey, '=>', next.key)
+        //console.log("CKN", this.currentKey, '=>', next.key)
         this.currentKey = next.key
-        //if(this.indexName == 'triggers_new') console.log("READ TO", readEnd)
+        //console.log("READ TO", readEnd)
         const readKey = await next.reader.readTo(readEnd)
-        //if(this.indexName == 'triggers_new') console.log("READED")
+        //console.log("READED")
         if(readKey) {
           if((readKey||'') < this.currentKey) {
             //debugger
             console.error("time travel", readKey, this.currentKey)
             //process.exit(1) /// TODO: do something about it!
           }
-          //if(this.indexName == 'triggers_new') console.log("CKR", this.currentKey, '=>', readKey)
+          //console.log("CKR", this.currentKey, '=>', readKey)
           this.currentKey = readKey
         }
       }
     } while(this.gotSignals)
     this.readingMore = false
-    //if(this.indexName == 'triggers_new') console.log("READING TRIGGERS FINISHED!")
   }
   dispose() {
     this.disposed = true
@@ -466,7 +460,8 @@ class Index extends Table {
     this.scriptContext = this.database.createScriptContext({
       /// TODO: script available routines
     })
-    const queryFunction = this.scriptContext.run(this.code,`userCode:${this.database.name}/indexes/${this.name}`)
+    const queryFunction = this.scriptContext.getOrCreateFunction(this.code,
+      `userCode:${this.database.name}/indexes/${this.name}`)
     this.codeFunction = (input, output) => queryFunction(input, output, this.params)
     this.writer = new IndexWriter(this)
     this.reader = null

package/lib/ScriptContext.js

@@ -86,6 +86,21 @@ class ScriptContext {
       }
     }
   }
+
+  getOrCreateFunction(code, filename) {
+    const cleanCode = code.replace(/\n +/g, "\n")
+    //console.log("COMPILED FUNCTIONS", `\n[\n  ${Object.keys(globalThis.compiledFunctions).join(',\n  ')},\n]`)
+    if(!(globalThis.compiledFunctions = globalThis.compiledFunctions || {})[cleanCode]) {
+      console.log("############# compiled function not found: ", code)
+      for(const key of Object.keys(globalThis.compiledFunctions)) {
+        console.log(`compiled func |${cleanCode}| == |${key}| => ${cleanCode == key}`)
+      }
+    }
+    const queryFunction = (globalThis.compiledFunctions = globalThis.compiledFunctions || {})[cleanCode]
+      ?? this.run(code, filename)
+    ;(globalThis.compiledFunctions = globalThis.compiledFunctions || {})[cleanCode] = queryFunction
+    return queryFunction
+  }
 }
 
 module.exports = ScriptContext

package/lib/WebScriptContext.js

@@ -42,6 +42,21 @@ class WebScriptContext {
       }
     }
   }
+
+  getOrCreateFunction(code, filename) {
+    const cleanCode = code.replace(/\n +/g, "\n")
+    //console.log("COMPILED FUNCTIONS", `\n[\n  ${Object.keys(globalThis.compiledFunctions).join(',\n  ')},\n]`)
+    if(!(globalThis.compiledFunctions = globalThis.compiledFunctions || {})[cleanCode]) {
+      console.log("############# compiled function not found: ", code)
+      for(const key of Object.keys(globalThis.compiledFunctions)) {
+        console.log(`compiled func |${cleanCode}| == |${key}| => ${cleanCode == key}`)
+      }
+    }
+    const queryFunction = (globalThis.compiledFunctions = globalThis.compiledFunctions || {})[cleanCode]
+      ?? this.run(code, filename)
+    ;(globalThis.compiledFunctions = globalThis.compiledFunctions || {})[cleanCode] = queryFunction
+    return queryFunction
+  }
 }
 
 module.exports = WebScriptContext

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -21,18 +21,19 @@
   },
   "homepage": "https://github.com/live-change/live-change-db",
   "devDependencies": {
-    "@live-change/db-store-level": "^0.6.2",
-    "@live-change/db-store-lmdb": "^0.6.2",
+    "@live-change/db-store-level": "^0.6.4",
+    "@live-change/db-store-lmdb": "^0.6.4",
     "minimist": ">=1.2.3",
+    "next-tick": "^1.1.0",
     "rimraf": "^3.0.2",
     "sockjs": "^0.3.24",
     "tape": "^5.3.2",
     "websocket-extensions": ">=0.1.4"
   },
   "dependencies": {
-    "@live-change/dao": "0.5.14",
+    "@live-change/dao": "0.5.15",
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
   },
-  "gitHead": "9a1b104864c08f3e35b009f191889e3308e3eeb0"
+  "gitHead": "2b63a796522f2a5bf7c4e0311331640b4152ba77"
 }