From 71c4d1bbe0f0d95bd45553e33ab99e58a3e0e495 Mon Sep 17 00:00:00 2001 From: Shrey Batra Date: Mon, 21 Jun 2021 23:23:42 +0530 Subject: [PATCH] feature(protobuf): add protobuf and grpc support --- .gitignore | 3 + cql/commons.proto | 31 +++++++ cql/find_command.proto | 9 ++ cql/get_command.proto | 9 ++ cql/set_command.proto | 9 ++ go.mod | 6 +- go.sum | 88 +++++++++++++++++++ main.go | 22 ++++- server/commands.go | 97 --------------------- server/database.go | 43 ++++++++++ server/globals.go | 4 - server/server-service.proto | 16 ++++ server/server.go | 163 +++++++++++++++++++++--------------- server/types.go | 9 -- 14 files changed, 331 insertions(+), 178 deletions(-) create mode 100644 cql/commons.proto create mode 100644 cql/find_command.proto create mode 100644 cql/get_command.proto create mode 100644 cql/set_command.proto delete mode 100644 server/commands.go create mode 100644 server/database.go delete mode 100644 server/globals.go create mode 100644 server/server-service.proto delete mode 100644 server/types.go diff --git a/.gitignore b/.gitignore index cb1c327..8c0bdba 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ pkg/ # ENV files .env +# GRPC output files +*.pb.go + diff --git a/cql/commons.proto b/cql/commons.proto new file mode 100644 index 0000000..7fe6110 --- /dev/null +++ b/cql/commons.proto @@ -0,0 +1,31 @@ +syntax = "proto3"; + +package commands; + +option go_package = "github.com/shreybatra/crankdb/cql"; + +enum DataType { + BOOL = 0; + BYTES = 1; + INT = 2; + LONG = 3; + FLOAT = 4; + DOUBLE = 5; + STRING = 6; + JSON = 7; +} + +message DataPacket { + string key = 1; + + DataType dataType = 2; + + bool boolVal = 16; + bytes bytesVal = 17; + sint32 s32intVal = 18; + sint64 s64intVal = 19; + float floatVal = 20; + double doubleVal = 21; + string stringVal = 22; + bytes jsonVal = 23; +} \ No newline at end of file diff --git a/cql/find_command.proto b/cql/find_command.proto new file mode 100644 index 0000000..2488114 --- /dev/null +++ b/cql/find_command.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package commands; + +option go_package = "github.com/shreybatra/crankdb/cql"; + +message FindCommandRequest { + bytes Query = 1; +} \ No newline at end of file diff --git a/cql/get_command.proto b/cql/get_command.proto new file mode 100644 index 0000000..f260bf4 --- /dev/null +++ b/cql/get_command.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package commands; + +option go_package = "github.com/shreybatra/crankdb/cql"; + +message GetCommandRequest { + string key = 1; +} diff --git a/cql/set_command.proto b/cql/set_command.proto new file mode 100644 index 0000000..5536a04 --- /dev/null +++ b/cql/set_command.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package commands; + +option go_package = "github.com/shreybatra/crankdb/cql"; + +message SetCommandResponse { + bool success = 1; +} \ No newline at end of file diff --git a/go.mod b/go.mod index 4d358aa..493aca9 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,8 @@ module github.com/shreybatra/crankdb go 1.16 -require github.com/joho/godotenv v1.3.0 +require ( + github.com/joho/godotenv v1.3.0 + google.golang.org/grpc v1.38.0 + google.golang.org/protobuf v1.26.0 +) diff --git a/go.sum b/go.sum index ead7071..c9bd197 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,90 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/main.go b/main.go index 07ddcf0..4e84a01 100644 --- a/main.go +++ b/main.go @@ -1,11 +1,31 @@ package main import ( + "flag" + "log" + "net" + "github.com/joho/godotenv" "github.com/shreybatra/crankdb/server" + "github.com/shreybatra/crankdb/utils" + "google.golang.org/grpc" ) func main() { godotenv.Load() - server.StartServer() + hostport := utils.ReadServerConfig() + flag.Parse() + lis, err := net.Listen("tcp", hostport) + if err != nil { + log.Fatalf("failed to listen: %v", err) + } + + log.Printf("starting server on %v", hostport) + + grpcServer := grpc.NewServer() + server.RegisterCrankDBServer(grpcServer, &server.CrankServer{}) + if err := grpcServer.Serve(lis); err != nil { + log.Fatalf("failed to serve: %v", err) + } + } diff --git a/server/commands.go b/server/commands.go deleted file mode 100644 index e6623a1..0000000 --- a/server/commands.go +++ /dev/null @@ -1,97 +0,0 @@ -package server - -import ( - "encoding/json" -) - -func extractNextArgument(arguments string) (string, string) { - - var i int - length := len(arguments) - - for i = range arguments { - if arguments[i] == ' ' { - break - } - } - - if i == length-1 && arguments[i] != ' ' { - i++ - } - - extracted := string(arguments[0:i]) - - var remaining string - - if i+1 <= length { - remaining = string(arguments[i+1:]) - } else { - remaining = "" - } - - return extracted, remaining -} - -func set(arguments string) (response string) { - - key, arguments := extractNextArgument(arguments) - - var data interface{} - - if err := json.Unmarshal([]byte(arguments), &data); err != nil { - return "Invalid value" - } - - database[key] = data - return key + " set" -} - -func get(arguments string) (response interface{}) { - key, _ := extractNextArgument(arguments) - value, ok := database[key] - if !ok { - return "Not found" - } - return value -} - -func del(arguments string) (response interface{}) { - key, _ := extractNextArgument(arguments) - _, ok := database[key] - if !ok { - return "Not found" - } - delete(database, key) - return key + " deleted." -} - -func find(arguments string) (response []interface{}) { - - var data interface{} - - if err := json.Unmarshal([]byte(arguments), &data); err != nil { - panic(err) - } - - queryObj := data.(map[string]interface{}) - - var result []interface{} = make([]interface{}, 0) - - for _, item := range database { - item, ok := item.(map[string]interface{}) - if !ok { - continue - } - found := true - for key, value := range queryObj { - if item[key] != value { - found = false - break - } - } - if found { - result = append(result, item) - } - } - return result -} diff --git a/server/database.go b/server/database.go new file mode 100644 index 0000000..3752fe5 --- /dev/null +++ b/server/database.go @@ -0,0 +1,43 @@ +package server + +import ( + "sync" + + "github.com/shreybatra/crankdb/cql" +) + +type dbObject struct { + key string + valType cql.DataType + value interface{} +} + +type Database struct { + store map[string]*dbObject +} + +func NewDatabase() *Database { + return &Database{ + store: map[string]*dbObject{}, + } +} + +func (db *Database) Add(key string, value interface{}, valueType cql.DataType) { + dblock.Lock() + db.store[key] = &dbObject{ + key: key, + valType: valueType, + value: value, + } + dblock.Unlock() +} + +func (db *Database) Retrieve(key string) (*dbObject, bool) { + dblock.Lock() + value, ok := db.store[key] + dblock.Unlock() + + return value, ok +} + +var dblock = &sync.Mutex{} diff --git a/server/globals.go b/server/globals.go deleted file mode 100644 index f5e0bf0..0000000 --- a/server/globals.go +++ /dev/null @@ -1,4 +0,0 @@ -package server - -// To be updated later for complex storage based on Protobuf. -var database map[string]interface{} diff --git a/server/server-service.proto b/server/server-service.proto new file mode 100644 index 0000000..296a860 --- /dev/null +++ b/server/server-service.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +import "cql/commons.proto"; +import "cql/find_command.proto"; +import "cql/get_command.proto"; +import "cql/set_command.proto"; + +package server; + +option go_package = "github.com/shreybatra/crankdb/server"; + +service CrankDB { + rpc Set(commands.DataPacket) returns (commands.SetCommandResponse); + rpc Get(commands.GetCommandRequest) returns (commands.DataPacket); + rpc Find(commands.FindCommandRequest) returns (stream commands.DataPacket); +} \ No newline at end of file diff --git a/server/server.go b/server/server.go index 2fd9c72..621801e 100644 --- a/server/server.go +++ b/server/server.go @@ -1,96 +1,127 @@ package server import ( + context "context" "encoding/json" - "fmt" - "net" + "errors" - "github.com/shreybatra/crankdb/utils" + cql "github.com/shreybatra/crankdb/cql" ) -func parseCommand(message []byte, length int) (string, string) { - - var i int - for i = range message { - if message[i] == ' ' { - break - } - } +type CrankServer struct { + UnimplementedCrankDBServer +} - if i >= length { - panic("Too long a command.") +var Db *Database = NewDatabase() + +func (s *CrankServer) Set(ctx context.Context, request *cql.DataPacket) (*cql.SetCommandResponse, error) { + key := request.Key + valueType := request.GetDataType() + + var value interface{} + + switch valueType { + case cql.DataType_BOOL: + value = request.GetBoolVal() + case cql.DataType_BYTES: + value = request.GetBytesVal() + case cql.DataType_INT: + value = request.GetS32IntVal() + case cql.DataType_LONG: + value = request.GetS64IntVal() + case cql.DataType_FLOAT: + value = request.GetFloatVal() + case cql.DataType_DOUBLE: + value = request.GetDoubleVal() + case cql.DataType_STRING: + value = request.GetStringVal() + case cql.DataType_JSON: + json.Unmarshal(request.GetJsonVal(), &value) + default: + return &cql.SetCommandResponse{Success: false}, errors.New("no value passed") } - return string(message[0:i]), string(message[i+1:]) + Db.Add(key, value, valueType) + return &cql.SetCommandResponse{Success: true}, nil } -func executeCommand(command string, arguments string) (response interface{}) { - - switch command { - case "set": - return set(arguments) - case "get": - return get(arguments) - case "find": - return find(arguments) - case "del": - return del(arguments) - default: - return "invalid command" +func (s *CrankServer) Get(ctx context.Context, request *cql.GetCommandRequest) (*cql.DataPacket, error) { + key := request.Key + + obj, ok := Db.Retrieve(key) + + if !ok { + return &cql.DataPacket{}, errors.New("key not found") } + + response := &cql.DataPacket{} + + objType := obj.valType + objValue := obj.value + + switch objType { + case cql.DataType_BOOL: + response.BoolVal = objValue.(bool) + case cql.DataType_BYTES: + response.BytesVal = objValue.([]byte) + case cql.DataType_INT: + response.S32IntVal = objValue.(int32) + case cql.DataType_LONG: + response.S64IntVal = objValue.(int64) + case cql.DataType_FLOAT: + response.FloatVal = objValue.(float32) + case cql.DataType_DOUBLE: + response.DoubleVal = objValue.(float64) + case cql.DataType_STRING: + response.StringVal = objValue.(string) + case cql.DataType_JSON: + response.JsonVal, _ = json.Marshal(objValue) + } + + return response, nil } -func startConnection(connection *Connection) { - fmt.Println("[Connection Opened] - " + connection.ip.String()) - defer connection.socket.Close() +func (s *CrankServer) Find(request *cql.FindCommandRequest, stream CrankDB_FindServer) error { - for { - message := make([]byte, 4096) - length, err := connection.socket.Read(message) + var queryObj interface{} + json.Unmarshal(request.GetQuery(), &queryObj) - if err != nil { - fmt.Println("[Connection Closed] - " + connection.ip.String()) - connection.socket.Close() - break - } - if length > 0 { - message = message[:length] - command, argsAndData := parseCommand(message, length) + resultStream := make(chan *dbObject) - response := executeCommand(command, argsAndData) - resp, _ := json.Marshal(response) - _, err := connection.socket.Write(resp) + go searchStage(queryObj, resultStream) - if err != nil { - fmt.Println(err) - } + for result := range resultStream { + jsonVal, _ := json.Marshal(result.value) + newPacket := &cql.DataPacket{Key: result.key, JsonVal: jsonVal, DataType: cql.DataType_JSON} + if err := stream.Send(newPacket); err != nil { + return err } } -} - -func StartServer() { - - // To be updated later for complex storage based on Protobuf. - database = make(map[string]interface{}) - connectString := utils.ReadServerConfig() + return nil +} - fmt.Println("Starting server... Accepting connections on -", connectString) +func searchStage(query interface{}, resultStream chan *dbObject) { + queryObj := query.(map[string]interface{}) - listener, err := net.Listen("tcp", connectString) - if err != nil { - fmt.Println(err) - } - defer listener.Close() + for _, object := range Db.store { + if object.valType != cql.DataType_JSON { + continue + } + objValue := object.value.(map[string]interface{}) - for { - socketConn, err := listener.Accept() - if err != nil { - fmt.Println(err) + ok := true + for key, value := range queryObj { + if objValue[key] != value { + ok = false + break + } } - connection := &Connection{ip: socketConn.RemoteAddr(), socket: socketConn, data: make(chan []byte)} - go startConnection(connection) + if ok { + resultStream <- object + } } + close(resultStream) } diff --git a/server/types.go b/server/types.go deleted file mode 100644 index b8579bf..0000000 --- a/server/types.go +++ /dev/null @@ -1,9 +0,0 @@ -package server - -import "net" - -type Connection struct { - ip net.Addr - socket net.Conn - data chan []byte -}