datafolder 1.0.9 → 1.0.10

package/src/QySnapshotCompactor_Worker.js

@@ -29,6 +29,13 @@ import {
 } from "./QyUtils.js";
 
 export default class extends a {
+    kvFolder;
+    snapshotFolder;
+    qySnapshots;
+    qyKVDataCleaner;
+    pMInfoMap = {};
+    vLInfoMap = {};
+    combinedSnapshotNumVersionList = [];
     constructor({
         kvFolder: a,
         options: s
@@ -42,10 +49,7 @@ export default class extends a {
             kvFolder: a,
             snapshotFolder: o,
             qySnapshots: new n(o, s),
-            qyKVDataCleaner: new p(this, a, s),
-            pMInfoMap: {},
-            vLInfoMap: {},
-            combinedSnapshotNumList: []
+            qyKVDataCleaner: new p(this, a, s)
         });
     }
     _op_start() {
@@ -89,30 +93,37 @@ export default class extends a {
                 });
             })(this, a, s)));
         }
-        0 < s.length && e.push((async (a, s, o) => {
-            var t, {
-                qySnapshots: e,
-                vLInfoMap: p,
-                combinedSnapshotNumList: n
-            } = a, i = e.getMaxCombinedSnapshot(s), {
-                snapshotNum: r,
-                info: f,
-                keyValueMap: h
-            } = (await m(a, i), i);
-            Object.assign(i, {
+        0 < s.length && e.push((async (t, a, s) => {
+            let {
+                qySnapshots: o,
+                vLInfoMap: e,
+                combinedSnapshotNumVersionList: p
+            } = t, n = o.getMaxCombinedSnapshot(a), {
+                snapshotNum: i,
+                info: r,
+                keyValueMap: f
+            } = (await m(t, n), n);
+            Object.assign(n, {
                 posMap: void 0,
                 prefixPM: void 0
             });
-            for (t of s) t != i && (n.push(t.snapshotNum), await m(a, t), Object.assign(h, t.keyValueMap), 
-            Object.assign(t, {
-                keyValueMap: void 0,
-                posMap: void 0,
-                prefixPM: void 0
-            }));
-            await e.saveKeyValueMap(i), p[r] = f, o.combineUpdate = {
-                snapshotNum: r,
-                combinedSnapshotNumList: n,
-                posMap: i.posMap
+            for (var h of a) if (h != n) {
+                await m(t, h);
+                let {
+                    snapshotNum: a,
+                    info: s,
+                    keyValueMap: o
+                } = h;
+                p.push([ a, s.verList[0] ]), Object.assign(f, o), Object.assign(h, {
+                    keyValueMap: void 0,
+                    posMap: void 0,
+                    prefixPM: void 0
+                });
+            }
+            await o.saveKeyValueMap(n), e[i] = r, s.combinationUpdate = {
+                snapshotNum: i,
+                combinedSnapshotNumVersionList: p,
+                posMap: n.posMap
             };
         })(this, s, t)), await Promise.all(e), this.castParent("onCompactUpdates", t);
     }
@@ -121,7 +132,7 @@ export default class extends a {
             qySnapshots: o,
             pMInfoMap: t,
             vLInfoMap: e,
-            combinedSnapshotNumList: p,
+            combinedSnapshotNumVersionList: p,
             qyKVDataCleaner: n
         } = this, i = (Object.assign(this, {
             pMInfoMap: {},

package/src/QySnapshotSaver_Worker.d.ts

@@ -1,5 +1,12 @@
 import { QyMessageWorker } from "./QyMessageWorker.ts";
 export default class QySnapshotSaver_Worker extends QyMessageWorker {
+    kvFolder: any;
+    snapshotFolder: any;
+    qySnapshots: any;
+    qyKVDataCleaner: any;
+    aclKeyValueMap: any;
+    snapshotSavedChangeId: number;
+    maxChangeId: any;
     constructor({ kvFolder, options }: {
         kvFolder: any;
         options: any;
@@ -8,7 +15,7 @@ export default class QySnapshotSaver_Worker extends QyMessageWorker {
     castSave(changeId: any, cmdArgAsListObj: any, syncList: any): void;
     saveSnapshot(maxSnapshotNum: any): Promise<void>;
     releaseSnapshot(snapshotNum: any): void;
-    _op_stop(): Promise<any>;
+    _op_stop(): Promise<number>;
     _op_waitForSnapshotSaved({ saveMaxSnapshotInfoPromise, outdates }: {
         saveMaxSnapshotInfoPromise: any;
         outdates: any;

package/src/QySnapshotSaver_Worker.js

@@ -23,6 +23,13 @@ import {
 } from "./QyLogger.js";
 
 export default class extends a {
+    kvFolder;
+    snapshotFolder;
+    qySnapshots;
+    qyKVDataCleaner;
+    aclKeyValueMap = {};
+    snapshotSavedChangeId = 0;
+    maxChangeId;
     constructor({
         kvFolder: a,
         options: s
@@ -36,9 +43,7 @@ export default class extends a {
             kvFolder: a,
             snapshotFolder: e,
             qySnapshots: new n(e, s),
-            qyKVDataCleaner: new p(this, a, s),
-            aclKeyValueMap: {},
-            snapshotSavedChangeId: 0
+            qyKVDataCleaner: new p(this, a, s)
         });
     }
     _op_start(a, s, e) {
@@ -82,7 +87,7 @@ export default class extends a {
             snapshotNum: a,
             maxChangeId: t
         } = await a, {
-            emptySnapshotNumList: s,
+            emptySnapshotNumVersionList: s,
             pMChangeList: o,
             vLChange: n,
             snapshotInfoMap: p,
@@ -92,9 +97,9 @@ export default class extends a {
             qySnapshots: i,
             options: l
         } = this;
-        for (e in r.cleanAclFiles(a), 0 < h.length && await Promise.all(h), h.length = 0, 
+        for (e in r.cleanAclFiles(a), 0 < h.length && (await Promise.all(h), h.length = 0), 
         p) h.push(i.saveSnapshotInfo(e, p[e]));
-        0 < h.length && await Promise.all(h), 0 < s.length && r.removeSnapshotsFiles(s), 
+        0 < h.length && (await Promise.all(h), h.length = 0), 0 < s.length && r.removeSnapshotsFiles(s), 
         0 < o.length && r.cleanPMFiles(o), 0 < n.length && r.cleanVLFiles(n[0], n[1]);
         let u;
         a = i.snapshotCount;
@@ -115,7 +120,7 @@ export default class extends a {
 function h(a, s, e, t) {
     var o = (a => {
         var s, e = a.qySnapshots, {
-            emptySnapshotNumList: t,
+            emptySnapshotNumVersionList: t,
             combiningSnapshotList: a,
             pMCompactSnapshotList: o
         } = e.calOutdates(), n = {}, p = [], h = [], r = [];
@@ -130,18 +135,19 @@ function h(a, s, e, t) {
         }
         let u = a.length, m;
         if (0 < u) {
-            var S, y = e.keyToSnapshotMap, {
-                keyValueMap: d,
+            var S, d = e.keyToSnapshotMap, {
+                keyValueMap: y,
                 info: o,
                 snapshotNum: v
             } = m = e.getMaxCombinedSnapshot(a);
             for (S of a) if (m != S) {
                 var g, {
                     keyValueMap: M,
-                    snapshotNum: f
+                    snapshotNum: f,
+                    info: C
                 } = S;
-                for (g in M) d[g] = M[g], y[g] = m;
-                e.delSnapshot(S), t.push(f);
+                for (g in M) y[g] = M[g], d[g] = m;
+                e.delSnapshot(S), t.push([ f, C.verList[0] ]);
             }
             p.push(e.saveKeyValueMap(m)), h.push([ v, o.pMVersion ]), r.push(v, o.vLVersion), 
             n[v] = {
@@ -149,7 +155,7 @@ function h(a, s, e, t) {
             };
         }
         return {
-            emptySnapshotNumList: t,
+            emptySnapshotNumVersionList: t,
             pMChangeList: h,
             vLChange: r,
             snapshotInfoMap: n,
@@ -162,7 +168,8 @@ function h(a, s, e, t) {
         info: {
             maxChangeId: e,
             pMVersion: 0,
-            vLVersion: 0
+            vLVersion: 0,
+            verList: []
         }
     }, t = (a.qySnapshots.addMaxSnapshot(s), (async (a, s) => {
         await (a = a.qySnapshots).saveKeyValueMap(s);

package/src/QySnapshots.d.ts

@@ -1,8 +1,19 @@
 export declare class QySnapshots {
+    snapshotFolder: any;
+    snapshotInfoFolder: any;
+    options: any;
+    qyJsonSaver: any;
+    numToSnapshotMap: any;
+    keyToSnapshotMap: any;
+    fDMap: any;
+    prefixMap: any;
+    snapshotMaxChangeId: number;
+    maxSnapshotNum: number;
+    snapshotCount: number;
     constructor(snapshotFolder: any, options: any);
     loadSnapshotInfos(): Promise<void>;
     closeAllFDs(): void;
-    saveKeyValueMap(snapshot: any): Promise<any>;
+    saveKeyValueMap(snapshot: any): Promise<[[any, any], any]>;
     addMaxSnapshot(maxSnapshot: any): void;
     removeKey(key: any): true | undefined;
     applyCmdObj(cmdObj: any, aclKeyValueMap: any, syncList: any): void;
@@ -10,18 +21,19 @@ export declare class QySnapshots {
     loadPartialPosMapBuffer(snapshot: any, prefix: any, buffer: any): void;
     delSnapshot(snapshot: any): void;
     calOutdates(): {
-        emptySnapshotNumList: never[];
-        combiningSnapshotList: never[];
-        pMCompactSnapshotList: never[];
-        vLCompactSnapshotList: never[];
+        emptySnapshotNumVersionList: any[];
+        combiningSnapshotList: any[];
+        pMCompactSnapshotList: any[];
+        vLCompactSnapshotList: any[];
     };
     getMaxCombinedSnapshot(snapshotList: any): any;
     getPMFilePath(snapshot: any): string;
     getVLFilePath(snapshot: any): string;
-    saveSnapshotInfo(snapshotNum: any, info: any): any;
-    savePosMap(snapshot: any, sortedKeyList: any): Promise<any>;
+    saveSnapshotInfo(snapshotNum: any, info: any): Promise<boolean>;
+    savePosMap(snapshot: any, sortedKeyList: any): Promise<[any, any]>;
     isEmptySnapshot(snapshot: any): boolean;
     removeKeyFromSnapshot(snapshot: any, key: any): void;
 }
 export declare function iterPMBuffer(buffer: any, fun: any): void;
 export declare function loadPrefixPMFile(prefixPMFilePath: any): Promise<{}>;
+export declare function getSnapshotInfoFileName(snapshotNum: any, version: any): string;