harperdb 3.2.1 → 3.3.0

package/node_modules/lmdb-store/benchmark/index.js

@@ -1,162 +1,162 @@
-'use strict';
-const { Worker, isMainThread, parentPort, threadId } = require('worker_threads');
-const { isMaster, fork } = require('cluster');
-
-var crypto = require('crypto');
-var path = require('path');
-var testDirPath = path.resolve(__dirname, './benchdata');
-
-var fs =require('fs');
-var rimraf = require('rimraf');
-var mkdirp = require('mkdirp');
-var benchmark = require('benchmark');
-var suite = new benchmark.Suite();
-
-const { open } = require('..');
-var env;
-var dbi;
-var keys = [];
-var total = isMainThread ? 100 : 100000;
-var store
-let data = {
-  name: 'test',
-  greeting: 'Hello, World!',
-  flag: true,
-  littleNum: 3,
-  biggerNum: 32254435,
-  decimal:1.332232,
-  bigDecimal: 3.5522E102,
-  negative: -54,
-  aNull: null,
-  more: 'string',
-}
-
-var c = (threadId || 0) * 10000;
-let result
-
-function setData(deferred) {
-  result = store.put((c += 357) % total, data)
-  /*let key = (c += 357) % total
-  if (key % 2 == 0)
-    result = store.put(key, data)
-  else
-    result = store.transactionAsync(() => store.put(key, data))*/
-  if (c % 1000 == 0) {
-      setImmediate(() => deferred.resolve())
-  } else
-    deferred.resolve()
-}
-
-function getData() {
-  result = store.get((c += 357) % total)
-}
-function getBinaryFast() {
-  result = store.getBinaryFast((c += 357) % total)
-}
-let jsonBuffer = JSON.stringify(data)
-function plainJSON() {
-  result = JSON.parse(jsonBuffer)
-}
-
-if (isMainThread && isMaster) {
-var inspector = require('inspector')
-//inspector.open(9330, null, true); debugger
-
-function cleanup(done) {
-  // cleanup previous test directory
-  rimraf(testDirPath, function(err) {
-    if (err) {
-      return done(err);
-    }
-    // setup clean directory
-    mkdirp(testDirPath).then(() => {
-      done();
-    }, error => done(error));
-  });
-}
-function setup() {
-  console.log('opening', testDirPath)
-  let rootStore = open(testDirPath, {
-    noMemInit: true,
-    //winMemoryPriority: 4,
-  })
-  store = rootStore.openDB('testing', {
-    create: true,
-    sharedStructuresKey: 100000000,
-    keyIsUint32: true,    
-  })
-  let lastPromise
-  for (let i = 0; i < total; i++) {
-    lastPromise = store.put(i, data)
-  }
-  return lastPromise.then(() => {
-    console.log('setup completed');
-  })
-}
-
-var txn;
-
-cleanup(async function (err) {
-    if (err) {
-        throw err;
-    }
-    await setup();
-    /*suite.add('put', {
-      defer: true,
-      fn: setData
-    });*/
-    suite.add('get', getData);
-    suite.add('getBinaryFast', getBinaryFast);
-    //suite.add('plainJSON', plainJSON);
-    suite.on('cycle', function (event) {
-      console.log({result})
-      if (result && result.then) {
-        let start = Date.now()
-        result.then(() => {
-          console.log('last commit took ' + (Date.now() - start) + 'ms')
-        })
-      }
-      console.log(String(event.target));
-    });
-    suite.on('complete', function () {
-        console.log('Fastest is ' + this.filter('fastest').map('name'));
-        var numCPUs = require('os').cpus().length;
-        console.log('Now will run benchmark across ' + numCPUs + ' threads');
-        for (var i = 0; i < numCPUs; i++) {
-          var worker = new Worker(__filename);
-          //var worker = fork();
-        }
-    });
-
-    suite.run({ async: true });
-
-});
-} else {
-  let rootStore = open(testDirPath, {
-    noMemInit: true,
-    //winMemoryPriority: 4,
-  })
-  store = rootStore.openDB('testing', {
-    sharedStructuresKey: 100000000,
-    keyIsUint32: true,    
-  })
-
-  // other threads
-    /*suite.add('put', {
-      defer: true,
-      fn: setData
-    });*/
-//    suite.add('get', getData);
-    suite.add('getBinaryFast', getBinaryFast);
-    suite.on('cycle', function (event) {
-      if (result && result.then) {
-        let start = Date.now()
-        result.then(() => {
-          console.log('last commit took ' + (Date.now() - start) + 'ms')
-        })
-      }
-      console.log(String(event.target));
-    });
-    suite.run({ async: true });
-
-}
+'use strict';
+const { Worker, isMainThread, parentPort, threadId } = require('worker_threads');
+const { isMaster, fork } = require('cluster');
+
+var crypto = require('crypto');
+var path = require('path');
+var testDirPath = path.resolve(__dirname, './benchdata');
+
+var fs =require('fs');
+var rimraf = require('rimraf');
+var mkdirp = require('mkdirp');
+var benchmark = require('benchmark');
+var suite = new benchmark.Suite();
+
+const { open } = require('..');
+var env;
+var dbi;
+var keys = [];
+var total = isMainThread ? 100 : 100000;
+var store
+let data = {
+  name: 'test',
+  greeting: 'Hello, World!',
+  flag: true,
+  littleNum: 3,
+  biggerNum: 32254435,
+  decimal:1.332232,
+  bigDecimal: 3.5522E102,
+  negative: -54,
+  aNull: null,
+  more: 'string',
+}
+
+var c = (threadId || 0) * 10000;
+let result
+
+function setData(deferred) {
+  result = store.put((c += 357) % total, data)
+  /*let key = (c += 357) % total
+  if (key % 2 == 0)
+    result = store.put(key, data)
+  else
+    result = store.transactionAsync(() => store.put(key, data))*/
+  if (c % 1000 == 0) {
+      setImmediate(() => deferred.resolve())
+  } else
+    deferred.resolve()
+}
+
+function getData() {
+  result = store.get((c += 357) % total)
+}
+function getBinaryFast() {
+  result = store.getBinaryFast((c += 357) % total)
+}
+let jsonBuffer = JSON.stringify(data)
+function plainJSON() {
+  result = JSON.parse(jsonBuffer)
+}
+
+if (isMainThread && isMaster) {
+var inspector = require('inspector')
+//inspector.open(9330, null, true); debugger
+
+function cleanup(done) {
+  // cleanup previous test directory
+  rimraf(testDirPath, function(err) {
+    if (err) {
+      return done(err);
+    }
+    // setup clean directory
+    mkdirp(testDirPath).then(() => {
+      done();
+    }, error => done(error));
+  });
+}
+function setup() {
+  console.log('opening', testDirPath)
+  let rootStore = open(testDirPath, {
+    noMemInit: true,
+    //winMemoryPriority: 4,
+  })
+  store = rootStore.openDB('testing', {
+    create: true,
+    sharedStructuresKey: 100000000,
+    keyIsUint32: true,    
+  })
+  let lastPromise
+  for (let i = 0; i < total; i++) {
+    lastPromise = store.put(i, data)
+  }
+  return lastPromise.then(() => {
+    console.log('setup completed');
+  })
+}
+
+var txn;
+
+cleanup(async function (err) {
+    if (err) {
+        throw err;
+    }
+    await setup();
+    /*suite.add('put', {
+      defer: true,
+      fn: setData
+    });*/
+    suite.add('get', getData);
+    suite.add('getBinaryFast', getBinaryFast);
+    //suite.add('plainJSON', plainJSON);
+    suite.on('cycle', function (event) {
+      console.log({result})
+      if (result && result.then) {
+        let start = Date.now()
+        result.then(() => {
+          console.log('last commit took ' + (Date.now() - start) + 'ms')
+        })
+      }
+      console.log(String(event.target));
+    });
+    suite.on('complete', function () {
+        console.log('Fastest is ' + this.filter('fastest').map('name'));
+        var numCPUs = require('os').cpus().length;
+        console.log('Now will run benchmark across ' + numCPUs + ' threads');
+        for (var i = 0; i < numCPUs; i++) {
+          var worker = new Worker(__filename);
+          //var worker = fork();
+        }
+    });
+
+    suite.run({ async: true });
+
+});
+} else {
+  let rootStore = open(testDirPath, {
+    noMemInit: true,
+    //winMemoryPriority: 4,
+  })
+  store = rootStore.openDB('testing', {
+    sharedStructuresKey: 100000000,
+    keyIsUint32: true,    
+  })
+
+  // other threads
+    /*suite.add('put', {
+      defer: true,
+      fn: setData
+    });*/
+//    suite.add('get', getData);
+    suite.add('getBinaryFast', getBinaryFast);
+    suite.on('cycle', function (event) {
+      if (result && result.then) {
+        let start = Date.now()
+        result.then(() => {
+          console.log('last commit took ' + (Date.now() - start) + 'ms')
+        })
+      }
+      console.log(String(event.target));
+    });
+    suite.run({ async: true });
+
+}

