Skip to content

Commit

Permalink
refactor project structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@HDT3213
HDT3213 committed May 2, 2021
1 parent bb9c140 commit f29298c
Show file tree
Hide file tree
Showing 78 changed files with 140 additions and 140 deletions.
2 changes: 1 addition & 1 deletion src/cluster/client.go → cluster/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
16 changes: 8 additions & 8 deletions src/cluster/cluster.go → cluster/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions src/cluster/com.go → cluster/com.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/cluster/del.go → cluster/del.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
0 src/cluster/idgenerator/snowflake.go → cluster/idgenerator/snowflake.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions src/cluster/mset.go → cluster/mset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions src/cluster/pubsub.go → cluster/pubsub.go
View file
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions src/cluster/rename.go → cluster/rename.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/cluster/router.go → cluster/router.go
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
10 changes: 5 additions & 5 deletions src/cluster/transaction.go → cluster/transaction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions src/cmd/main.go → cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion src/config/config.go → config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package config

import (
"bufio"
"github.com/hdt3213/godis/src/lib/logger"
"github.com/hdt3213/godis/lib/logger"
"log"
"os"
"reflect"
Expand Down
0 src/datastruct/dict/concurrent.go → datastruct/dict/concurrent.go
View file
File renamed without changes.
0 src/datastruct/dict/dict.go → datastruct/dict/dict.go
View file
File renamed without changes.
0 src/datastruct/dict/dict_test.go → datastruct/dict/dict_test.go
View file
File renamed without changes.
0 src/datastruct/dict/simple.go → datastruct/dict/simple.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/datastruct/list/linked.go → datastruct/list/linked.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 src/datastruct/list/linked_test.go → datastruct/list/linked_test.go
View file
File renamed without changes.
0 src/datastruct/lock/lock_map.go → datastruct/lock/lock_map.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/datastruct/set/set.go → datastruct/set/set.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 src/datastruct/set/set_test.go → datastruct/set/set_test.go
View file
File renamed without changes.
0 src/datastruct/sortedset/border.go → datastruct/sortedset/border.go
View file
File renamed without changes.
0 src/datastruct/sortedset/skiplist.go → datastruct/sortedset/skiplist.go
View file
File renamed without changes.
0 src/datastruct/sortedset/sortedset.go → datastruct/sortedset/sortedset.go
View file
File renamed without changes.
0 src/datastruct/utils/utils.go → datastruct/utils/utils.go
View file
File renamed without changes.
20 changes: 10 additions & 10 deletions src/db/aof.go → db/aof.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/db/aof_test.go → db/aof_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
16 changes: 8 additions & 8 deletions src/db/db.go → db/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions src/db/geo.go → db/geo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions src/db/geo_test.go → db/geo_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions src/db/hash.go → db/hash.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions src/db/hash_test.go → db/hash_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
14 changes: 7 additions & 7 deletions src/db/keys.go → db/keys.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions src/db/keys_test.go → db/keys_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions src/db/list.go → db/list.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions src/db/list_test.go → db/list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 src/db/router.go → db/router.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions src/db/server.go → db/server.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/db/server_test.go → db/server_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package db

import (
"github.com/hdt3213/godis/src/redis/reply/asserts"
"github.com/hdt3213/godis/redis/reply/asserts"
"testing"
)

Expand Down
6 changes: 3 additions & 3 deletions src/db/set.go → db/set.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions src/db/set_test.go → db/set_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions src/db/sortedset.go → db/sortedset.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion src/db/sortedset_test.go → db/sortedset_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading

0 comments on commit f29298c

Please sign in to comment.