Skip to content

scan in lower batches for tree-view #2829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2023
Merged

scan in lower batches for tree-view #2829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions ...src/modules/browser/services/keys-business/scanner/strategies/standalone.strategy.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,40 @@ describe('Standalone Scanner Strategy', () => {
null,
);
});
it('should scan 2000 items when count provided more then 2k', async () => {
const args = { ...getKeysDto, count: 10_000, match: '*' };
jest.spyOn(Utils, 'getTotal').mockResolvedValue(mockGetTotalResponse_1);

when(browserTool.execCommand)
.calledWith(
mockBrowserClientMetadata,
BrowserToolKeysCommands.Scan,
expect.anything(),
null,
)
.mockResolvedValue([0, [getKeyInfoResponse.name]]);

strategy.getKeysInfo = jest.fn().mockResolvedValue([getKeyInfoResponse]);

const result = await strategy.getKeys(mockBrowserClientMetadata, args);

expect(result).toEqual([
{
...mockNodeEmptyResult,
total: 1,
scanned: 2000,
keys: [getKeyInfoResponse],
},
]);
expect(strategy.getKeysInfo).toHaveBeenCalled();
expect(browserTool.execCommand).toHaveBeenNthCalledWith(
1,
mockBrowserClientMetadata,
BrowserToolKeysCommands.Scan,
['0', 'MATCH', args.match, 'COUNT', 2000],
null,
);
});
it('should return keys names and type only', async () => {
const args = {
...getKeysDto, type: 'string', match: 'pattern*', keysInfo: false,
Expand Down
6 changes: 4 additions & 2 deletions .../api/src/modules/browser/services/keys-business/scanner/strategies/standalone.strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ export class StandaloneStrategy extends AbstractStrategy {
count: number,
type?: RedisDataType,
): Promise<void> {
const COUNT = Math.min(2000, count);

let fullScanned = false;
// todo: remove settings from here. threshold should be part of query?
const settings = await this.settingsService.getAppSettings('1');
Expand All @@ -97,7 +99,7 @@ export class StandaloneStrategy extends AbstractStrategy {
node.scanned < settings.scanThreshold
)
) {
let commandArgs = [`${node.cursor}`, 'MATCH', match, 'COUNT', count];
let commandArgs = [`${node.cursor}`, 'MATCH', match, 'COUNT', COUNT];
if (type) {
commandArgs = [...commandArgs, 'TYPE', type];
}
Expand All @@ -112,7 +114,7 @@ export class StandaloneStrategy extends AbstractStrategy {
// eslint-disable-next-line no-param-reassign
node.cursor = parseInt(nextCursor, 10);
// eslint-disable-next-line no-param-reassign
node.scanned += count;
node.scanned += COUNT;
node.keys.push(...keys);
fullScanned = node.cursor === 0;
}
Expand Down