refactor project structure

This commit is contained in:
hdt3213
2021-05-02 14:54:42 +08:00
parent bb9c140653
commit f29298cc68
78 changed files with 140 additions and 140 deletions

View File

@@ -3,7 +3,7 @@ package cluster
import ( import (
"context" "context"
"errors" "errors"
"github.com/hdt3213/godis/src/redis/client" "github.com/hdt3213/godis/redis/client"
"github.com/jolestar/go-commons-pool/v2" "github.com/jolestar/go-commons-pool/v2"
) )

View File

@@ -3,14 +3,14 @@ package cluster
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/hdt3213/godis/src/cluster/idgenerator" "github.com/hdt3213/godis/cluster/idgenerator"
"github.com/hdt3213/godis/src/config" "github.com/hdt3213/godis/config"
"github.com/hdt3213/godis/src/datastruct/dict" "github.com/hdt3213/godis/datastruct/dict"
"github.com/hdt3213/godis/src/db" "github.com/hdt3213/godis/db"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/lib/consistenthash" "github.com/hdt3213/godis/lib/consistenthash"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"github.com/jolestar/go-commons-pool/v2" "github.com/jolestar/go-commons-pool/v2"
"runtime/debug" "runtime/debug"
"strings" "strings"

View File

@@ -4,9 +4,9 @@ package cluster
import ( import (
"context" "context"
"errors" "errors"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/client" "github.com/hdt3213/godis/redis/client"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
) )
func (cluster *Cluster) getPeerClient(peer string) (*client.Client, error) { func (cluster *Cluster) getPeerClient(peer string) (*client.Client, error) {

View File

@@ -1,8 +1,8 @@
package cluster package cluster
import ( import (
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
) )

View File

@@ -2,9 +2,9 @@ package cluster
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/db" "github.com/hdt3213/godis/db"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
) )

View File

