Merge pull request #148 from ByteStorage/temp-dev

feat: add db grpc server

cluster/region/region_test.go

@@ -25,8 +25,11 @@ func ReturnNewDB() *engine.DB {
 func destroyRegion(r Region) {
 	// Close the region's database
 	db := r.(*TestRegionStruct).db
-	_ = db.Close()
-	err := os.RemoveAll(dirpath)
+	err := db.Close()
+	if err != nil {
+		return
+	}
+	err = os.RemoveAll(dirpath)
 	if err != nil {
 		return
 	}

cmd/app.go → cmd/client/app.go

@@ -1,4 +1,4 @@
-package cmd
+package client
 
 import (
 	"fmt"

cmd/client/cli/flydb-client.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"fmt"
+	"github.com/ByteStorage/FlyDB/cmd/client"
+	"github.com/desertbit/grumble"
+	"os"
+)
+
+func main() {
+	if len(os.Args) != 2 {
+		fmt.Println("usage: flydb-cli [addr]")
+		return
+	}
+	client.Addr = os.Args[1]
+	os.Args = os.Args[:1]
+	// start client CLI
+	grumble.Main(client.App)
+}

cmd/data.go → cmd/client/data.go

@@ -1,22 +1,27 @@
-package cmd
+package client
 
 import (
 	"fmt"
+	"github.com/ByteStorage/FlyDB/engine/grpc/client"
 	"github.com/desertbit/grumble"
 )
 
+var Addr string
+
+func newClient() *client.Client {
+	return &client.Client{
+		Addr: Addr,
+	}
+}
+
 func putData(c *grumble.Context) error {
 	key := c.Args.String("key")
 	value := c.Args.String("value")
 	if key == "" || value == "" {
 		fmt.Println("key or value is empty")
 		return nil
 	}
-	if db == nil {
-		fmt.Println("start server first")
-		return nil
-	}
-	err := db.Put([]byte(key), []byte(value))
+	err := newClient().Put([]byte(key), []byte(value))
 	if err != nil {
 		fmt.Println("put data error: ", err)
 		return err
@@ -31,11 +36,7 @@ func getData(c *grumble.Context) error {
 		fmt.Println("key is empty")
 		return nil
 	}
-	if db == nil {
-		fmt.Println("start server first")
-		return nil
-	}
-	value, err := db.Get([]byte(key))
+	value, err := newClient().Get([]byte(key))
 	if err != nil {
 		fmt.Println("get data error: ", err)
 		return err
@@ -50,11 +51,7 @@ func deleteKey(c *grumble.Context) error {
 		fmt.Println("key is empty")
 		return nil
 	}
-	if db == nil {
-		fmt.Println("start server first")
-		return nil
-	}
-	err := db.Delete([]byte(key))
+	err := newClient().Del([]byte(key))
 	if err != nil {
 		fmt.Println("delete key error: ", err)
 		return err
@@ -64,11 +61,11 @@ func deleteKey(c *grumble.Context) error {
 }
 
 func getKeys(c *grumble.Context) error {
-	if db == nil {
-		fmt.Println("start server first")
-		return nil
+	list, err := newClient().Keys()
+	if err != nil {
+		fmt.Println("get keys error: ", err)
+		return err
 	}
-	list := db.GetListKeys()
 	fmt.Println("Total keys: ", len(list))
 	for i, bytes := range list {
 		fmt.Printf(string(bytes[:]) + "\t")

cmd/root.go → cmd/client/root.go

@@ -1,28 +1,8 @@
-package cmd
+package client
 
-import (
-	"github.com/desertbit/grumble"
-)
+import "github.com/desertbit/grumble"
 
 func register(app *grumble.App) {
-	app.AddCommand(&grumble.Command{
-		Name: "start",
-		Help: "start server",
-		Run:  startServer,
-	})
-
-	app.AddCommand(&grumble.Command{
-		Name: "stop",
-		Help: "stop server",
-		Run:  stopServer,
-	})
-
-	app.AddCommand(&grumble.Command{
-		Name: "clean",
-		Help: "clean server",
-		Run:  cleanServer,
-	})
-
 	app.AddCommand(&grumble.Command{
 		Name: "put",
 		Help: "put data",
@@ -56,5 +36,4 @@ func register(app *grumble.App) {
 		Help: "list keys",
 		Run:  getKeys,
 	})
-
 }

cmd/server/cli/flydb-server.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"fmt"
+	"github.com/ByteStorage/FlyDB/cmd/server"
+	"os"
+)
+
+func main() {
+	args := os.Args
+	if len(args) >= 2 {
+		fmt.Println("Usage: flydb-server [start|clean|stop]")
+		return
+	}
+	if len(args) == 1 {
+		//start server
+		server.StartServer()
+		return
+	}
+	switch args[1] {
+	case "start":
+		server.StartServer()
+	case "stop":
+		server.StopServer()
+	case "clean":
+		server.CleanServer()
+	}
+}

cmd/server/server.go

@@ -0,0 +1,27 @@
+package server
+
+import (
+	"fmt"
+	"github.com/ByteStorage/FlyDB/config"
+	"github.com/ByteStorage/FlyDB/engine/grpc/service"
+	"github.com/ByteStorage/FlyDB/flydb"
+)
+
+func StartServer() {
+	options := config.DefaultOptions
+	db, err := flydb.NewFlyDB(options)
+	if err != nil {
+		fmt.Println("flydb start error: ", err)
+		return
+	}
+	s := service.NewService(config.DefaultAddr, db)
+	s.StartServer()
+}
+
+func StopServer() {
+	panic("implement me")
+}
+
+func CleanServer() {
+	panic("implement me")
+}

config/options.go

@@ -45,6 +45,10 @@ const (
 	ART
 )
 
+const (
+	DefaultAddr = "127.0.0.1:8999"
+)
+
 var DefaultOptions = Options{
 	DirPath:      os.TempDir(),
 	DataFileSize: 256 * 1024 * 1024, // 256MB

config/tcpConfig.go

@@ -10,7 +10,7 @@ type TcpServerConfiguration struct {
 // Configuration is global tcp server config
 var Configuration *TcpServerConfiguration
 
-// Init init global tcp server config
+// Init global tcp server config
 func Init() *TcpServerConfiguration {
 	Configuration = &TcpServerConfiguration{
 		Host:       "127.0.0.1",

engine/batch_test.go

@@ -7,14 +7,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+	"time"
 )
 
 func TestDB_WriteBatch(t *testing.T) {
 	opts := config.DefaultOptions
 	dir, _ := os.MkdirTemp("", "flydb-batch-1")
 	opts.DirPath = dir
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -51,7 +52,7 @@ func TestDB_WriteBatchRestart(t *testing.T) {
 	dir, _ := os.MkdirTemp("", "flydb-batch-2")
 	opts.DirPath = dir
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -77,6 +78,8 @@ func TestDB_WriteBatchRestart(t *testing.T) {
 	assert.Nil(t, err)
 
 	db2, err := NewDB(opts)
+	time.Sleep(time.Millisecond * 100)
+	defer db2.Clean()
 	assert.Nil(t, err)
 
 	_, err = db2.Get(randkv.GetTestKey(1))
@@ -91,6 +94,7 @@ func TestDB_WriteBatch1(t *testing.T) {
 	dir := "/tmp/batch-3"
 	opts.DirPath = dir
 	db, err := NewDB(opts)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 

engine/benchmark/benchmark_test.go

@@ -39,6 +39,7 @@ func init() {
 	opts.DirPath = filepath.Join("benchmark", "flydbtest")
 
 	FlyDB, err = flydb.NewFlyDB(opts)
+	defer FlyDB.Clean()
 	if err != nil {
 		panic(err)
 	}