wip

Author: williamlardier

lib/algos/stream/MergeStream.js

@@ -4,6 +4,7 @@ class MergeStream extends stream.Readable {
     constructor(stream1, stream2, compare) {
         super({ objectMode: true });
 
+        console.log('MERGE STREAM');
         this._compare = compare;
         this._streams = [stream1, stream2];
 

lib/storage/metadata/mongoclient/MongoClientInterface.js

@@ -1668,6 +1668,7 @@ class MongoClientInterface {
         const getLatestVersion = this.getLatestVersion;
         let stream;
         if (!params.secondaryStreamParams) {
+            console.log('CHOICE A')
             // listing masters only (DelimiterMaster)
             stream = new MongoReadStream(c, params.mainStreamParams, params.mongifiedSearch, params.maxKeys);
             if (vFormat === BUCKET_VERSIONS.v1) {
@@ -1713,6 +1714,7 @@ class MongoClientInterface {
                 stream = stream.pipe(resolvePhdKey);
             }
         } else {
+            console.log('CHOICE B')
             // listing both master and version keys (delimiterVersion Algo)
             const masterStream = new MongoReadStream(c, params.mainStreamParams, params.mongifiedSearch, params.maxKeys);
             const versionStream = new MongoReadStream(c, params.secondaryStreamParams, params.mongifiedSearch, params.maxKeys);
@@ -1763,10 +1765,12 @@ class MongoClientInterface {
                 log.error(
                     'internalListObjectV1: error listing objects', logObj);
                 cbOnce(err);
+                delete stream;
             })
             .on('end', () => {
                 const data = extension.result();
                 cbOnce(null, data);
+                delete stream;
             });
         return undefined;
     }

lib/storage/metadata/mongoclient/readStream.js

@@ -1,15 +1,15 @@
 const Readable = require('stream').Readable;
 const MongoUtils = require('./utils');
 
-let numberOfReadStreamOpen = 0;
-let numberOfReadStreamClosed = 0;
-
 setInterval(() => {
-    console.log("numberOfReadStreamOpen", numberOfReadStreamOpen);
-    console.log("numberOfReadStreamClosed", numberOfReadStreamClosed);
+    console.log("numberOfReadStreamOpen", MongoReadStream.numberOfReadStreamOpen);
+    console.log("numberOfReadStreamClosed", MongoReadStream.numberOfReadStreamClosed);
 }, 1000);
 
 class MongoReadStream extends Readable {
+    static numberOfReadStreamOpen = 0;
+    static numberOfReadStreamClosed = 0;
+    
     constructor(c, options, searchOptions, batchSize) {
         super({
             objectMode: true,