@@ -1,9 +1,9 @@
package cluster package cluster
import ( import (
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
) )
const ( const (

View File

@@ -1,8 +1,8 @@
package cluster package cluster
import ( import (
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
) )
// TODO: support multiplex slots // TODO: support multiplex slots

View File

@@ -1,6 +1,6 @@
package cluster package cluster
import "github.com/hdt3213/godis/src/interface/redis" import "github.com/hdt3213/godis/interface/redis"
func MakeRouter() map[string]CmdFunc { func MakeRouter() map[string]CmdFunc {
routerMap := make(map[string]CmdFunc) routerMap := make(map[string]CmdFunc)

View File

@@ -3,11 +3,11 @@ package cluster
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/hdt3213/godis/src/db" "github.com/hdt3213/godis/db"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/lib/timewheel" "github.com/hdt3213/godis/lib/timewheel"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"

View File

@@ -2,10 +2,10 @@ package main
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/config" "github.com/hdt3213/godis/config"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
RedisServer "github.com/hdt3213/godis/src/redis/server" RedisServer "github.com/hdt3213/godis/redis/server"
"github.com/hdt3213/godis/src/tcp" "github.com/hdt3213/godis/tcp"
"os" "os"
) )

View File

@@ -2,7 +2,7 @@ package config
import ( import (
"bufio" "bufio"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"log" "log"
"os" "os"
"reflect" "reflect"

View File

@@ -1,6 +1,6 @@
package list package list
import "github.com/hdt3213/godis/src/datastruct/utils" import "github.com/hdt3213/godis/datastruct/utils"
type LinkedList struct { type LinkedList struct {
first *node first *node

View File

@@ -1,6 +1,6 @@
package set package set
import "github.com/hdt3213/godis/src/datastruct/dict" import "github.com/hdt3213/godis/datastruct/dict"
type Set struct { type Set struct {
dict dict.Dict dict dict.Dict

View File

@@ -1,16 +1,16 @@
package db package db
import ( import (
"github.com/hdt3213/godis/src/config" "github.com/hdt3213/godis/config"
"github.com/hdt3213/godis/src/datastruct/dict" "github.com/hdt3213/godis/datastruct/dict"
List "github.com/hdt3213/godis/src/datastruct/list" List "github.com/hdt3213/godis/datastruct/list"
"github.com/hdt3213/godis/src/datastruct/lock" "github.com/hdt3213/godis/datastruct/lock"
"github.com/hdt3213/godis/src/datastruct/set" "github.com/hdt3213/godis/datastruct/set"
SortedSet "github.com/hdt3213/godis/src/datastruct/sortedset" SortedSet "github.com/hdt3213/godis/datastruct/sortedset"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/lib/utils" "github.com/hdt3213/godis/lib/utils"
"github.com/hdt3213/godis/src/redis/parser" "github.com/hdt3213/godis/redis/parser"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"

View File

@@ -1,8 +1,8 @@
package db package db
import ( import (
"github.com/hdt3213/godis/src/config" "github.com/hdt3213/godis/config"
"github.com/hdt3213/godis/src/datastruct/utils" "github.com/hdt3213/godis/datastruct/utils"
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path"

View File

@@ -2,14 +2,14 @@ package db
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/config" "github.com/hdt3213/godis/config"
"github.com/hdt3213/godis/src/datastruct/dict" "github.com/hdt3213/godis/datastruct/dict"
"github.com/hdt3213/godis/src/datastruct/lock" "github.com/hdt3213/godis/datastruct/lock"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/lib/timewheel" "github.com/hdt3213/godis/lib/timewheel"
"github.com/hdt3213/godis/src/pubsub" "github.com/hdt3213/godis/pubsub"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"os" "os"
"runtime/debug" "runtime/debug"
"strings" "strings"

View File

@@ -2,10 +2,10 @@ package db
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/datastruct/sortedset" "github.com/hdt3213/godis/datastruct/sortedset"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/lib/geohash" "github.com/hdt3213/godis/lib/geohash"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
"strings" "strings"
) )

View File

@@ -2,8 +2,8 @@ package db
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"github.com/hdt3213/godis/src/redis/reply/asserts" "github.com/hdt3213/godis/redis/reply/asserts"
"strconv" "strconv"
"testing" "testing"
) )

View File

@@ -1,9 +1,9 @@
package db package db
import ( import (
Dict "github.com/hdt3213/godis/src/datastruct/dict" Dict "github.com/hdt3213/godis/datastruct/dict"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"strconv" "strconv"
) )

View File

@@ -2,9 +2,9 @@ package db
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/datastruct/utils" "github.com/hdt3213/godis/datastruct/utils"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"github.com/hdt3213/godis/src/redis/reply/asserts" "github.com/hdt3213/godis/redis/reply/asserts"
"strconv" "strconv"
"testing" "testing"
) )

View File

@@ -1,13 +1,13 @@
package db package db
import ( import (
"github.com/hdt3213/godis/src/datastruct/dict" "github.com/hdt3213/godis/datastruct/dict"
"github.com/hdt3213/godis/src/datastruct/list" "github.com/hdt3213/godis/datastruct/list"
"github.com/hdt3213/godis/src/datastruct/set" "github.com/hdt3213/godis/datastruct/set"
"github.com/hdt3213/godis/src/datastruct/sortedset" "github.com/hdt3213/godis/datastruct/sortedset"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/lib/wildcard" "github.com/hdt3213/godis/lib/wildcard"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
"time" "time"
) )

View File

@@ -2,8 +2,8 @@ package db
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"github.com/hdt3213/godis/src/redis/reply/asserts" "github.com/hdt3213/godis/redis/reply/asserts"
"strconv" "strconv"
"testing" "testing"
"time" "time"

View File

@@ -1,9 +1,9 @@
package db package db
import ( import (
List "github.com/hdt3213/godis/src/datastruct/list" List "github.com/hdt3213/godis/datastruct/list"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
) )

View File

@@ -2,8 +2,8 @@ package db
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/datastruct/utils" "github.com/hdt3213/godis/datastruct/utils"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
"testing" "testing"
) )

View File

@@ -1,8 +1,8 @@
package db package db
import ( import (
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
) )
// Ping the server // Ping the server

View File

@@ -1,7 +1,7 @@
package db package db
import ( import (
"github.com/hdt3213/godis/src/redis/reply/asserts" "github.com/hdt3213/godis/redis/reply/asserts"
"testing" "testing"
) )

View File

@@ -1,9 +1,9 @@
package db package db
import ( import (
HashSet "github.com/hdt3213/godis/src/datastruct/set" HashSet "github.com/hdt3213/godis/datastruct/set"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
) )

View File

@@ -2,8 +2,8 @@ package db
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"github.com/hdt3213/godis/src/redis/reply/asserts" "github.com/hdt3213/godis/redis/reply/asserts"
"strconv" "strconv"
"testing" "testing"
) )

View File

@@ -1,9 +1,9 @@
package db package db
import ( import (
SortedSet "github.com/hdt3213/godis/src/datastruct/sortedset" SortedSet "github.com/hdt3213/godis/datastruct/sortedset"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
"strings" "strings"
) )

View File

@@ -1,7 +1,7 @@
package db package db
import ( import (
"github.com/hdt3213/godis/src/redis/reply/asserts" "github.com/hdt3213/godis/redis/reply/asserts"
"math/rand" "math/rand"
"strconv" "strconv"
"testing" "testing"

View File

@@ -1,8 +1,8 @@
package db package db
import ( import (
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"strconv" "strconv"
"strings" "strings"

View File

@@ -2,9 +2,9 @@ package db
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/datastruct/utils" "github.com/hdt3213/godis/datastruct/utils"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"github.com/hdt3213/godis/src/redis/reply/asserts" "github.com/hdt3213/godis/redis/reply/asserts"
"strconv" "strconv"
"testing" "testing"
) )

View File

@@ -1,8 +1,8 @@
package db package db
import ( import (
"github.com/hdt3213/godis/src/datastruct/dict" "github.com/hdt3213/godis/datastruct/dict"
"github.com/hdt3213/godis/src/datastruct/lock" "github.com/hdt3213/godis/datastruct/lock"
"math/rand" "math/rand"
) )

View File

@@ -1,6 +1,6 @@
package db package db
import "github.com/hdt3213/godis/src/interface/redis" import "github.com/hdt3213/godis/interface/redis"
type DB interface { type DB interface {
Exec(client redis.Connection, args [][]byte) redis.Reply Exec(client redis.Connection, args [][]byte) redis.Reply

View File

@@ -2,7 +2,7 @@ package logger
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/lib/files" "github.com/hdt3213/godis/lib/files"
"io" "io"
"log" "log"
"os" "os"

View File

@@ -2,7 +2,7 @@ package timewheel
import ( import (
"container/list" "container/list"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"time" "time"
) )

View File

@@ -1,8 +1,8 @@
package pubsub package pubsub
import ( import (
"github.com/hdt3213/godis/src/datastruct/dict" "github.com/hdt3213/godis/datastruct/dict"
"github.com/hdt3213/godis/src/datastruct/lock" "github.com/hdt3213/godis/datastruct/lock"
) )
type Hub struct { type Hub struct {

View File

@@ -1,9 +1,9 @@
package pubsub package pubsub
import ( import (
"github.com/hdt3213/godis/src/datastruct/list" "github.com/hdt3213/godis/datastruct/list"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"strconv" "strconv"
) )

View File

@@ -1,11 +1,11 @@
package client package client
import ( import (
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/lib/sync/wait" "github.com/hdt3213/godis/lib/sync/wait"
"github.com/hdt3213/godis/src/redis/parser" "github.com/hdt3213/godis/redis/parser"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"net" "net"
"runtime/debug" "runtime/debug"
"sync" "sync"

View File

@@ -1,8 +1,8 @@
package client package client
import ( import (
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"testing" "testing"
) )

View File

@@ -3,9 +3,9 @@ package parser
import ( import (
"bufio" "bufio"
"errors" "errors"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"io" "io"
"runtime/debug" "runtime/debug"
"strconv" "strconv"

View File

@@ -2,9 +2,9 @@ package parser
import ( import (
"bytes" "bytes"
"github.com/hdt3213/godis/src/datastruct/utils" "github.com/hdt3213/godis/datastruct/utils"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"io" "io"
"testing" "testing"
) )

View File

@@ -2,9 +2,9 @@ package asserts
import ( import (
"fmt" "fmt"
"github.com/hdt3213/godis/src/datastruct/utils" "github.com/hdt3213/godis/datastruct/utils"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"runtime" "runtime"
"testing" "testing"
) )

View File

@@ -2,7 +2,7 @@ package reply
import ( import (
"bytes" "bytes"
"github.com/hdt3213/godis/src/interface/redis" "github.com/hdt3213/godis/interface/redis"
"strconv" "strconv"
) )

View File

@@ -1,7 +1,7 @@
package server package server
import ( import (
"github.com/hdt3213/godis/src/lib/sync/wait" "github.com/hdt3213/godis/lib/sync/wait"
"net" "net"
"sync" "sync"
"time" "time"

View File

@@ -6,14 +6,14 @@ package server
import ( import (
"context" "context"
"github.com/hdt3213/godis/src/cluster" "github.com/hdt3213/godis/cluster"
"github.com/hdt3213/godis/src/config" "github.com/hdt3213/godis/config"
DBImpl "github.com/hdt3213/godis/src/db" DBImpl "github.com/hdt3213/godis/db"
"github.com/hdt3213/godis/src/interface/db" "github.com/hdt3213/godis/interface/db"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/lib/sync/atomic" "github.com/hdt3213/godis/lib/sync/atomic"
"github.com/hdt3213/godis/src/redis/parser" "github.com/hdt3213/godis/redis/parser"
"github.com/hdt3213/godis/src/redis/reply" "github.com/hdt3213/godis/redis/reply"
"io" "io"
"net" "net"
"strings" "strings"

View File

@@ -7,9 +7,9 @@ package tcp
import ( import (
"bufio" "bufio"
"context" "context"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/lib/sync/atomic" "github.com/hdt3213/godis/lib/sync/atomic"
"github.com/hdt3213/godis/src/lib/sync/wait" "github.com/hdt3213/godis/lib/sync/wait"
"io" "io"
"net" "net"
"sync" "sync"

View File

@@ -7,9 +7,9 @@ package tcp
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/hdt3213/godis/src/interface/tcp" "github.com/hdt3213/godis/interface/tcp"
"github.com/hdt3213/godis/src/lib/logger" "github.com/hdt3213/godis/lib/logger"
"github.com/hdt3213/godis/src/lib/sync/atomic" "github.com/hdt3213/godis/lib/sync/atomic"
"net" "net"
"os" "os"
"os/signal" "os/signal"