Compare commits

..

No commits in common. "6eeb701439ae5bd346c0160f26be16ddea3b11e1" and "eefa7b13463b6ef83c3682026948296ac2e0636c" have entirely different histories.

2 changed files with 4 additions and 11 deletions

View File

@ -445,7 +445,7 @@ func (b *browserService) scanKeys(ctx context.Context, client redis.UniversalCli
filterType := len(keyType) > 0 filterType := len(keyType) > 0
scanSize := int64(Preferences().GetScanSize()) scanSize := int64(Preferences().GetScanSize())
// define sub scan function // define sub scan function
scan := func(ctx context.Context, cli redis.UniversalClient, count int64, appendFunc func(k []any)) error { scan := func(ctx context.Context, cli redis.UniversalClient, appendFunc func(k []any)) error {
var loadedKey []string var loadedKey []string
var scanCount int64 var scanCount int64
for { for {
@ -475,22 +475,16 @@ func (b *browserService) scanKeys(ctx context.Context, client redis.UniversalCli
if cluster, ok := client.(*redis.ClusterClient); ok { if cluster, ok := client.(*redis.ClusterClient); ok {
// cluster mode // cluster mode
var mutex sync.Mutex var mutex sync.Mutex
var totalMaster int64
cluster.ForEachMaster(ctx, func(ctx context.Context, cli *redis.Client) error {
totalMaster += 1
return nil
})
partCount := count / max(totalMaster, 1)
err = cluster.ForEachMaster(ctx, func(ctx context.Context, cli *redis.Client) error { err = cluster.ForEachMaster(ctx, func(ctx context.Context, cli *redis.Client) error {
// FIXME: BUG? can not fully load in cluster mode? maybe remove the shared "cursor" // FIXME: BUG? can not fully load in cluster mode? maybe remove the shared "cursor"
return scan(ctx, cli, partCount, func(k []any) { return scan(ctx, cli, func(k []any) {
mutex.Lock() mutex.Lock()
keys = append(keys, k...) keys = append(keys, k...)
mutex.Unlock() mutex.Unlock()
}) })
}) })
} else { } else {
err = scan(ctx, client, count, func(k []any) { err = scan(ctx, client, func(k []any) {
keys = append(keys, k...) keys = append(keys, k...)
}) })
} }

View File

@ -160,7 +160,7 @@ const onKeyShortcut = (e) => {
<div v-show="tabStore.nav === 'browser'" class="app-toolbar-tab flex-item-expand"> <div v-show="tabStore.nav === 'browser'" class="app-toolbar-tab flex-item-expand">
<content-value-tab /> <content-value-tab />
</div> </div>
<div class="flex-item-expand" style="min-width: 15px"></div> <div class="flex-item-expand"></div>
<!-- simulate window control buttons --> <!-- simulate window control buttons -->
<toolbar-control-widget <toolbar-control-widget
v-if="!isMacOS()" v-if="!isMacOS()"
@ -248,7 +248,6 @@ const onKeyShortcut = (e) => {
align-self: flex-end; align-self: flex-end;
margin-bottom: -1px; margin-bottom: -1px;
margin-left: 3px; margin-left: 3px;
overflow: auto;
} }
#app-content { #app-content {