Compare commits

..

No commits in common. "213ccf981c8500edf632440f31a4336bed121bea" and "cc40dfd72797621035e713d12f090a056dc50f6e" have entirely different histories.

3 changed files with 35 additions and 37 deletions

View File

@ -349,7 +349,7 @@ export class Cache extends Feature {
opers.forEach((oper) => {
const { entity, operation } = oper;
this.cacheStore.operate(entity, operation, this.context, {
checkerTypes: ['logical'],
checkerTypes: ['logical'], // 这里不能检查data不然在数据没填完前会有大量异常
dontCollect: true,
});
});

View File

@ -6,7 +6,6 @@ import { judgeRelation } from "oak-domain/lib/store/relation";
import { Feature } from '../types/Feature';
import { generateNewId } from 'oak-domain/lib/utils/uuid';
export const MODI_NEXT_PATH_SUFFIX = ':next';
const START_LSN = 100;
function mergeOperation(schema, entity, oper1, oper2) {
const { action, data } = oper2;
const operMerged = cloneDeep(oper1);
@ -91,7 +90,7 @@ class UpdateLogManager {
constructor(schema, entity, maxLsn) {
this.schema = schema,
this.entity = entity,
this.maxLsn = maxLsn || START_LSN;
this.maxLsn = maxLsn || 0;
}
/**
* 合并两个filter完全一致的更新
@ -166,7 +165,7 @@ class UpdateLogManager {
rollback(lsn) {
const newLogs = this.logs.filter(ele => ele.lsn <= lsn);
this.logs = newLogs;
this.maxLsn = lsn || START_LSN;
this.maxLsn = lsn;
}
makeOperations() {
const opers = {};
@ -1432,7 +1431,7 @@ class SingleNode extends Node {
saveRefreshResult(data) {
const ids = Object.keys(data);
assert(ids.length === 1);
this.setId(ids[0]);
this.id = ids[0];
this.sr = data[ids[0]];
this.passRsToChild();
// this.publish();
@ -1744,7 +1743,7 @@ export class RunningTree extends Feature {
this.nodeCountDict = {};
this.pageNodeStack = {};
this.singletonDict = {};
this.logSerailNumber = START_LSN;
this.logSerailNumber = 100;
}
increaseNodeCount(path) {
if (!this.nodeCountDict[path]) {

View File

@ -15,11 +15,10 @@ import { ActionDef } from '../types/Page';
import { generateNewId } from 'oak-domain/lib/utils/uuid';
export const MODI_NEXT_PATH_SUFFIX = ':next';
const START_LSN = 100;
type LegalOperation<ED extends EntityDict & BaseEntityDict, T extends keyof ED> = ED[T]['CreateSingle']
| ED[T]['Update']
| ED[T]['Remove'];
| ED[T]['Update']
| ED[T]['Remove'];
type UpdateLog<ED extends EntityDict & BaseEntityDict, T extends keyof ED> = {
lsn: number;
@ -27,7 +26,7 @@ type UpdateLog<ED extends EntityDict & BaseEntityDict, T extends keyof ED> = {
};
function mergeOperation<ED extends EntityDict & BaseEntityDict, T extends keyof ED>(
function mergeOperation<ED extends EntityDict & BaseEntityDict, T extends keyof ED> (
schema: StorageSchema<ED>,
entity: T,
oper1: LegalOperation<ED, T>,
@ -131,7 +130,7 @@ class UpdateLogManager<ED extends EntityDict & BaseEntityDict, T extends keyof E
constructor(schema: StorageSchema<ED>, entity: T, maxLsn?: number) {
this.schema = schema,
this.entity = entity,
this.maxLsn = maxLsn || START_LSN;
this.maxLsn = maxLsn || 0;
}
/**
* filter完全一致的更新
@ -214,7 +213,7 @@ class UpdateLogManager<ED extends EntityDict & BaseEntityDict, T extends keyof E
ele => ele.lsn <= lsn
);
this.logs = newLogs;
this.maxLsn = lsn || START_LSN;
this.maxLsn = lsn;
}
makeOperations() {
@ -1027,7 +1026,7 @@ class ListNode<
return operations.map(
(operation) => {
const { filter, ...rest } = operation;
const { filter, ...rest} = operation;
return {
entity: this.entity,
operation: {
@ -1390,7 +1389,7 @@ class SingleNode<ED extends EntityDict & BaseEntityDict,
if (id !== this.id) {
const operations = this.ulManager.makeOperations();
assert(operations.length <= 1);
const [operation] = operations;
const [ operation ] = operations;
// 如果本身是create 这里无视就行(因为框架原因会调用一次)
if (operation?.action === 'create') {
if (operation.data.id === id) {
@ -1418,7 +1417,7 @@ class SingleNode<ED extends EntityDict & BaseEntityDict,
}
const operations = this.ulManager.makeOperations();
assert(operations.length <= 1);
const [operation] = operations;
const [ operation ] = operations;
if (operation && operation?.action === 'create') {
return operation.data.id;
}
@ -1608,7 +1607,7 @@ class SingleNode<ED extends EntityDict & BaseEntityDict,
this.ulManager.rollback(lsnMax);
assert(operations.length <= 1);
const [operation] = operations;
const [ operation ] = operations;
if (operation) {
const { filter, ...rest } = operation;
@ -1729,7 +1728,7 @@ class SingleNode<ED extends EntityDict & BaseEntityDict,
saveRefreshResult(data: Record<string, any>) {
const ids = Object.keys(data);
assert(ids.length === 1);
this.setId(ids[0]);
this.id = ids[0];
this.sr = data[ids[0]!];
this.passRsToChild();
@ -1785,7 +1784,7 @@ class SingleNode<ED extends EntityDict & BaseEntityDict,
private getFilter(): ED[T]['Selection']['filter'] | undefined {
// 如果是新建等于没有filter
const [operation] = this.ulManager.makeOperations();
const [ operation ] = this.ulManager.makeOperations();
if (operation?.action === 'create') {
return;
}
@ -2108,7 +2107,7 @@ export class RunningTree<ED extends EntityDict & BaseEntityDict> extends Feature
this.nodeCountDict = {};
this.pageNodeStack = {};
this.singletonDict = {};
this.logSerailNumber = START_LSN;
this.logSerailNumber = 100;
}
private increaseNodeCount(path: string) {
@ -2803,7 +2802,7 @@ export class RunningTree<ED extends EntityDict & BaseEntityDict> extends Feature
savePoint() {
const lsn = this.logSerailNumber;
this.logSerailNumber++;
this.logSerailNumber ++;
return lsn;
}
@ -2813,7 +2812,7 @@ export class RunningTree<ED extends EntityDict & BaseEntityDict> extends Feature
* @param lsn savepoint
* @param dontPublish
*/
clean(path: string, lsn?: number, dontPublish?: true) {
clean(path: string, lsn?:number, dontPublish?: true) {
const node = this.findNode(path)!;
node.clean(lsn, dontPublish);