dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-26 15:36:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

redis search keys

Browse Source
This commit is contained in:
Jan Prochazka
2022-03-31 09:44:50 +02:00
parent 1b52a2a0fc
commit fe277f5ffa
7 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/api/src/controllers/databaseConnections.js
View File

@@ -176,8 +176,8 @@ module.exports = {
}, },
loadKeys_meta: true, loadKeys_meta: true,
async loadKeys({ conid, database, root }) { async loadKeys({ conid, database, root, filter }) {
return this.loadDataCore('loadKeys', { conid, database, root }); return this.loadDataCore('loadKeys', { conid, database, root, filter });
}, },
exportKeys_meta: true, exportKeys_meta: true,

4
packages/api/src/proc/databaseConnectionProcess.js
View File

@@ -197,8 +197,8 @@ async function handleCollectionData({ msgid, options }) {
return handleDriverDataCore(msgid, driver => driver.readCollection(systemConnection, options)); return handleDriverDataCore(msgid, driver => driver.readCollection(systemConnection, options));
} }
async function handleLoadKeys({ msgid, root }) { async function handleLoadKeys({ msgid, root, filter }) {
return handleDriverDataCore(msgid, driver => driver.loadKeys(systemConnection, root)); return handleDriverDataCore(msgid, driver => driver.loadKeys(systemConnection, root, filter));
} }
async function handleExportKeys({ msgid, options }) { async function handleExportKeys({ msgid, options }) {

2
packages/types/engines.d.ts vendored
View File

@@ -89,7 +89,7 @@ export interface EngineDriver {
name: string; name: string;
}[] }[]
>; >;
loadKeys(pool, root: string): Promise; loadKeys(pool, root: string, filter?: string): Promise;
exportKeys(pool, options: {}): Promise; exportKeys(pool, options: {}): Promise;
loadKeyInfo(pool, key): Promise; loadKeyInfo(pool, key): Promise;
loadKeyTableRange(pool, key, cursor, count): Promise; loadKeyTableRange(pool, key, cursor, count): Promise;

5
packages/web/src/widgets/DbKeysSubTree.svelte
View File

@@ -17,6 +17,8 @@
export let reloadToken = 0; export let reloadToken = 0;
export let connection; export let connection;
export let filter;
let reloadToken2 = 0; let reloadToken2 = 0;
let maxShowCount = SHOW_INCREMENT; let maxShowCount = SHOW_INCREMENT;
@@ -24,7 +26,7 @@
// $: items = useDatabaseKeys({ conid, database, root, reloadToken }); // $: items = useDatabaseKeys({ conid, database, root, reloadToken });
</script> </script>
{#await apiCall('database-connections/load-keys', { conid, database, root, reloadToken, reloadToken2 })} {#await apiCall('database-connections/load-keys', { conid, database, root, filter, reloadToken, reloadToken2 })}
<LoadingInfo message="Loading key list" wrapper /> <LoadingInfo message="Loading key list" wrapper />
{:then items} {:then items}
{@const itemsSorted = _.sortBy(items || [], 'text')} {@const itemsSorted = _.sortBy(items || [], 'text')}
@@ -36,6 +38,7 @@
{root} {root}
{connection} {connection}
{item} {item}
{filter}
{indentLevel} {indentLevel}
onRefreshParent={() => { onRefreshParent={() => {
reloadToken2 += 1; reloadToken2 += 1;

4
packages/web/src/widgets/DbKeysTree.svelte
View File

@@ -53,7 +53,7 @@
</script> </script>
<SearchBoxWrapper> <SearchBoxWrapper>
<SearchInput placeholder="Search keys" bind:value={filter} /> <SearchInput placeholder="Search keys" bind:value={filter} isDebounced />
<CloseSearchButton bind:filter /> <CloseSearchButton bind:filter />
<InlineButton on:click={handleAddKey} title="Add new key"> <InlineButton on:click={handleAddKey} title="Add new key">
<FontIcon icon="icon plus-thick" /> <FontIcon icon="icon plus-thick" />
@@ -63,5 +63,5 @@
</InlineButton> </InlineButton>
</SearchBoxWrapper> </SearchBoxWrapper>
<WidgetsInnerContainer> <WidgetsInnerContainer>
<DbKeysSubTree {conid} {database} root="" {reloadToken} connection={$currentDatabase?.connection} /> <DbKeysSubTree {conid} {database} root="" {reloadToken} connection={$currentDatabase?.connection} {filter} />
</WidgetsInnerContainer> </WidgetsInnerContainer>

11
packages/web/src/widgets/DbKeysTreeNode.svelte
View File

@@ -23,6 +23,7 @@
export let item; export let item;
export let indentLevel = 0; export let indentLevel = 0;
export let filter;
export let onRefreshParent; export let onRefreshParent;
@@ -170,5 +171,13 @@
</div> --> </div> -->
{#if isExpanded} {#if isExpanded}
<DbKeysSubTree {conid} {database} root={item.root} indentLevel={indentLevel + 1} {reloadToken} {connection} /> <DbKeysSubTree
{conid}
{database}
root={item.root}
indentLevel={indentLevel + 1}
{reloadToken}
{connection}
{filter}
/>
{/if} {/if}

6
plugins/dbgate-plugin-redis/src/backend/driver.js
View File

@@ -5,6 +5,7 @@ const driverBase = require('../frontend/driver');
const Analyser = require('./Analyser'); const Analyser = require('./Analyser');
const Redis = require('ioredis'); const Redis = require('ioredis');
const RedisDump = require('node-redis-dump2'); const RedisDump = require('node-redis-dump2');
const { filterName } = require('dbgate-tools');
function splitCommandLine(str) { function splitCommandLine(str) {
let results = []; let results = [];
@@ -162,9 +163,10 @@ const driver = {
return _.range(16).map((index) => ({ name: `db${index}`, extInfo: info[`db${index}`], sortOrder: index })); return _.range(16).map((index) => ({ name: `db${index}`, extInfo: info[`db${index}`], sortOrder: index }));
}, },
async loadKeys(pool, root = '') { async loadKeys(pool, root = '', filter = null) {
const keys = await this.getKeys(pool, root ? `${root}:*` : '*'); const keys = await this.getKeys(pool, root ? `${root}:*` : '*');
const res = this.extractKeysFromLevel(root, keys); const keysFiltered = keys.filter((x) => filterName(filter, x));
const res = this.extractKeysFromLevel(root, keysFiltered);
await this.enrichKeyInfo(pool, res); await this.enrichKeyInfo(pool, res);
return res; return res;
}, },