From 1952ba0fa1d43db1581a9c9f8a6225868f26b059 Mon Sep 17 00:00:00 2001 From: xincao9 Date: Sun, 21 Jun 2020 00:04:06 +0800 Subject: [PATCH] OK --- Makefile | 7 +++++ api/kv/kv.go | 16 +++++------ api/oss/oss.go | 16 +++++------ api/redis/redis.go | 12 ++++---- benchmark/client/client.go | 10 +++---- client/balancer/balancer_test.go | 4 +-- component/cache/cache_test.go | 2 +- component/compress/compress.go | 2 +- component/config/config.go | 17 ++++++------ component/constant/constant.go | 2 +- component/metrics/metrics.go | 2 +- component/pprof/pprof.go | 2 +- main.go | 32 +++++++++++----------- store/appendfile/appendfile.go | 14 +++++----- store/appendfile/appendfile_test.go | 2 +- store/appendfile/appendfilemanager.go | 26 +++++++++--------- store/appendfile/appendfilemanager_test.go | 2 +- store/appendfile/keyvalue.go | 2 +- store/meta/meta.go | 14 +++++----- store/meta/meta_test.go | 4 +-- store/store.go | 14 +++++----- store/store_test.go | 8 +++--- store/synchronous/synchronous.go | 30 ++++++++++---------- 23 files changed, 124 insertions(+), 116 deletions(-) diff --git a/Makefile b/Makefile index ed741e7..2e2e761 100644 --- a/Makefile +++ b/Makefile @@ -11,3 +11,10 @@ build: docker:build docker build . -t dkv:latest + +install: + go build -tags=jsoniter -o dkv main.go + mkdir -p /usr/local/dkv/conf + mkdir -p /usr/local/dkv/bin + cp ./resource/conf/* /usr/local/dkv/conf + cp dkv /usr/local/dkv/bin diff --git a/api/kv/kv.go b/api/kv/kv.go index 9aab2df..692b578 100644 --- a/api/kv/kv.go +++ b/api/kv/kv.go @@ -1,14 +1,14 @@ package kv import ( - "dkv/component/cache" - "dkv/component/compress" - "dkv/component/constant" - "dkv/component/logger" - "dkv/component/metrics" - "dkv/store" - "github.com/gin-gonic/gin" - "net/http" + "dkv/component/cache" + "dkv/component/compress" + "dkv/component/constant" + "dkv/component/logger" + "dkv/component/metrics" + "dkv/store" + "github.com/gin-gonic/gin" + "net/http" ) type KV struct { diff --git a/api/oss/oss.go b/api/oss/oss.go index dc003d0..19b0643 100644 --- a/api/oss/oss.go +++ b/api/oss/oss.go @@ -1,14 +1,14 @@ package oss import ( - "crypto/md5" - "dkv/component/constant" - "dkv/component/logger" - "dkv/store" - "encoding/hex" - "github.com/gin-gonic/gin" - "io/ioutil" - "net/http" + "crypto/md5" + "dkv/component/constant" + "dkv/component/logger" + "dkv/store" + "encoding/hex" + "github.com/gin-gonic/gin" + "io/ioutil" + "net/http" ) func Route(engine *gin.Engine) { diff --git a/api/redis/redis.go b/api/redis/redis.go index 74357ae..7ef0df1 100644 --- a/api/redis/redis.go +++ b/api/redis/redis.go @@ -1,12 +1,12 @@ package redis import ( - "dkv/component/constant" - "dkv/component/logger" - "dkv/store" - "fmt" - "github.com/tidwall/redcon" - "strings" + "dkv/component/constant" + "dkv/component/logger" + "dkv/store" + "fmt" + "github.com/tidwall/redcon" + "strings" ) func run() { diff --git a/benchmark/client/client.go b/benchmark/client/client.go index 1b3fb9e..8d31b5e 100644 --- a/benchmark/client/client.go +++ b/benchmark/client/client.go @@ -1,11 +1,11 @@ package client import ( - "dkv/client/ms" - "log" - "math/rand" - "strconv" - "time" + "dkv/client/ms" + "log" + "math/rand" + "strconv" + "time" ) const maxRequestCount = 1000000 diff --git a/client/balancer/balancer_test.go b/client/balancer/balancer_test.go index 2c65362..39ab87f 100644 --- a/client/balancer/balancer_test.go +++ b/client/balancer/balancer_test.go @@ -1,7 +1,7 @@ package balancer import ( - "testing" + "testing" ) func TestBalancer_Choose(t *testing.T) { @@ -14,7 +14,7 @@ func TestBalancer_Choose(t *testing.T) { nodes[node]++ B.Increment() } - t.Logf("%v\n", nodes) + t.Logf("%v\n", nodes) } func BenchmarkBalancer_Choose(b *testing.B) { diff --git a/component/cache/cache_test.go b/component/cache/cache_test.go index 0ee17fe..e99809c 100644 --- a/component/cache/cache_test.go +++ b/component/cache/cache_test.go @@ -1,7 +1,7 @@ package cache import ( - "strconv" + "strconv" "testing" ) diff --git a/component/compress/compress.go b/component/compress/compress.go index bbd768e..6d2c121 100644 --- a/component/compress/compress.go +++ b/component/compress/compress.go @@ -1,7 +1,7 @@ package compress import ( - "dkv/component/constant" + "dkv/component/constant" "github.com/golang/snappy" ) diff --git a/component/config/config.go b/component/config/config.go index f115cba..f1440bb 100644 --- a/component/config/config.go +++ b/component/config/config.go @@ -1,12 +1,12 @@ package config import ( - "flag" - "github.com/gin-gonic/gin" - "github.com/spf13/viper" - "log" - "net/http" - "strings" + "flag" + "github.com/gin-gonic/gin" + "github.com/spf13/viper" + "log" + "net/http" + "strings" ) var ( @@ -24,9 +24,10 @@ func init() { *c = string([]byte(*c)[:i-1]) } } - C.SetConfigName(*c) + C.SetConfigName(*c) C.SetConfigType("yaml") - C.AddConfigPath("/tmp/dkv/conf") + C.AddConfigPath("./resource/conf") + C.AddConfigPath("/usr/local/dkv/conf") C.SetDefault("data.dir", "/tmp/dkv/data") C.SetDefault("data.invalidIndex", false) C.SetDefault("data.compress", false) diff --git a/component/constant/constant.go b/component/constant/constant.go index ad1e22c..4ebd707 100644 --- a/component/constant/constant.go +++ b/component/constant/constant.go @@ -1,7 +1,7 @@ package constant import ( - "dkv/component/config" + "dkv/component/config" "encoding/binary" "errors" ) diff --git a/component/metrics/metrics.go b/component/metrics/metrics.go index 98744c6..d753273 100644 --- a/component/metrics/metrics.go +++ b/component/metrics/metrics.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin" "github.com/prometheus/client_golang/prometheus" "github.com/zsais/go-gin-prometheus" ) diff --git a/component/pprof/pprof.go b/component/pprof/pprof.go index f3e6e94..651d489 100644 --- a/component/pprof/pprof.go +++ b/component/pprof/pprof.go @@ -1,7 +1,7 @@ package pprof import ( - "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin" "net/http/pprof" "strings" ) diff --git a/main.go b/main.go index 18b178e..707c14a 100644 --- a/main.go +++ b/main.go @@ -1,22 +1,22 @@ package main import ( - "dkv/api/kv" - "dkv/api/oss" - "dkv/api/redis" - "dkv/component/cache" - "dkv/component/config" - "dkv/component/logger" - "dkv/component/metrics" - "dkv/component/pprof" - "dkv/store" - _ "dkv/store/synchronous" - "flag" - "fmt" - "github.com/gin-gonic/gin" - "github.com/sirupsen/logrus" - "os" - "os/exec" + "dkv/api/kv" + "dkv/api/oss" + "dkv/api/redis" + "dkv/component/cache" + "dkv/component/config" + "dkv/component/logger" + "dkv/component/metrics" + "dkv/component/pprof" + "dkv/store" + _ "dkv/store/synchronous" + "flag" + "fmt" + "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" + "os" + "os/exec" ) func init() { diff --git a/store/appendfile/appendfile.go b/store/appendfile/appendfile.go index f41378c..2143083 100644 --- a/store/appendfile/appendfile.go +++ b/store/appendfile/appendfile.go @@ -1,13 +1,13 @@ package appendfile import ( - "dkv/component/constant" - "dkv/component/logger" - "fmt" - "os" - "path/filepath" - "strconv" - "sync" + "dkv/component/constant" + "dkv/component/logger" + "fmt" + "os" + "path/filepath" + "strconv" + "sync" ) type appendFile struct { diff --git a/store/appendfile/appendfile_test.go b/store/appendfile/appendfile_test.go index 1c045ec..0754233 100644 --- a/store/appendfile/appendfile_test.go +++ b/store/appendfile/appendfile_test.go @@ -1,7 +1,7 @@ package appendfile import ( - "dkv/component/constant" + "dkv/component/constant" "os" "testing" ) diff --git a/store/appendfile/appendfilemanager.go b/store/appendfile/appendfilemanager.go index c74899f..7045d6b 100644 --- a/store/appendfile/appendfilemanager.go +++ b/store/appendfile/appendfilemanager.go @@ -1,19 +1,19 @@ package appendfile import ( - "bytes" - "dkv/component/constant" - "dkv/component/logger" - "dkv/component/metrics" - "dkv/store/meta" - "fmt" - "io" - "os" - "path/filepath" - "sort" - "sync" - "sync/atomic" - "time" + "bytes" + "dkv/component/constant" + "dkv/component/logger" + "dkv/component/metrics" + "dkv/store/meta" + "fmt" + "io" + "os" + "path/filepath" + "sort" + "sync" + "sync/atomic" + "time" ) type ( diff --git a/store/appendfile/appendfilemanager_test.go b/store/appendfile/appendfilemanager_test.go index e91dfb5..cc1b834 100644 --- a/store/appendfile/appendfilemanager_test.go +++ b/store/appendfile/appendfilemanager_test.go @@ -1,7 +1,7 @@ package appendfile import ( - "dkv/component/constant" + "dkv/component/constant" "os" "strconv" "testing" diff --git a/store/appendfile/keyvalue.go b/store/appendfile/keyvalue.go index 8e8beca..35c17b0 100644 --- a/store/appendfile/keyvalue.go +++ b/store/appendfile/keyvalue.go @@ -1,7 +1,7 @@ package appendfile import ( - "dkv/component/constant" + "dkv/component/constant" "errors" "hash/crc32" "math" diff --git a/store/meta/meta.go b/store/meta/meta.go index e6a3926..5c38312 100644 --- a/store/meta/meta.go +++ b/store/meta/meta.go @@ -1,13 +1,13 @@ package meta import ( - "dkv/component/constant" - "dkv/component/logger" - "encoding/json" - "io/ioutil" - "os" - "path/filepath" - "sort" + "dkv/component/constant" + "dkv/component/logger" + "encoding/json" + "io/ioutil" + "os" + "path/filepath" + "sort" ) var M *meta diff --git a/store/meta/meta_test.go b/store/meta/meta_test.go index fc50d0a..9c16ede 100644 --- a/store/meta/meta_test.go +++ b/store/meta/meta_test.go @@ -1,8 +1,8 @@ package meta import ( - "dkv/component/constant" - "os" + "dkv/component/constant" + "os" "testing" "time" ) diff --git a/store/store.go b/store/store.go index ba11eac..2265d93 100644 --- a/store/store.go +++ b/store/store.go @@ -1,13 +1,13 @@ package store import ( - "crypto/md5" - "dkv/component/constant" - "dkv/component/logger" - "dkv/store/appendfile" - "encoding/hex" - "math" - "sync" + "crypto/md5" + "dkv/component/constant" + "dkv/component/logger" + "dkv/store/appendfile" + "encoding/hex" + "math" + "sync" ) var ( diff --git a/store/store_test.go b/store/store_test.go index 82864b3..d55bee3 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -1,10 +1,10 @@ package store import ( - "dkv/component/constant" - "os" - "strconv" - "testing" + "dkv/component/constant" + "os" + "strconv" + "testing" ) var doc = make([]byte, 1024) diff --git a/store/synchronous/synchronous.go b/store/synchronous/synchronous.go index 111f8f2..be4e4be 100644 --- a/store/synchronous/synchronous.go +++ b/store/synchronous/synchronous.go @@ -1,19 +1,19 @@ package synchronous import ( - "dkv/component/constant" - "dkv/component/logger" - "dkv/store" - "dkv/store/meta" - "fmt" - "io" - "net" - "os" - "path/filepath" - "strconv" - "strings" - "sync" - "time" + "dkv/component/constant" + "dkv/component/logger" + "dkv/store" + "dkv/store/meta" + "fmt" + "io" + "net" + "os" + "path/filepath" + "strconv" + "strings" + "sync" + "time" ) type Synchronous struct { @@ -22,12 +22,12 @@ type Synchronous struct { } var ( - D *Synchronous + S *Synchronous ) func init() { var err error - D, err = New() + S, err = New() if err != nil { logger.L.Fatalf("Fatal error synchronous: %v\n", err) }