From 81f11883e374795f5a8eddbb059aba7ee060411d Mon Sep 17 00:00:00 2001 From: chrislu Date: Sun, 26 Nov 2023 11:47:20 -0800 Subject: [PATCH] go fmt --- weed/filer/etcd/etcd_store.go | 18 +++++++++--------- weed/filer/etcd/etcd_store_kv.go | 6 +++--- weed/stats/metrics.go | 1 - weed/stats/metrics_names.go | 4 ++-- .../needle_map/compact_map_perf_test.go | 2 +- weed/storage/needle_map/compact_map_test.go | 8 ++++---- weed/util/fla9/fla9.go | 2 +- 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/weed/filer/etcd/etcd_store.go b/weed/filer/etcd/etcd_store.go index 4c4c7303c..9f96405a9 100644 --- a/weed/filer/etcd/etcd_store.go +++ b/weed/filer/etcd/etcd_store.go @@ -24,7 +24,7 @@ func init() { } type EtcdStore struct { - client *clientv3.Client + client *clientv3.Client etcdKeyPrefix string } @@ -38,9 +38,9 @@ func (store *EtcdStore) Initialize(configuration weed_util.Configuration, prefix servers = "localhost:2379" } - username := configuration.GetString(prefix + "username") - password := configuration.GetString(prefix + "password") - store.etcdKeyPrefix = configuration.GetString(prefix + "key_prefix") + username := configuration.GetString(prefix + "username") + password := configuration.GetString(prefix + "password") + store.etcdKeyPrefix = configuration.GetString(prefix + "key_prefix") timeout := configuration.GetString(prefix + "timeout") if timeout == "" { @@ -93,7 +93,7 @@ func (store *EtcdStore) InsertEntry(ctx context.Context, entry *filer.Entry) (er meta = weed_util.MaybeGzipData(meta) } - if _, err := store.client.Put(ctx, store.etcdKeyPrefix + string(key), string(meta)); err != nil { + if _, err := store.client.Put(ctx, store.etcdKeyPrefix+string(key), string(meta)); err != nil { return fmt.Errorf("persisting %s : %v", entry.FullPath, err) } @@ -107,7 +107,7 @@ func (store *EtcdStore) UpdateEntry(ctx context.Context, entry *filer.Entry) (er func (store *EtcdStore) FindEntry(ctx context.Context, fullpath weed_util.FullPath) (entry *filer.Entry, err error) { key := genKey(fullpath.DirAndName()) - resp, err := store.client.Get(ctx, store.etcdKeyPrefix + string(key)) + resp, err := store.client.Get(ctx, store.etcdKeyPrefix+string(key)) if err != nil { return nil, fmt.Errorf("get %s : %v", fullpath, err) } @@ -130,7 +130,7 @@ func (store *EtcdStore) FindEntry(ctx context.Context, fullpath weed_util.FullPa func (store *EtcdStore) DeleteEntry(ctx context.Context, fullpath weed_util.FullPath) (err error) { key := genKey(fullpath.DirAndName()) - if _, err := store.client.Delete(ctx, store.etcdKeyPrefix + string(key)); err != nil { + if _, err := store.client.Delete(ctx, store.etcdKeyPrefix+string(key)); err != nil { return fmt.Errorf("delete %s : %v", fullpath, err) } @@ -140,7 +140,7 @@ func (store *EtcdStore) DeleteEntry(ctx context.Context, fullpath weed_util.Full func (store *EtcdStore) DeleteFolderChildren(ctx context.Context, fullpath weed_util.FullPath) (err error) { directoryPrefix := genDirectoryKeyPrefix(fullpath, "") - if _, err := store.client.Delete(ctx, store.etcdKeyPrefix + string(directoryPrefix), clientv3.WithPrefix()); err != nil { + if _, err := store.client.Delete(ctx, store.etcdKeyPrefix+string(directoryPrefix), clientv3.WithPrefix()); err != nil { return fmt.Errorf("deleteFolderChildren %s : %v", fullpath, err) } @@ -158,7 +158,7 @@ func (store *EtcdStore) ListDirectoryEntries(ctx context.Context, dirPath weed_u lastFileStart = genDirectoryKeyPrefix(dirPath, startFileName) } - resp, err := store.client.Get(ctx, store.etcdKeyPrefix + string(lastFileStart), + resp, err := store.client.Get(ctx, store.etcdKeyPrefix+string(lastFileStart), clientv3.WithFromKey(), clientv3.WithLimit(limit+1)) if err != nil { return lastFileName, fmt.Errorf("list %s : %v", dirPath, err) diff --git a/weed/filer/etcd/etcd_store_kv.go b/weed/filer/etcd/etcd_store_kv.go index 96743124d..1616cfd82 100644 --- a/weed/filer/etcd/etcd_store_kv.go +++ b/weed/filer/etcd/etcd_store_kv.go @@ -8,7 +8,7 @@ import ( func (store *EtcdStore) KvPut(ctx context.Context, key []byte, value []byte) (err error) { - _, err = store.client.Put(ctx, store.etcdKeyPrefix + string(key), string(value)) + _, err = store.client.Put(ctx, store.etcdKeyPrefix+string(key), string(value)) if err != nil { return fmt.Errorf("kv put: %v", err) @@ -19,7 +19,7 @@ func (store *EtcdStore) KvPut(ctx context.Context, key []byte, value []byte) (er func (store *EtcdStore) KvGet(ctx context.Context, key []byte) (value []byte, err error) { - resp, err := store.client.Get(ctx, store.etcdKeyPrefix + string(key)) + resp, err := store.client.Get(ctx, store.etcdKeyPrefix+string(key)) if err != nil { return nil, fmt.Errorf("kv get: %v", err) @@ -34,7 +34,7 @@ func (store *EtcdStore) KvGet(ctx context.Context, key []byte) (value []byte, er func (store *EtcdStore) KvDelete(ctx context.Context, key []byte) (err error) { - _, err = store.client.Delete(ctx, store.etcdKeyPrefix + string(key)) + _, err = store.client.Delete(ctx, store.etcdKeyPrefix+string(key)) if err != nil { return fmt.Errorf("kv delete: %v", err) diff --git a/weed/stats/metrics.go b/weed/stats/metrics.go index 3dda42423..87e5f2f4e 100644 --- a/weed/stats/metrics.go +++ b/weed/stats/metrics.go @@ -234,7 +234,6 @@ var ( Help: "Bucketed histogram of s3 time to first byte request processing time.", Buckets: prometheus.ExponentialBuckets(0.001, 2, 27), }, []string{"type", "bucket"}) - ) func init() { diff --git a/weed/stats/metrics_names.go b/weed/stats/metrics_names.go index a79b3f3db..f97796e3b 100644 --- a/weed/stats/metrics_names.go +++ b/weed/stats/metrics_names.go @@ -10,8 +10,8 @@ const ( ErrorSizeMismatch = "errorSizeMismatch" ErrorCRC = "errorCRC" ErrorIndexOutOfRange = "errorIndexOutOfRange" - ErrorGetNotFound = "errorGetNotFound" - ErrorGetInternal = "errorGetInternal" + ErrorGetNotFound = "errorGetNotFound" + ErrorGetInternal = "errorGetInternal" // master topology ErrorWriteToLocalDisk = "errorWriteToLocalDisk" diff --git a/weed/storage/needle_map/compact_map_perf_test.go b/weed/storage/needle_map/compact_map_perf_test.go index 78850fa10..2bb2694fd 100644 --- a/weed/storage/needle_map/compact_map_perf_test.go +++ b/weed/storage/needle_map/compact_map_perf_test.go @@ -89,4 +89,4 @@ func PrintMemUsage(totalRowCount uint64) { } func bToMb(b uint64) uint64 { return b / 1024 / 1024 -} \ No newline at end of file +} diff --git a/weed/storage/needle_map/compact_map_test.go b/weed/storage/needle_map/compact_map_test.go index b61641611..58d2a6e3a 100644 --- a/weed/storage/needle_map/compact_map_test.go +++ b/weed/storage/needle_map/compact_map_test.go @@ -196,7 +196,7 @@ func TestCompactSection_Get(t *testing.T) { maps = append(maps, m) totalRowCount += rowCount m.Set(1574318345753513987, ToOffset(10002), 10002) - nv,ok := m.Get(1574318345753513987) + nv, ok := m.Get(1574318345753513987) if ok { t.Log(uint64(nv.Key)) } @@ -207,14 +207,14 @@ func TestCompactSection_Get(t *testing.T) { } m.Set(1574318350048481283, ToOffset(10002), 10002) - nv2,ok1 := m.Get(1574318350048481283) + nv2, ok1 := m.Get(1574318350048481283) if ok1 { t.Log(uint64(nv2.Key)) } m.Delete(nv2.Key) - nv3,has := m.Get(nv2.Key) + nv3, has := m.Get(nv2.Key) if has && nv3.Size > 0 { t.Error(uint64(nv3.Size)) } -} \ No newline at end of file +} diff --git a/weed/util/fla9/fla9.go b/weed/util/fla9/fla9.go index 3770408d2..390e35333 100644 --- a/weed/util/fla9/fla9.go +++ b/weed/util/fla9/fla9.go @@ -1065,7 +1065,7 @@ func (f *FlagSet) ParseEnv(environ []string) error { } envKey = strings.Replace(envKey, "-", "_", -1) envKey = strings.Replace(envKey, ".", "_", -1) - + value, isSet := env[envKey] if !isSet { continue