fix(basic.gblib): Allow MERGE keyword in storage #380. @othonlima
This commit is contained in:
parent
57bb89a73e
commit
3c7a1d1e8e
1 changed files with 3 additions and 18 deletions
|
@ -2146,18 +2146,6 @@ export class SystemKeywords {
|
|||
await retry(
|
||||
async (bail) => {
|
||||
let rows = [];
|
||||
|
||||
const paginate = (query, { page, pageSize }) => {
|
||||
const offset = page * pageSize;
|
||||
const limit = pageSize;
|
||||
|
||||
return {
|
||||
...query,
|
||||
offset,
|
||||
limit,
|
||||
};
|
||||
};
|
||||
|
||||
let page = 0, pageSize = 1000;
|
||||
let count = 0;
|
||||
|
||||
|
@ -2165,12 +2153,7 @@ export class SystemKeywords {
|
|||
|
||||
rows = [
|
||||
await t.findAll(
|
||||
paginate(
|
||||
{
|
||||
where: {},
|
||||
},
|
||||
{ page, pageSize },
|
||||
),
|
||||
{offset:page * pageSize, limit:pageSize, subquery:false, where:{}}
|
||||
), ...rows];
|
||||
page++;
|
||||
count = rows.length;
|
||||
|
@ -2182,6 +2165,8 @@ export class SystemKeywords {
|
|||
}
|
||||
);
|
||||
|
||||
GBLog.info(`cached: ${rows.length}.`);
|
||||
|
||||
}
|
||||
else {
|
||||
rows = this.cachedMerge[pid][file];
|
||||
|
|
Loading…
Add table
Reference in a new issue