gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test ListDirectoryPrefixedEntries

Browse Source
This commit is contained in:
Устюжанин Антон Александрович
2020-08-06 00:24:31 +05:00
parent 2d3b355fb6
commit a457c308ad
8 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/filer2/abstract_sql/abstract_sql_store.go
View File

@@ -199,8 +199,10 @@ func (store *AbstractSqlStore) ListDirectoryPrefixedEntries(ctx context.Context,
if prefix == "" { if prefix == "" {
return notPrefixed, nil return notPrefixed, nil
} }
var lastFileName string
for count < limit { for count < limit {
for _, entry := range notPrefixed { for _, entry := range notPrefixed {
lastFileName = entry.Name()
if strings.HasPrefix(entry.Name(), prefix) { if strings.HasPrefix(entry.Name(), prefix) {
count++ count++
entries = append(entries, entry) entries = append(entries, entry)
@@ -210,10 +212,14 @@ func (store *AbstractSqlStore) ListDirectoryPrefixedEntries(ctx context.Context,
break break
} }
notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, startFileName, inclusive, limit) notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, lastFileName, inclusive, limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(notPrefixed) == 0 {
break
}
} }
return entries, nil return entries, nil

8
weed/filer2/cassandra/cassandra_store.go
View File

@@ -137,8 +137,10 @@ func (store *CassandraStore) ListDirectoryPrefixedEntries(ctx context.Context, f
if prefix == "" { if prefix == "" {
return notPrefixed, nil return notPrefixed, nil
} }
var lastFileName string
for count < limit { for count < limit {
for _, entry := range notPrefixed { for _, entry := range notPrefixed {
lastFileName = entry.Name()
if strings.HasPrefix(entry.Name(), prefix) { if strings.HasPrefix(entry.Name(), prefix) {
count++ count++
entries = append(entries, entry) entries = append(entries, entry)
@@ -148,10 +150,14 @@ func (store *CassandraStore) ListDirectoryPrefixedEntries(ctx context.Context, f
break break
} }
notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, startFileName, inclusive, limit) notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, lastFileName, inclusive, limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(notPrefixed) == 0 {
break
}
} }
return entries, nil return entries, nil

8
weed/filer2/etcd/etcd_store.go
View File

@@ -145,8 +145,10 @@ func (store *EtcdStore) ListDirectoryPrefixedEntries(ctx context.Context, fullpa
if prefix == "" { if prefix == "" {
return notPrefixed, nil return notPrefixed, nil
} }
var lastFileName string
for count < limit { for count < limit {
for _, entry := range notPrefixed { for _, entry := range notPrefixed {
lastFileName = entry.Name()
if strings.HasPrefix(entry.Name(), prefix) { if strings.HasPrefix(entry.Name(), prefix) {
count++ count++
entries = append(entries, entry) entries = append(entries, entry)
@@ -156,10 +158,14 @@ func (store *EtcdStore) ListDirectoryPrefixedEntries(ctx context.Context, fullpa
break break
} }
notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, startFileName, inclusive, limit) notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, lastFileName, inclusive, limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(notPrefixed) == 0 {
break
}
} }
return entries, nil return entries, nil

8
weed/filer2/leveldb/leveldb_store.go
View File

@@ -170,8 +170,10 @@ func (store *LevelDBStore) ListDirectoryPrefixedEntries(ctx context.Context, ful
if prefix == "" { if prefix == "" {
return notPrefixed, nil return notPrefixed, nil
} }
var lastFileName string
for count < limit { for count < limit {
for _, entry := range notPrefixed { for _, entry := range notPrefixed {
lastFileName = entry.Name()
if strings.HasPrefix(entry.Name(), prefix) { if strings.HasPrefix(entry.Name(), prefix) {
count++ count++
entries = append(entries, entry) entries = append(entries, entry)
@@ -181,10 +183,14 @@ func (store *LevelDBStore) ListDirectoryPrefixedEntries(ctx context.Context, ful
break break
} }
notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, startFileName, inclusive, limit) notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, lastFileName, inclusive, limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(notPrefixed) == 0 {
break
}
} }
return entries, nil return entries, nil

8
weed/filer2/leveldb2/leveldb2_store.go
View File

@@ -179,8 +179,10 @@ func (store *LevelDB2Store) ListDirectoryPrefixedEntries(ctx context.Context, fu
if prefix == "" { if prefix == "" {
return notPrefixed, nil return notPrefixed, nil
} }
var lastFileName string
for count < limit { for count < limit {
for _, entry := range notPrefixed { for _, entry := range notPrefixed {
lastFileName = entry.Name()
if strings.HasPrefix(entry.Name(), prefix) { if strings.HasPrefix(entry.Name(), prefix) {
count++ count++
entries = append(entries, entry) entries = append(entries, entry)
@@ -190,10 +192,14 @@ func (store *LevelDB2Store) ListDirectoryPrefixedEntries(ctx context.Context, fu
break break
} }
notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, startFileName, inclusive, limit) notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, lastFileName, inclusive, limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(notPrefixed) == 0 {
break
}
} }
return entries, nil return entries, nil

8
weed/filer2/mongodb/mongodb_store.go
View File

@@ -178,8 +178,10 @@ func (store *MongodbStore) ListDirectoryPrefixedEntries(ctx context.Context, ful
if prefix == "" { if prefix == "" {
return notPrefixed, nil return notPrefixed, nil
} }
var lastFileName string
for count < limit { for count < limit {
for _, entry := range notPrefixed { for _, entry := range notPrefixed {
lastFileName = entry.Name()
if strings.HasPrefix(entry.Name(), prefix) { if strings.HasPrefix(entry.Name(), prefix) {
count++ count++
entries = append(entries, entry) entries = append(entries, entry)
@@ -189,10 +191,14 @@ func (store *MongodbStore) ListDirectoryPrefixedEntries(ctx context.Context, ful
break break
} }
notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, startFileName, inclusive, limit) notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, lastFileName, inclusive, limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(notPrefixed) == 0 {
break
}
} }
return entries, nil return entries, nil

8
weed/filer2/redis/universal_redis_store.go
View File

@@ -131,8 +131,10 @@ func (store *UniversalRedisStore) ListDirectoryPrefixedEntries(ctx context.Conte
if prefix == "" { if prefix == "" {
return notPrefixed, nil return notPrefixed, nil
} }
var lastFileName string
for count < limit { for count < limit {
for _, entry := range notPrefixed { for _, entry := range notPrefixed {
lastFileName = entry.Name()
if strings.HasPrefix(entry.Name(), prefix) { if strings.HasPrefix(entry.Name(), prefix) {
count++ count++
entries = append(entries, entry) entries = append(entries, entry)
@@ -142,10 +144,14 @@ func (store *UniversalRedisStore) ListDirectoryPrefixedEntries(ctx context.Conte
break break
} }
notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, startFileName, inclusive, limit) notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, lastFileName, inclusive, limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(notPrefixed) == 0 {
break
}
} }
return entries, nil return entries, nil

8
weed/filer2/redis2/universal_redis_store.go
View File

@@ -127,8 +127,10 @@ func (store *UniversalRedis2Store) ListDirectoryPrefixedEntries(ctx context.Cont
if prefix == "" { if prefix == "" {
return notPrefixed, nil return notPrefixed, nil
} }
var lastFileName string
for count < limit { for count < limit {
for _, entry := range notPrefixed { for _, entry := range notPrefixed {
lastFileName = entry.Name()
if strings.HasPrefix(entry.Name(), prefix) { if strings.HasPrefix(entry.Name(), prefix) {
count++ count++
entries = append(entries, entry) entries = append(entries, entry)
@@ -138,10 +140,14 @@ func (store *UniversalRedis2Store) ListDirectoryPrefixedEntries(ctx context.Cont
break break
} }
notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, startFileName, inclusive, limit) notPrefixed, err = store.ListDirectoryEntries(ctx, fullpath, lastFileName, inclusive, limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(notPrefixed) == 0 {
break
}
} }
return entries, nil return entries, nil