version

lib/algos/list/delimiterMaster.js

@@ -22,8 +22,6 @@ class DelimiterMaster extends Delimiter {
      */
     constructor(parameters) {
         super(parameters);
-        // non-PHD master version or a version whose master is a PHD version
-        this.prvKey = undefined;
         this.prvPHDKey = undefined;
     }
 
@@ -41,68 +39,31 @@ class DelimiterMaster extends Delimiter {
     filter(obj) {
         let key = obj.key;
         const value = obj.value;
-
-        /* Skip keys not starting with the prefix or not alphabetically
-         * ordered. */
         if ((this.prefix && !key.startsWith(this.prefix))
                 || (typeof this.NextMarker === 'string' &&
                     key <= this.NextMarker)) {
             return FILTER_SKIP;
         }
-
-        /* Skip version keys (<key><versionIdSeparator><version>) if we already
-         * have a master version. */
         const versionIdIndex = key.indexOf(VID_SEP);
         if (versionIdIndex >= 0) {
+            // generally we do not accept a specific version,
+            // we only do when the master version is a PHD version
             key = key.slice(0, versionIdIndex);
-            /* - key === this.prvKey is triggered when a master version has
-             *   been accepted for this key,
-             * - key === this.NextMarker is triggered when a listing page ends
-             *   on a accepted obj and the next page starts with a version of
-             *   this object. In that case prvKey is default set to undefined
-             *   in the constructor) and comparing to NextMarker is the only
-             *   way to know  we should not accept this version. This test is
-             *   not redundant with the one at the beginning of this function,
-             *   we are comparing here the key without the version suffix,
-             * - key startsWith the previous NextMarker happens because we set
-             *   NextMarker to the common prefix instead of the whole key
-             *   value. (TODO: remove this test once ZENKO-1048 is fixed. ).
-             *   */
-            if (key === this.prvKey || key === this.NextMarker ||
-                (this.delimiter && key.startsWith(this.NextMarker))) {
-                /* master version already filtered */
-                return FILTER_SKIP;
+            if (key !== this.prvPHDKey) {
+                return FILTER_ACCEPT; // trick repd to not increase its streak
             }
         }
         if (Version.isPHD(value)) {
-            /* master version is a PHD version, we want to wait for the next
-             * one:
-             * - Set the prvKey to undefined to not skip the next version,
-             * - return accept to avoid users to skip the next values in range
-             *   (skip scan mechanism in metadata backend like Metadata or
-             *   MongoClient). */
-            this.prvKey = undefined;
+            // master version is a PHD version: wait for the next version
             this.prvPHDKey = key;
-            return FILTER_ACCEPT;
+            return FILTER_ACCEPT; // trick repd to not increase its streak
         }
         if (Version.isDeleteMarker(value)) {
-            /* This entry is a deleteMarker which has not been filtered by the
-             * version test. Either :
-             * - it is a deleteMarker on the master version, we want to SKIP
-             *   all the following entries with this key (no master version),
-             * - or a deleteMarker following a PHD (setting prvKey to undefined
-             *   when an entry is a PHD avoids the skip on version for the
-             *   next entry). In that case we expect the master version to
-             *   follow. */
-            if (key === this.prvPHDKey) {
-                this.prvKey = undefined;
-                return FILTER_ACCEPT;
+            // version is a delete marker, ignore
+            return FILTER_ACCEPT; // trick repd to not increase its streak
         }
-            this.prvKey = key;
-            return FILTER_SKIP;
-        }
-
-        this.prvKey = key;
+        // non-PHD master version or a version whose master is a PHD version
+        this.prvPHDKey = undefined;
         if (this.delimiter) {
             // check if the key has the delimiter
             const baseIndex = this.prefix ? this.prefix.length : 0;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "arsenal",
-  "version": "8.0.2",
+  "version": "42.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=8"
   },
-  "version": "8.0.2",
+  "version": "42.0.2",
   "description": "Common utilities for the S3 project components",
   "main": "index.js",
   "repository": {

tests/unit/algos/list/delimiterMaster.js

@@ -1,400 +0,0 @@
-'use strict'; // eslint-disable-line strict
-
-const assert = require('assert');
-
-const DelimiterMaster =
-    require('../../../../lib/algos/list/delimiterMaster').DelimiterMaster;
-const {
-    FILTER_ACCEPT,
-    FILTER_SKIP,
-    SKIP_NONE,
-} = require('../../../../lib/algos/list/tools');
-const VSConst =
-    require('../../../../lib/versioning/constants').VersioningConstants;
-const Version = require('../../../../lib/versioning/Version').Version;
-const { generateVersionId } = require('../../../../lib/versioning/VersionID');
-
-
-const VID_SEP = VSConst.VersionId.Separator;
-const EmptyResult = {
-    CommonPrefixes: [],
-    Contents: [],
-    IsTruncated: false,
-    NextMarker: undefined,
-    Delimiter: undefined,
-};
-
-
-describe('Delimiter All masters listing algorithm', () => {
-    it('should return SKIP_NONE for DelimiterMaster when NextMarker is ' +
-       'undefined', () => {
-        const delimiter = new DelimiterMaster({ delimiter: '/' });
-
-        assert.strictEqual(delimiter.NextMarker, undefined);
-
-        /* When there is no NextMarker, it should return SKIP_NONE. */
-        assert.strictEqual(delimiter.skipping(), SKIP_NONE);
-    });
-
-    it('should return <key><VersionIdSeparator> for DelimiterMaster when ' +
-       'NextMarker is set and there is a delimiter', () => {
-        const key = 'key';
-        const delimiter = new DelimiterMaster({ delimiter: '/', marker: key });
-
-        /* Filter a master version to set NextMarker. */
-        // TODO: useless once S3C-1628 is fixed.
-        delimiter.filter({ key, value: '' });
-        assert.strictEqual(delimiter.NextMarker, key);
-
-        /* With a delimiter skipping should return previous key + VID_SEP
-         * (except when a delimiter is set and the NextMarker ends with the
-         * delimiter) . */
-        assert.strictEqual(delimiter.skipping(), key + VID_SEP);
-    });
-
-    it('should return NextMarker for DelimiterMaster when NextMarker is set' +
-       ', there is a delimiter and the key ends with the delimiter', () => {
-        const delimiterChar = '/';
-        const keyWithEndingDelimiter = `key${delimiterChar}`;
-        const delimiter = new DelimiterMaster({
-            delimiter: delimiterChar,
-            marker: keyWithEndingDelimiter,
-        });
-
-        /* When a delimiter is set and the NextMarker ends with the
-         * delimiter it should return the next marker value. */
-        assert.strictEqual(delimiter.NextMarker, keyWithEndingDelimiter);
-        assert.strictEqual(delimiter.skipping(), keyWithEndingDelimiter);
-    });
-
-    it('should skip entries not starting with prefix', () => {
-        const delimiter = new DelimiterMaster({ prefix: 'prefix' });
-
-        assert.strictEqual(delimiter.filter({ key: 'wrong' }), FILTER_SKIP);
-        assert.strictEqual(delimiter.NextMarker, undefined);
-        assert.strictEqual(delimiter.prvKey, undefined);
-        assert.deepStrictEqual(delimiter.result(), EmptyResult);
-    });
-
-    it('should skip entries superior to next marker', () => {
-        const delimiter = new DelimiterMaster({ marker: 'b' });
-
-        assert.strictEqual(delimiter.filter({ key: 'a' }), FILTER_SKIP);
-        assert.strictEqual(delimiter.NextMarker, 'b');
-        assert.strictEqual(delimiter.prvKey, undefined);
-        assert.deepStrictEqual(delimiter.result(), EmptyResult);
-    });
-
-    it('should accept a master version', () => {
-        const delimiter = new DelimiterMaster({});
-        const key = 'key';
-        const value = '';
-
-        assert.strictEqual(delimiter.filter({ key, value }), FILTER_ACCEPT);
-        assert.strictEqual(delimiter.prvKey, key);
-        assert.strictEqual(delimiter.NextMarker, key);
-        assert.deepStrictEqual(delimiter.result(), {
-            CommonPrefixes: [],
-            Contents: [{ key, value }],
-            IsTruncated: false,
-            NextMarker: undefined,
-            Delimiter: undefined,
-        });
-    });
-
-    it('should accept a PHD version as first input', () => {
-        const delimiter = new DelimiterMaster({});
-        const keyPHD = 'keyPHD';
-        const objPHD = {
-            key: keyPHD,
-            value: Version.generatePHDVersion(generateVersionId('', '')),
-        };
-
-        /* When filtered, it should return FILTER_ACCEPT and set the prvKey.
-         * to undefined. It should not be added to result the content or common
-         * prefixes. */
-        assert.strictEqual(delimiter.filter(objPHD), FILTER_ACCEPT);
-        assert.strictEqual(delimiter.prvKey, undefined);
-        assert.strictEqual(delimiter.NextMarker, undefined);
-        assert.deepStrictEqual(delimiter.result(), EmptyResult);
-    });
-
-    it('should accept a PHD version', () => {
-        const delimiter = new DelimiterMaster({});
-        const key = 'keyA';
-        const value = '';
-        const keyPHD = 'keyBPHD';
-        const objPHD = {
-            key: keyPHD,
-            value: Version.generatePHDVersion(generateVersionId('', '')),
-        };
-
-        /* Filter a master version to set the NextMarker, the prvKey and add
-         * and element in result content. */
-        delimiter.filter({ key, value });
-
-        /* When filtered, it should return FILTER_ACCEPT and set the prvKey.
-         * to undefined. It should not be added to the result content or common
-         * prefixes. */
-        assert.strictEqual(delimiter.filter(objPHD), FILTER_ACCEPT);
-        assert.strictEqual(delimiter.prvKey, undefined);
-        assert.strictEqual(delimiter.NextMarker, key);
-        assert.deepStrictEqual(delimiter.result(), {
-            CommonPrefixes: [],
-            Contents: [{ key, value }],
-            IsTruncated: false,
-            NextMarker: undefined,
-            Delimiter: undefined,
-        });
-    });
-
-    it('should accept a version after a PHD', () => {
-        const delimiter = new DelimiterMaster({});
-        const masterKey = 'key';
-        const keyVersion = `${masterKey}${VID_SEP}version`;
-        const value = '';
-        const objPHD = {
-            key: masterKey,
-            value: Version.generatePHDVersion(generateVersionId('', '')),
-        };
-
-        /* Filter the PHD object. */
-        delimiter.filter(objPHD);
-
-        /* The filtering of the PHD object has no impact, the version is
-         * accepted and added to the result. */
-        assert.strictEqual(delimiter.filter({
-            key: keyVersion,
-            value,
-        }), FILTER_ACCEPT);
-        assert.strictEqual(delimiter.prvKey, masterKey);
-        assert.strictEqual(delimiter.NextMarker, masterKey);
-        assert.deepStrictEqual(delimiter.result(), {
-            CommonPrefixes: [],
-            Contents: [{ key: masterKey, value }],
-            IsTruncated: false,
-            NextMarker: undefined,
-            Delimiter: undefined,
-        });
-    });
-
-    it('should accept a delete marker', () => {
-        const delimiter = new DelimiterMaster({});
-        const version = new Version({ isDeleteMarker: true });
-        const key = 'key';
-        const obj = {
-            key: `${key}${VID_SEP}version`,
-            value: version.toString(),
-        };
-
-        /* When filtered, it should return FILTER_SKIP and set the prvKey. It
-         * should not be added to the result content or common prefixes. */
-        assert.strictEqual(delimiter.filter(obj), FILTER_SKIP);
-        assert.strictEqual(delimiter.NextMarker, undefined);
-        assert.strictEqual(delimiter.prvKey, key);
-        assert.deepStrictEqual(delimiter.result(), EmptyResult);
-    });
-
-    it('should skip version after a delete marker', () => {
-        const delimiter = new DelimiterMaster({});
-        const version = new Version({ isDeleteMarker: true });
-        const key = 'key';
-        const versionKey = `${key}${VID_SEP}version`;
-
-        delimiter.filter({ key, value: version.toString() });
-        assert.strictEqual(delimiter.filter({
-            key: versionKey,
-            value: 'value',
-        }), FILTER_SKIP);
-        assert.strictEqual(delimiter.NextMarker, undefined);
-        assert.strictEqual(delimiter.prvKey, key);
-        assert.deepStrictEqual(delimiter.result(), EmptyResult);
-    });
-
-    it('should accept a new key after a delete marker', () => {
-        const delimiter = new DelimiterMaster({});
-        const version = new Version({ isDeleteMarker: true });
-        const key1 = 'key1';
-        const key2 = 'key2';
-        const value = 'value';
-
-        delimiter.filter({ key: key1, value: version.toString() });
-        assert.strictEqual(delimiter.filter({
-            key: key2,
-            value: 'value',
-        }), FILTER_ACCEPT);
-        assert.strictEqual(delimiter.NextMarker, key2);
-        assert.strictEqual(delimiter.prvKey, key2);
-        assert.deepStrictEqual(delimiter.result(), {
-            CommonPrefixes: [],
-            Contents: [{ key: key2, value }],
-            IsTruncated: false,
-            NextMarker: undefined,
-            Delimiter: undefined,
-        });
-    });
-
-    it('should accept the master version and skip the other ones', () => {
-        const delimiter = new DelimiterMaster({});
-        const masterKey = 'key';
-        const masterValue = 'value';
-        const versionKey = `${masterKey}${VID_SEP}version`;
-        const versionValue = 'versionvalue';
-
-        /* Filter the master version. */
-        delimiter.filter({ key: masterKey, value: masterValue });
-
-        /* Version is skipped, not added to the result. The delimiter
-         * NextMarker and prvKey value are unmodified and set to the
-         * masterKey. */
-        assert.strictEqual(delimiter.filter({
-            key: versionKey,
-            value: versionValue,
-        }), FILTER_SKIP);
-        assert.strictEqual(delimiter.NextMarker, masterKey);
-        assert.strictEqual(delimiter.prvKey, masterKey);
-        assert.deepStrictEqual(delimiter.result(), {
-            CommonPrefixes: [],
-            Contents: [{ key: masterKey, value: masterValue }],
-            IsTruncated: false,
-            NextMarker: undefined,
-            Delimiter: undefined,
-        });
-    });
-
-    it('should return good listing result for version', () => {
-        const delimiter = new DelimiterMaster({});
-        const masterKey = 'key';
-        const versionKey1 = `${masterKey}${VID_SEP}version1`;
-        const versionKey2 = `${masterKey}${VID_SEP}version2`;
-        const value2 = 'value2';
-
-        /* Filter the PHD version. */
-        assert.strictEqual(delimiter.filter({
-            key: masterKey,
-            value: '{ "isPHD": true, "value": "version" }',
-        }), FILTER_ACCEPT);
-
-        /* Filter a delete marker version. */
-        assert.strictEqual(delimiter.filter({
-            key: versionKey1,
-            value: '{ "isDeleteMarker": true }',
-        }), FILTER_ACCEPT);
-
-        /* Filter a last version with a specific value. */
-        assert.strictEqual(delimiter.filter({
-            key: versionKey2,
-            value: value2,
-        }), FILTER_ACCEPT);
-
-        assert.deepStrictEqual(delimiter.result(), {
-            CommonPrefixes: [],
-            Contents: [{ key: masterKey, value: value2 }],
-            IsTruncated: false,
-            NextMarker: undefined,
-            Delimiter: undefined,
-        });
-    });
-
-    it('should return good values for entries with different common prefixes',
-       () => {
-           const delimiterChar = '/';
-           const commonPrefix1 = `commonPrefix1${delimiterChar}`;
-           const commonPrefix2 = `commonPrefix2${delimiterChar}`;
-           const prefix1Key1 = `${commonPrefix1}key1`;
-           const prefix1Key2 = `${commonPrefix1}key2`;
-           const prefix2Key1 = `${commonPrefix2}key1`;
-           const value = 'value';
-
-           const delimiter = new DelimiterMaster({ delimiter: delimiterChar });
-
-           /* Filter the first entry with a common prefix. It should be
-            * accepted and added to the result. */
-           assert.strictEqual(delimiter.filter({ key: prefix1Key1, value }),
-                              FILTER_ACCEPT);
-           assert.deepStrictEqual(delimiter.result(), {
-               CommonPrefixes: [commonPrefix1],
-               Contents: [],
-               IsTruncated: false,
-               NextMarker: undefined,
-               Delimiter: delimiterChar,
-           });
-
-           /* Filter the second entry with the same common prefix than the
-            * first entry. It should be skipped and not added to the result. */
-           assert.strictEqual(delimiter.filter({ key: prefix1Key2, value }),
-                              FILTER_SKIP);
-           assert.deepStrictEqual(delimiter.result(), {
-               CommonPrefixes: [commonPrefix1],
-               Contents: [],
-               IsTruncated: false,
-               NextMarker: undefined,
-               Delimiter: delimiterChar,
-           });
-
-           /* Filter an entry with a new common prefix. It should be accepted
-            * and not added to the result. */
-           assert.strictEqual(delimiter.filter({ key: prefix2Key1, value }),
-                              FILTER_ACCEPT);
-           assert.deepStrictEqual(delimiter.result(), {
-               CommonPrefixes: [commonPrefix1, commonPrefix2],
-               Contents: [],
-               IsTruncated: false,
-               NextMarker: undefined,
-               Delimiter: delimiterChar,
-           });
-       });
-
-    /* We test here the internal management of the prvKey field of the
-     * DelimiterMaster class, in particular once it has been set to an entry
-     * key before to finally skip this entry because of an already present
-     * common prefix. */
-    it('should accept a version after skipping an object because of its ' +
-       'commonPrefix', () => {
-        const delimiterChar = '/';
-        const commonPrefix1 = `commonPrefix1${delimiterChar}`;
-        const commonPrefix2 = `commonPrefix2${delimiterChar}`;
-        const prefix1Key1 = `${commonPrefix1}key1`;
-        const prefix1Key2 = `${commonPrefix1}key2`;
-        const prefix2VersionKey1 = `${commonPrefix2}key1${VID_SEP}version`;
-        const value = 'value';
-
-        const delimiter = new DelimiterMaster({ delimiter: delimiterChar });
-
-        /* Filter the two first entries with the same common prefix to add
-         * it to the result and reach the state where an entry is skipped
-         * because of an already present common prefix in the result. */
-        delimiter.filter({ key: prefix1Key1, value });
-        delimiter.filter({ key: prefix1Key2, value });
-
-        /* Filter an object with a key containing a version part and a new
-         * common prefix. It should be accepted and the new common prefix
-         * added to the result. */
-        assert.strictEqual(delimiter.filter({
-            key: prefix2VersionKey1,
-            value,
-        }), FILTER_ACCEPT);
-        assert.deepStrictEqual(delimiter.result(), {
-            CommonPrefixes: [commonPrefix1, commonPrefix2],
-            Contents: [],
-            IsTruncated: false,
-            NextMarker: undefined,
-            Delimiter: delimiterChar,
-        });
-    });
-
-    it('should skip a versioned entry when there is a delimiter and the key ' +
-       'starts with the NextMarker value', () => {
-        const delimiterChar = '/';
-        const commonPrefix = `commonPrefix${delimiterChar}`;
-        const key = `${commonPrefix}key${VID_SEP}version`;
-        const value = 'value';
-
-        const delimiter = new DelimiterMaster({ delimiter: delimiterChar });
-        /* TODO: should be set to a whole key instead of just a common prefix
-         * once ZENKO-1048 is fixed. */
-        delimiter.NextMarker = commonPrefix;
-
-        assert.strictEqual(delimiter.filter({ key, value }), FILTER_SKIP);
-    });
-});