refactor project structure

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"
 )
 

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"

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) {

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"
 )
 

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"
 )
 

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 (

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

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)

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"

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"
 )
 

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"

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

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

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"

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"

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"

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"
 )

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"
 )

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"
 )

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"
 )

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"
 )

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"

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"
 )
 

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"
 )

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

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"
 )
 

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"
 )
 

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"
 )

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"
 )

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"

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"

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"
 )

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"
 )
 

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

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"

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"
 )
 

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 {

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"
 )
 

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"

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"
 )
 

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"

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"
 )

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"
 )

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"
 )
 

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"

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"

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"

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"