package/node_modules/lmdb-store/binding.gyp

@@ -1,88 +1,79 @@
-{
-  "variables": {
-      "os_linux_compiler%": "gcc",
-      "use_robust%": "false",
-      "build_v8_with_gn": "false"
-  },
-  "targets": [
-    {
-      "target_name": "lmdb-store",
-      "win_delay_load_hook": "false",
-      "sources": [
-        "dependencies/lmdb/libraries/liblmdb/mdb.c",
-        "dependencies/lmdb/libraries/liblmdb/midl.c",
-        "dependencies/lmdb/libraries/liblmdb/chacha8.c",
-        "dependencies/lz4/lib/lz4.h",
-        "dependencies/lz4/lib/lz4.c",
-        "src/node-lmdb.cpp",
-        "src/env.cpp",
-        "src/compression.cpp",
-        "src/ordered-binary.cpp",
-        "src/misc.cpp",
-        "src/txn.cpp",
-        "src/dbi.cpp",
-        "src/cursor.cpp",
-        "src/windows.c"
-      ],
-      "include_dirs": [
-        "<!(node -e \"require('nan')\")",
-        "dependencies/lmdb/libraries/liblmdb",
-        "dependencies/lz4/lib"
-      ],
-      "conditions": [
-        ["OS=='linux'", {
-          "variables": {
-            "gcc_version" : "<!(<(os_linux_compiler) -dumpversion | cut -d '.' -f 1)",
-          },
-          "conditions": [
-            ["gcc_version>=7", {
-              "cflags": [
-                "-Wimplicit-fallthrough=2",
-              ],
-            }],
-            ["node_module_version >= 93", {
-              "cflags_cc": [
-                "-fPIC",
-                "-fvisibility=hidden",
-                "-fvisibility-inlines-hidden",
-                "-std=c++14"
-              ]
-            }, {
-             "cflags_cc": [
-              "-fPIC",
-              "-fvisibility=hidden",
-              "-fvisibility-inlines-hidden",
-              "-std=c++11"
-              ],
-            }],
-          ],
-          "ldflags": [
-            "-fPIC",
-            "-fvisibility=hidden"
-          ],
-          "cflags": [
-            "-fPIC",
-            "-fvisibility=hidden",
-            "-O3"
-          ],
-        }],
-        ["OS=='mac'", {
-          "xcode_settings": {
-            "OTHER_CPLUSPLUSFLAGS" : ["-std=c++14"],
-            "MACOSX_DEPLOYMENT_TARGET": "10.7",
-            "OTHER_LDFLAGS": ["-std=c++14"],
-            "CLANG_CXX_LIBRARY": "libc++"
-          }
-        }],
-        ["OS=='win'", {
-            "libraries": ["ntdll.lib"]
-        }],
-        ["use_robust=='true'", {
-          "defines": ["MDB_MAXKEYSIZE=1978", "MDB_USE_ROBUST"],
-        }, {
-          "defines": ["MDB_MAXKEYSIZE=1978"],
-        }],
-      ],
-    }
-  ]
-}
+{
+  "variables": {
+      "os_linux_compiler%": "gcc",
+      "use_robust%": "false",
+      "openssl_fips": "X",
+      "build_v8_with_gn": "false"
+  },
+  "targets": [
+    {
+      "target_name": "lmdb-store",
+      "win_delay_load_hook": "false",
+      "sources": [
+        "dependencies/lmdb/libraries/liblmdb/mdb.c",
+        "dependencies/lmdb/libraries/liblmdb/midl.c",
+        "dependencies/lmdb/libraries/liblmdb/chacha8.c",
+        "dependencies/lz4/lib/lz4.h",
+        "dependencies/lz4/lib/lz4.c",
+        "src/node-lmdb.cpp",
+        "src/env.cpp",
+        "src/compression.cpp",
+        "src/ordered-binary.cpp",
+        "src/misc.cpp",
+        "src/txn.cpp",
+        "src/dbi.cpp",
+        "src/cursor.cpp",
+        "src/windows.c"
+      ],
+      "include_dirs": [
+        "<!(node -e \"require('nan')\")",
+        "dependencies/lmdb/libraries/liblmdb",
+        "dependencies/lz4/lib"
+      ],
+      "conditions": [
+        ["OS=='linux'", {
+          "variables": {
+            "gcc_version" : "<!(<(os_linux_compiler) -dumpversion | cut -d '.' -f 1)",
+          },
+          "conditions": [
+            ["gcc_version>=7", {
+              "cflags": [
+                "-Wimplicit-fallthrough=2",
+              ],
+            }],
+            ["node_module_version >= 93", {
+              "cflags_cc": [
+                "-fPIC",
+                "-fvisibility=hidden",
+                "-fvisibility-inlines-hidden"
+              ]
+            }, {
+             "cflags_cc": [
+              "-fPIC",
+              "-fvisibility=hidden",
+              "-fvisibility-inlines-hidden"
+              ],
+            }],
+          ],
+          "ldflags": [
+            "-fPIC",
+            "-fvisibility=hidden"
+          ],
+          "cflags": [
+            "-fPIC",
+            "-fvisibility=hidden",
+            "-O3"
+          ],
+        }],
+        ["OS=='win'", {
+            "libraries": ["ntdll.lib"]
+        }],
+        ["use_robust=='true'", {
+          "defines": ["MDB_MAXKEYSIZE=1978", "MDB_USE_ROBUST"],
+        }, {
+          "defines": ["MDB_MAXKEYSIZE=1978"],
+        }],
+      ],
+    }
+  ]
+}