diff --git a/src/cluster/client.go b/cluster/client.go similarity index 95% rename from src/cluster/client.go rename to cluster/client.go index 9064f20f..5e3423f4 100644 --- a/src/cluster/client.go +++ b/cluster/client.go @@ -3,7 +3,7 @@ package cluster import ( "context" "errors" - "github.com/hdt3213/godis/src/redis/client" + "github.com/hdt3213/godis/redis/client" "github.com/jolestar/go-commons-pool/v2" ) diff --git a/src/cluster/cluster.go b/cluster/cluster.go similarity index 89% rename from src/cluster/cluster.go rename to cluster/cluster.go index b3d67b61..da22207c 100644 --- a/src/cluster/cluster.go +++ b/cluster/cluster.go @@ -3,14 +3,14 @@ package cluster import ( "context" "fmt" - "github.com/hdt3213/godis/src/cluster/idgenerator" - "github.com/hdt3213/godis/src/config" - "github.com/hdt3213/godis/src/datastruct/dict" - "github.com/hdt3213/godis/src/db" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/lib/consistenthash" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/cluster/idgenerator" + "github.com/hdt3213/godis/config" + "github.com/hdt3213/godis/datastruct/dict" + "github.com/hdt3213/godis/db" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/lib/consistenthash" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/redis/reply" "github.com/jolestar/go-commons-pool/v2" "runtime/debug" "strings" diff --git a/src/cluster/com.go b/cluster/com.go similarity index 92% rename from src/cluster/com.go rename to cluster/com.go index a215be65..7dfeb43a 100644 --- a/src/cluster/com.go +++ b/cluster/com.go @@ -4,9 +4,9 @@ package cluster import ( "context" "errors" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/client" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/client" + "github.com/hdt3213/godis/redis/reply" ) func (cluster *Cluster) getPeerClient(peer string) (*client.Client, error) { diff --git a/src/cluster/del.go b/cluster/del.go similarity index 96% rename from src/cluster/del.go rename to cluster/del.go index fd343279..c21f299f 100644 --- a/src/cluster/del.go +++ b/cluster/del.go @@ -1,8 +1,8 @@ package cluster import ( - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "strconv" ) diff --git a/src/cluster/idgenerator/snowflake.go b/cluster/idgenerator/snowflake.go similarity index 100% rename from src/cluster/idgenerator/snowflake.go rename to cluster/idgenerator/snowflake.go diff --git a/src/cluster/mset.go b/cluster/mset.go similarity index 96% rename from src/cluster/mset.go rename to cluster/mset.go index e8679ecb..4fba3913 100644 --- a/src/cluster/mset.go +++ b/cluster/mset.go @@ -2,9 +2,9 @@ package cluster import ( "fmt" - "github.com/hdt3213/godis/src/db" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/db" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "strconv" ) diff --git a/src/cluster/pubsub.go b/cluster/pubsub.go similarity index 91% rename from src/cluster/pubsub.go rename to cluster/pubsub.go index 0a77651f..3df95e69 100644 --- a/src/cluster/pubsub.go +++ b/cluster/pubsub.go @@ -1,9 +1,9 @@ package cluster import ( - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/redis/reply" ) const ( diff --git a/src/cluster/rename.go b/cluster/rename.go similarity index 91% rename from src/cluster/rename.go rename to cluster/rename.go index d71f8bb3..35ca80be 100644 --- a/src/cluster/rename.go +++ b/cluster/rename.go @@ -1,8 +1,8 @@ package cluster import ( - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" ) // TODO: support multiplex slots diff --git a/src/cluster/router.go b/cluster/router.go similarity index 98% rename from src/cluster/router.go rename to cluster/router.go index 2dce6fb8..bcef7e7b 100644 --- a/src/cluster/router.go +++ b/cluster/router.go @@ -1,6 +1,6 @@ package cluster -import "github.com/hdt3213/godis/src/interface/redis" +import "github.com/hdt3213/godis/interface/redis" func MakeRouter() map[string]CmdFunc { routerMap := make(map[string]CmdFunc) diff --git a/src/cluster/transaction.go b/cluster/transaction.go similarity index 96% rename from src/cluster/transaction.go rename to cluster/transaction.go index cadc8236..aa91b71c 100644 --- a/src/cluster/transaction.go +++ b/cluster/transaction.go @@ -3,11 +3,11 @@ package cluster import ( "errors" "fmt" - "github.com/hdt3213/godis/src/db" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/lib/timewheel" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/db" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/lib/timewheel" + "github.com/hdt3213/godis/redis/reply" "strconv" "strings" "sync" diff --git a/src/cmd/main.go b/cmd/main.go similarity index 75% rename from src/cmd/main.go rename to cmd/main.go index 1beba67f..b34f4cc5 100644 --- a/src/cmd/main.go +++ b/cmd/main.go @@ -2,10 +2,10 @@ package main import ( "fmt" - "github.com/hdt3213/godis/src/config" - "github.com/hdt3213/godis/src/lib/logger" - RedisServer "github.com/hdt3213/godis/src/redis/server" - "github.com/hdt3213/godis/src/tcp" + "github.com/hdt3213/godis/config" + "github.com/hdt3213/godis/lib/logger" + RedisServer "github.com/hdt3213/godis/redis/server" + "github.com/hdt3213/godis/tcp" "os" ) diff --git a/src/config/config.go b/config/config.go similarity index 98% rename from src/config/config.go rename to config/config.go index c3632e57..5ecff0dc 100644 --- a/src/config/config.go +++ b/config/config.go @@ -2,7 +2,7 @@ package config import ( "bufio" - "github.com/hdt3213/godis/src/lib/logger" + "github.com/hdt3213/godis/lib/logger" "log" "os" "reflect" diff --git a/src/datastruct/dict/concurrent.go b/datastruct/dict/concurrent.go similarity index 100% rename from src/datastruct/dict/concurrent.go rename to datastruct/dict/concurrent.go diff --git a/src/datastruct/dict/dict.go b/datastruct/dict/dict.go similarity index 100% rename from src/datastruct/dict/dict.go rename to datastruct/dict/dict.go diff --git a/src/datastruct/dict/dict_test.go b/datastruct/dict/dict_test.go similarity index 100% rename from src/datastruct/dict/dict_test.go rename to datastruct/dict/dict_test.go diff --git a/src/datastruct/dict/simple.go b/datastruct/dict/simple.go similarity index 100% rename from src/datastruct/dict/simple.go rename to datastruct/dict/simple.go diff --git a/src/datastruct/list/linked.go b/datastruct/list/linked.go similarity index 98% rename from src/datastruct/list/linked.go rename to datastruct/list/linked.go index 261169e2..dd8c3e57 100644 --- a/src/datastruct/list/linked.go +++ b/datastruct/list/linked.go @@ -1,6 +1,6 @@ package list -import "github.com/hdt3213/godis/src/datastruct/utils" +import "github.com/hdt3213/godis/datastruct/utils" type LinkedList struct { first *node diff --git a/src/datastruct/list/linked_test.go b/datastruct/list/linked_test.go similarity index 100% rename from src/datastruct/list/linked_test.go rename to datastruct/list/linked_test.go diff --git a/src/datastruct/lock/lock_map.go b/datastruct/lock/lock_map.go similarity index 100% rename from src/datastruct/lock/lock_map.go rename to datastruct/lock/lock_map.go diff --git a/src/datastruct/set/set.go b/datastruct/set/set.go similarity index 97% rename from src/datastruct/set/set.go rename to datastruct/set/set.go index 595170f1..4fbc444d 100644 --- a/src/datastruct/set/set.go +++ b/datastruct/set/set.go @@ -1,6 +1,6 @@ package set -import "github.com/hdt3213/godis/src/datastruct/dict" +import "github.com/hdt3213/godis/datastruct/dict" type Set struct { dict dict.Dict diff --git a/src/datastruct/set/set_test.go b/datastruct/set/set_test.go similarity index 100% rename from src/datastruct/set/set_test.go rename to datastruct/set/set_test.go diff --git a/src/datastruct/sortedset/border.go b/datastruct/sortedset/border.go similarity index 100% rename from src/datastruct/sortedset/border.go rename to datastruct/sortedset/border.go diff --git a/src/datastruct/sortedset/skiplist.go b/datastruct/sortedset/skiplist.go similarity index 100% rename from src/datastruct/sortedset/skiplist.go rename to datastruct/sortedset/skiplist.go diff --git a/src/datastruct/sortedset/sortedset.go b/datastruct/sortedset/sortedset.go similarity index 100% rename from src/datastruct/sortedset/sortedset.go rename to datastruct/sortedset/sortedset.go diff --git a/src/datastruct/utils/utils.go b/datastruct/utils/utils.go similarity index 100% rename from src/datastruct/utils/utils.go rename to datastruct/utils/utils.go diff --git a/src/db/aof.go b/db/aof.go similarity index 93% rename from src/db/aof.go rename to db/aof.go index 2f4330bb..578250df 100644 --- a/src/db/aof.go +++ b/db/aof.go @@ -1,16 +1,16 @@ package db import ( - "github.com/hdt3213/godis/src/config" - "github.com/hdt3213/godis/src/datastruct/dict" - List "github.com/hdt3213/godis/src/datastruct/list" - "github.com/hdt3213/godis/src/datastruct/lock" - "github.com/hdt3213/godis/src/datastruct/set" - SortedSet "github.com/hdt3213/godis/src/datastruct/sortedset" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/lib/utils" - "github.com/hdt3213/godis/src/redis/parser" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/config" + "github.com/hdt3213/godis/datastruct/dict" + List "github.com/hdt3213/godis/datastruct/list" + "github.com/hdt3213/godis/datastruct/lock" + "github.com/hdt3213/godis/datastruct/set" + SortedSet "github.com/hdt3213/godis/datastruct/sortedset" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/lib/utils" + "github.com/hdt3213/godis/redis/parser" + "github.com/hdt3213/godis/redis/reply" "io" "io/ioutil" "os" diff --git a/src/db/aof_test.go b/db/aof_test.go similarity index 97% rename from src/db/aof_test.go rename to db/aof_test.go index 42aecdea..a9e4911c 100644 --- a/src/db/aof_test.go +++ b/db/aof_test.go @@ -1,8 +1,8 @@ package db import ( - "github.com/hdt3213/godis/src/config" - "github.com/hdt3213/godis/src/datastruct/utils" + "github.com/hdt3213/godis/config" + "github.com/hdt3213/godis/datastruct/utils" "io/ioutil" "os" "path" diff --git a/src/db/db.go b/db/db.go similarity index 94% rename from src/db/db.go rename to db/db.go index 35bc5d49..54de57e0 100644 --- a/src/db/db.go +++ b/db/db.go @@ -2,14 +2,14 @@ package db import ( "fmt" - "github.com/hdt3213/godis/src/config" - "github.com/hdt3213/godis/src/datastruct/dict" - "github.com/hdt3213/godis/src/datastruct/lock" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/lib/timewheel" - "github.com/hdt3213/godis/src/pubsub" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/config" + "github.com/hdt3213/godis/datastruct/dict" + "github.com/hdt3213/godis/datastruct/lock" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/lib/timewheel" + "github.com/hdt3213/godis/pubsub" + "github.com/hdt3213/godis/redis/reply" "os" "runtime/debug" "strings" diff --git a/src/db/geo.go b/db/geo.go similarity index 97% rename from src/db/geo.go rename to db/geo.go index b6d50983..2785f9d7 100644 --- a/src/db/geo.go +++ b/db/geo.go @@ -2,10 +2,10 @@ package db import ( "fmt" - "github.com/hdt3213/godis/src/datastruct/sortedset" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/lib/geohash" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/datastruct/sortedset" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/lib/geohash" + "github.com/hdt3213/godis/redis/reply" "strconv" "strings" ) diff --git a/src/db/geo_test.go b/db/geo_test.go similarity index 95% rename from src/db/geo_test.go rename to db/geo_test.go index 0138eb00..1c542b9d 100644 --- a/src/db/geo_test.go +++ b/db/geo_test.go @@ -2,8 +2,8 @@ package db import ( "fmt" - "github.com/hdt3213/godis/src/redis/reply" - "github.com/hdt3213/godis/src/redis/reply/asserts" + "github.com/hdt3213/godis/redis/reply" + "github.com/hdt3213/godis/redis/reply/asserts" "strconv" "testing" ) diff --git a/src/db/hash.go b/db/hash.go similarity index 98% rename from src/db/hash.go rename to db/hash.go index 314e113a..35ec04f3 100644 --- a/src/db/hash.go +++ b/db/hash.go @@ -1,9 +1,9 @@ package db import ( - Dict "github.com/hdt3213/godis/src/datastruct/dict" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + Dict "github.com/hdt3213/godis/datastruct/dict" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "github.com/shopspring/decimal" "strconv" ) diff --git a/src/db/hash_test.go b/db/hash_test.go similarity index 97% rename from src/db/hash_test.go rename to db/hash_test.go index 7dec1844..aef2dfd4 100644 --- a/src/db/hash_test.go +++ b/db/hash_test.go @@ -2,9 +2,9 @@ package db import ( "fmt" - "github.com/hdt3213/godis/src/datastruct/utils" - "github.com/hdt3213/godis/src/redis/reply" - "github.com/hdt3213/godis/src/redis/reply/asserts" + "github.com/hdt3213/godis/datastruct/utils" + "github.com/hdt3213/godis/redis/reply" + "github.com/hdt3213/godis/redis/reply/asserts" "strconv" "testing" ) diff --git a/src/db/keys.go b/db/keys.go similarity index 96% rename from src/db/keys.go rename to db/keys.go index f8f30c38..7b2e2cef 100644 --- a/src/db/keys.go +++ b/db/keys.go @@ -1,13 +1,13 @@ package db import ( - "github.com/hdt3213/godis/src/datastruct/dict" - "github.com/hdt3213/godis/src/datastruct/list" - "github.com/hdt3213/godis/src/datastruct/set" - "github.com/hdt3213/godis/src/datastruct/sortedset" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/lib/wildcard" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/datastruct/dict" + "github.com/hdt3213/godis/datastruct/list" + "github.com/hdt3213/godis/datastruct/set" + "github.com/hdt3213/godis/datastruct/sortedset" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/lib/wildcard" + "github.com/hdt3213/godis/redis/reply" "strconv" "time" ) diff --git a/src/db/keys_test.go b/db/keys_test.go similarity index 98% rename from src/db/keys_test.go rename to db/keys_test.go index 487605cd..2e472014 100644 --- a/src/db/keys_test.go +++ b/db/keys_test.go @@ -2,8 +2,8 @@ package db import ( "fmt" - "github.com/hdt3213/godis/src/redis/reply" - "github.com/hdt3213/godis/src/redis/reply/asserts" + "github.com/hdt3213/godis/redis/reply" + "github.com/hdt3213/godis/redis/reply/asserts" "strconv" "testing" "time" diff --git a/src/db/list.go b/db/list.go similarity index 98% rename from src/db/list.go rename to db/list.go index 751f513e..dba57a27 100644 --- a/src/db/list.go +++ b/db/list.go @@ -1,9 +1,9 @@ package db import ( - List "github.com/hdt3213/godis/src/datastruct/list" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + List "github.com/hdt3213/godis/datastruct/list" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "strconv" ) diff --git a/src/db/list_test.go b/db/list_test.go similarity index 99% rename from src/db/list_test.go rename to db/list_test.go index 196ea691..a2781011 100644 --- a/src/db/list_test.go +++ b/db/list_test.go @@ -2,8 +2,8 @@ package db import ( "fmt" - "github.com/hdt3213/godis/src/datastruct/utils" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/datastruct/utils" + "github.com/hdt3213/godis/redis/reply" "strconv" "testing" ) diff --git a/src/db/router.go b/db/router.go similarity index 100% rename from src/db/router.go rename to db/router.go diff --git a/src/db/server.go b/db/server.go similarity index 77% rename from src/db/server.go rename to db/server.go index 400cdda0..3a981b2f 100644 --- a/src/db/server.go +++ b/db/server.go @@ -1,8 +1,8 @@ package db import ( - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" ) // Ping the server diff --git a/src/db/server_test.go b/db/server_test.go similarity index 87% rename from src/db/server_test.go rename to db/server_test.go index d1bc25d7..fbe6c5a2 100644 --- a/src/db/server_test.go +++ b/db/server_test.go @@ -1,7 +1,7 @@ package db import ( - "github.com/hdt3213/godis/src/redis/reply/asserts" + "github.com/hdt3213/godis/redis/reply/asserts" "testing" ) diff --git a/src/db/set.go b/db/set.go similarity index 98% rename from src/db/set.go rename to db/set.go index 6c6eb87e..c65873ee 100644 --- a/src/db/set.go +++ b/db/set.go @@ -1,9 +1,9 @@ package db import ( - HashSet "github.com/hdt3213/godis/src/datastruct/set" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + HashSet "github.com/hdt3213/godis/datastruct/set" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "strconv" ) diff --git a/src/db/set_test.go b/db/set_test.go similarity index 97% rename from src/db/set_test.go rename to db/set_test.go index 26e13f13..34977000 100644 --- a/src/db/set_test.go +++ b/db/set_test.go @@ -2,8 +2,8 @@ package db import ( "fmt" - "github.com/hdt3213/godis/src/redis/reply" - "github.com/hdt3213/godis/src/redis/reply/asserts" + "github.com/hdt3213/godis/redis/reply" + "github.com/hdt3213/godis/redis/reply/asserts" "strconv" "testing" ) diff --git a/src/db/sortedset.go b/db/sortedset.go similarity index 98% rename from src/db/sortedset.go rename to db/sortedset.go index 2754d8e1..e7c68127 100644 --- a/src/db/sortedset.go +++ b/db/sortedset.go @@ -1,9 +1,9 @@ package db import ( - SortedSet "github.com/hdt3213/godis/src/datastruct/sortedset" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + SortedSet "github.com/hdt3213/godis/datastruct/sortedset" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "strconv" "strings" ) diff --git a/src/db/sortedset_test.go b/db/sortedset_test.go similarity index 99% rename from src/db/sortedset_test.go rename to db/sortedset_test.go index ee100c8a..b227d08f 100644 --- a/src/db/sortedset_test.go +++ b/db/sortedset_test.go @@ -1,7 +1,7 @@ package db import ( - "github.com/hdt3213/godis/src/redis/reply/asserts" + "github.com/hdt3213/godis/redis/reply/asserts" "math/rand" "strconv" "testing" diff --git a/src/db/string.go b/db/string.go similarity index 99% rename from src/db/string.go rename to db/string.go index bfe11025..48f2f885 100644 --- a/src/db/string.go +++ b/db/string.go @@ -1,8 +1,8 @@ package db import ( - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "github.com/shopspring/decimal" "strconv" "strings" diff --git a/src/db/string_test.go b/db/string_test.go similarity index 98% rename from src/db/string_test.go rename to db/string_test.go index c2d24903..9128814a 100644 --- a/src/db/string_test.go +++ b/db/string_test.go @@ -2,9 +2,9 @@ package db import ( "fmt" - "github.com/hdt3213/godis/src/datastruct/utils" - "github.com/hdt3213/godis/src/redis/reply" - "github.com/hdt3213/godis/src/redis/reply/asserts" + "github.com/hdt3213/godis/datastruct/utils" + "github.com/hdt3213/godis/redis/reply" + "github.com/hdt3213/godis/redis/reply/asserts" "strconv" "testing" ) diff --git a/src/db/util_test.go b/db/util_test.go similarity index 85% rename from src/db/util_test.go rename to db/util_test.go index b3f5487e..e7d1ffde 100644 --- a/src/db/util_test.go +++ b/db/util_test.go @@ -1,8 +1,8 @@ package db import ( - "github.com/hdt3213/godis/src/datastruct/dict" - "github.com/hdt3213/godis/src/datastruct/lock" + "github.com/hdt3213/godis/datastruct/dict" + "github.com/hdt3213/godis/datastruct/lock" "math/rand" ) diff --git a/src/interface/db/db.go b/interface/db/db.go similarity index 72% rename from src/interface/db/db.go rename to interface/db/db.go index 0fe796e3..f2919efc 100644 --- a/src/interface/db/db.go +++ b/interface/db/db.go @@ -1,6 +1,6 @@ package db -import "github.com/hdt3213/godis/src/interface/redis" +import "github.com/hdt3213/godis/interface/redis" type DB interface { Exec(client redis.Connection, args [][]byte) redis.Reply diff --git a/src/interface/redis/client.go b/interface/redis/client.go similarity index 100% rename from src/interface/redis/client.go rename to interface/redis/client.go diff --git a/src/interface/redis/reply.go b/interface/redis/reply.go similarity index 100% rename from src/interface/redis/reply.go rename to interface/redis/reply.go diff --git a/src/interface/tcp/handler.go b/interface/tcp/handler.go similarity index 100% rename from src/interface/tcp/handler.go rename to interface/tcp/handler.go diff --git a/src/lib/consistenthash/consistenthash.go b/lib/consistenthash/consistenthash.go similarity index 100% rename from src/lib/consistenthash/consistenthash.go rename to lib/consistenthash/consistenthash.go diff --git a/src/lib/files/files.go b/lib/files/files.go similarity index 100% rename from src/lib/files/files.go rename to lib/files/files.go diff --git a/src/lib/geohash/geohash.go b/lib/geohash/geohash.go similarity index 100% rename from src/lib/geohash/geohash.go rename to lib/geohash/geohash.go diff --git a/src/lib/geohash/geohash_test.go b/lib/geohash/geohash_test.go similarity index 100% rename from src/lib/geohash/geohash_test.go rename to lib/geohash/geohash_test.go diff --git a/src/lib/geohash/neighbor.go b/lib/geohash/neighbor.go similarity index 100% rename from src/lib/geohash/neighbor.go rename to lib/geohash/neighbor.go diff --git a/src/lib/logger/logger.go b/lib/logger/logger.go similarity index 97% rename from src/lib/logger/logger.go rename to lib/logger/logger.go index 50836c0b..6e70dd8f 100644 --- a/src/lib/logger/logger.go +++ b/lib/logger/logger.go @@ -2,7 +2,7 @@ package logger import ( "fmt" - "github.com/hdt3213/godis/src/lib/files" + "github.com/hdt3213/godis/lib/files" "io" "log" "os" diff --git a/src/lib/sync/atomic/bool.go b/lib/sync/atomic/bool.go similarity index 100% rename from src/lib/sync/atomic/bool.go rename to lib/sync/atomic/bool.go diff --git a/src/lib/sync/wait/wait.go b/lib/sync/wait/wait.go similarity index 100% rename from src/lib/sync/wait/wait.go rename to lib/sync/wait/wait.go diff --git a/src/lib/timewheel/delay.go b/lib/timewheel/delay.go similarity index 100% rename from src/lib/timewheel/delay.go rename to lib/timewheel/delay.go diff --git a/src/lib/timewheel/timewheel.go b/lib/timewheel/timewheel.go similarity index 98% rename from src/lib/timewheel/timewheel.go rename to lib/timewheel/timewheel.go index dd6db1c9..7e274211 100644 --- a/src/lib/timewheel/timewheel.go +++ b/lib/timewheel/timewheel.go @@ -2,7 +2,7 @@ package timewheel import ( "container/list" - "github.com/hdt3213/godis/src/lib/logger" + "github.com/hdt3213/godis/lib/logger" "time" ) diff --git a/src/lib/utils/limited_reader.go b/lib/utils/limited_reader.go similarity index 100% rename from src/lib/utils/limited_reader.go rename to lib/utils/limited_reader.go diff --git a/src/lib/wildcard/wildcard.go b/lib/wildcard/wildcard.go similarity index 100% rename from src/lib/wildcard/wildcard.go rename to lib/wildcard/wildcard.go diff --git a/src/lib/wildcard/wildcard_test.go b/lib/wildcard/wildcard_test.go similarity index 100% rename from src/lib/wildcard/wildcard_test.go rename to lib/wildcard/wildcard_test.go diff --git a/src/pubsub/hub.go b/pubsub/hub.go similarity index 71% rename from src/pubsub/hub.go rename to pubsub/hub.go index 9e5fecaf..9b5ef14b 100644 --- a/src/pubsub/hub.go +++ b/pubsub/hub.go @@ -1,8 +1,8 @@ package pubsub import ( - "github.com/hdt3213/godis/src/datastruct/dict" - "github.com/hdt3213/godis/src/datastruct/lock" + "github.com/hdt3213/godis/datastruct/dict" + "github.com/hdt3213/godis/datastruct/lock" ) type Hub struct { diff --git a/src/pubsub/pubsub.go b/pubsub/pubsub.go similarity index 96% rename from src/pubsub/pubsub.go rename to pubsub/pubsub.go index 98e66a28..00949f23 100644 --- a/src/pubsub/pubsub.go +++ b/pubsub/pubsub.go @@ -1,9 +1,9 @@ package pubsub import ( - "github.com/hdt3213/godis/src/datastruct/list" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/datastruct/list" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "strconv" ) diff --git a/src/redis/client/client.go b/redis/client/client.go similarity index 94% rename from src/redis/client/client.go rename to redis/client/client.go index 09befaa2..6e30a105 100644 --- a/src/redis/client/client.go +++ b/redis/client/client.go @@ -1,11 +1,11 @@ package client import ( - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/lib/sync/wait" - "github.com/hdt3213/godis/src/redis/parser" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/lib/sync/wait" + "github.com/hdt3213/godis/redis/parser" + "github.com/hdt3213/godis/redis/reply" "net" "runtime/debug" "sync" diff --git a/src/redis/client/client_test.go b/redis/client/client_test.go similarity index 96% rename from src/redis/client/client_test.go rename to redis/client/client_test.go index 36fd3ea8..0574653a 100644 --- a/src/redis/client/client_test.go +++ b/redis/client/client_test.go @@ -1,8 +1,8 @@ package client import ( - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/redis/reply" "testing" ) diff --git a/src/redis/parser/parser.go b/redis/parser/parser.go similarity index 97% rename from src/redis/parser/parser.go rename to redis/parser/parser.go index a7739ede..2bf1c45b 100644 --- a/src/redis/parser/parser.go +++ b/redis/parser/parser.go @@ -3,9 +3,9 @@ package parser import ( "bufio" "errors" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/redis/reply" "io" "runtime/debug" "strconv" diff --git a/src/redis/parser/parser_test.go b/redis/parser/parser_test.go similarity index 89% rename from src/redis/parser/parser_test.go rename to redis/parser/parser_test.go index 55a247fc..fe55d6ed 100644 --- a/src/redis/parser/parser_test.go +++ b/redis/parser/parser_test.go @@ -2,9 +2,9 @@ package parser import ( "bytes" - "github.com/hdt3213/godis/src/datastruct/utils" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/datastruct/utils" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "io" "testing" ) diff --git a/src/redis/reply/asserts/assert.go b/redis/reply/asserts/assert.go similarity index 95% rename from src/redis/reply/asserts/assert.go rename to redis/reply/asserts/assert.go index 759d04ef..7be7c9b8 100644 --- a/src/redis/reply/asserts/assert.go +++ b/redis/reply/asserts/assert.go @@ -2,9 +2,9 @@ package asserts import ( "fmt" - "github.com/hdt3213/godis/src/datastruct/utils" - "github.com/hdt3213/godis/src/interface/redis" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/datastruct/utils" + "github.com/hdt3213/godis/interface/redis" + "github.com/hdt3213/godis/redis/reply" "runtime" "testing" ) diff --git a/src/redis/reply/consts.go b/redis/reply/consts.go similarity index 100% rename from src/redis/reply/consts.go rename to redis/reply/consts.go diff --git a/src/redis/reply/errors.go b/redis/reply/errors.go similarity index 100% rename from src/redis/reply/errors.go rename to redis/reply/errors.go diff --git a/src/redis/reply/reply.go b/redis/reply/reply.go similarity index 97% rename from src/redis/reply/reply.go rename to redis/reply/reply.go index f11f7665..464ebe86 100644 --- a/src/redis/reply/reply.go +++ b/redis/reply/reply.go @@ -2,7 +2,7 @@ package reply import ( "bytes" - "github.com/hdt3213/godis/src/interface/redis" + "github.com/hdt3213/godis/interface/redis" "strconv" ) diff --git a/src/redis/server/client.go b/redis/server/client.go similarity index 96% rename from src/redis/server/client.go rename to redis/server/client.go index fe638f30..1863b61c 100644 --- a/src/redis/server/client.go +++ b/redis/server/client.go @@ -1,7 +1,7 @@ package server import ( - "github.com/hdt3213/godis/src/lib/sync/wait" + "github.com/hdt3213/godis/lib/sync/wait" "net" "sync" "time" diff --git a/src/redis/server/handler.go b/redis/server/handler.go similarity index 86% rename from src/redis/server/handler.go rename to redis/server/handler.go index eefdd178..b81dcc4d 100644 --- a/src/redis/server/handler.go +++ b/redis/server/handler.go @@ -6,14 +6,14 @@ package server import ( "context" - "github.com/hdt3213/godis/src/cluster" - "github.com/hdt3213/godis/src/config" - DBImpl "github.com/hdt3213/godis/src/db" - "github.com/hdt3213/godis/src/interface/db" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/lib/sync/atomic" - "github.com/hdt3213/godis/src/redis/parser" - "github.com/hdt3213/godis/src/redis/reply" + "github.com/hdt3213/godis/cluster" + "github.com/hdt3213/godis/config" + DBImpl "github.com/hdt3213/godis/db" + "github.com/hdt3213/godis/interface/db" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/lib/sync/atomic" + "github.com/hdt3213/godis/redis/parser" + "github.com/hdt3213/godis/redis/reply" "io" "net" "strings" diff --git a/src/tcp/echo.go b/tcp/echo.go similarity index 91% rename from src/tcp/echo.go rename to tcp/echo.go index e66ddcb4..1f1c2a0c 100644 --- a/src/tcp/echo.go +++ b/tcp/echo.go @@ -7,9 +7,9 @@ package tcp import ( "bufio" "context" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/lib/sync/atomic" - "github.com/hdt3213/godis/src/lib/sync/wait" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/lib/sync/atomic" + "github.com/hdt3213/godis/lib/sync/wait" "io" "net" "sync" diff --git a/src/tcp/echo_test.go b/tcp/echo_test.go similarity index 100% rename from src/tcp/echo_test.go rename to tcp/echo_test.go diff --git a/src/tcp/server.go b/tcp/server.go similarity index 93% rename from src/tcp/server.go rename to tcp/server.go index 79a0d642..7ea6a500 100644 --- a/src/tcp/server.go +++ b/tcp/server.go @@ -7,9 +7,9 @@ package tcp import ( "context" "fmt" - "github.com/hdt3213/godis/src/interface/tcp" - "github.com/hdt3213/godis/src/lib/logger" - "github.com/hdt3213/godis/src/lib/sync/atomic" + "github.com/hdt3213/godis/interface/tcp" + "github.com/hdt3213/godis/lib/logger" + "github.com/hdt3213/godis/lib/sync/atomic" "net" "os" "os/signal"