Fixes #1400

bench

@@ -5,6 +5,8 @@ nodepath=${2:-node}
 shift 2;
 cwd=${PWD}
 
+export NODE_ENV=production
+
 trap 'cd "$cwd"' EXIT
 
 if [ "$benchmark" = "doxbee" ]; then

benchmark/analysis/promises-bluebird.js

@@ -10,7 +10,7 @@ module.exports = function upload(stream, idOrPath, tag, done) {
     var fileP = self.byUuidOrPath(idOrPath).get();
     var version, fileId, file;
 
-    bluebird.all([blobIdP, fileP]).spread(function(blobId, fileV) {
+    bluebird.join(blobIdP, fileP, function(blobId, fileV) {
         file = fileV;
         var previousId = file ? file.version : null;
         version = {

benchmark/doxbee-sequential/promises-native-async-await.js

@@ -0,0 +1,51 @@
+global.useNative = true;
+
+try {
+    if (Promise.race.toString() !== 'function race() { [native code] }')
+        throw 0;
+} catch (e) {
+    throw new Error("No ES6 promises available");
+}
+
+require('../lib/fakesP');
+
+module.exports = async function upload(stream, idOrPath, tag, done) {
+    try {
+        var blob = blobManager.create(account);
+        var tx = db.begin();
+        var blobId = await blob.put(stream);
+        var file = await self.byUuidOrPath(idOrPath).get();
+
+        var previousId = file ? file.version : null;
+        version = {
+            userAccountId: userAccount.id,
+            date: new Date(),
+            blobId: blobId,
+            creatorId: userAccount.id,
+            previousId: previousId,
+        };
+        version.id = Version.createHash(version);
+        await Version.insert(version).execWithin(tx);
+        if (!file) {
+            var splitPath = idOrPath.split('/');
+            var fileName = splitPath[splitPath.length - 1];
+            file = {
+                id: uuid.v1(),
+                userAccountId: userAccount.id,
+                name: fileName,
+                version: version.id
+            }
+            var query = await self.createQuery(idOrPath, file);
+            await query.execWithin(tx);
+        }
+        await FileVersion.insert({fileId: file.id, versionId: version.id})
+            .execWithin(tx);
+        await File.whereUpdate({id: file.id}, {version: version.id})
+            .execWithin(tx);
+        tx.commit();
+        done();
+    } catch (err) {
+        tx.rollback();
+        done(err);
+    }
+};

benchmark/madeup-parallel/promises-native-async-await.js

@@ -0,0 +1,29 @@
+global.useNative = true;
+
+try {
+    if (Promise.race.toString() !== 'function race() { [native code] }')
+        throw 0;
+} catch (e) {
+    throw new Error("No ES6 promises available");
+}
+
+require('../lib/fakesP');
+
+module.exports = async function upload(stream, idOrPath, tag, done) {
+    var queries = new Array(global.parallelQueries);
+    var tx = db.begin();
+
+    for( var i = 0, len = queries.length; i < len; ++i ) {
+        queries[i] = FileVersion.insert({index: i}).execWithin(tx);
+    }
+
+    try {
+        await Promise.all(queries);
+        tx.commit();
+        done();
+    }
+    catch(e) {
+        tx.rollback();
+        done(e);
+    }
+};