|
@@ -70,18 +70,22 @@ func SetHttpHandler(w *http.ResponseWriter, req *http.Request) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if len(prevValue) != 0 {
|
|
if len(prevValue) != 0 {
|
|
|
- command := &TestAndSetCommand{}
|
|
|
|
|
- command.Key = key
|
|
|
|
|
- command.Value = value
|
|
|
|
|
- command.PrevValue = prevValue
|
|
|
|
|
- command.ExpireTime = expireTime
|
|
|
|
|
|
|
+ command := &TestAndSetCommand{
|
|
|
|
|
+ Key: key,
|
|
|
|
|
+ Value: value,
|
|
|
|
|
+ PrevValue: prevValue,
|
|
|
|
|
+ ExpireTime: expireTime,
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
dispatch(command, w, req, true)
|
|
dispatch(command, w, req, true)
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
- command := &SetCommand{}
|
|
|
|
|
- command.Key = key
|
|
|
|
|
- command.Value = value
|
|
|
|
|
- command.ExpireTime = expireTime
|
|
|
|
|
|
|
+ command := &SetCommand{
|
|
|
|
|
+ Key: key,
|
|
|
|
|
+ Value: value,
|
|
|
|
|
+ ExpireTime: expireTime,
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
dispatch(command, w, req, true)
|
|
dispatch(command, w, req, true)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -93,8 +97,9 @@ func DeleteHttpHandler(w *http.ResponseWriter, req *http.Request) {
|
|
|
|
|
|
|
|
debugf("[recv] DELETE http://%v/v1/keys/%s", raftServer.Name(), key)
|
|
debugf("[recv] DELETE http://%v/v1/keys/%s", raftServer.Name(), key)
|
|
|
|
|
|
|
|
- command := &DeleteCommand{}
|
|
|
|
|
- command.Key = key
|
|
|
|
|
|
|
+ command := &DeleteCommand{
|
|
|
|
|
+ Key: key,
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
dispatch(command, w, req, true)
|
|
dispatch(command, w, req, true)
|
|
|
}
|
|
}
|
|
@@ -244,8 +249,9 @@ func GetHttpHandler(w *http.ResponseWriter, req *http.Request) {
|
|
|
|
|
|
|
|
debugf("[recv] GET http://%v/v1/keys/%s", raftServer.Name(), key)
|
|
debugf("[recv] GET http://%v/v1/keys/%s", raftServer.Name(), key)
|
|
|
|
|
|
|
|
- command := &GetCommand{}
|
|
|
|
|
- command.Key = key
|
|
|
|
|
|
|
+ command := &GetCommand{
|
|
|
|
|
+ Key: key,
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if body, err := command.Apply(raftServer); err != nil {
|
|
if body, err := command.Apply(raftServer); err != nil {
|
|
|
|
|
|
|
@@ -275,8 +281,9 @@ func GetHttpHandler(w *http.ResponseWriter, req *http.Request) {
|
|
|
func WatchHttpHandler(w http.ResponseWriter, req *http.Request) {
|
|
func WatchHttpHandler(w http.ResponseWriter, req *http.Request) {
|
|
|
key := req.URL.Path[len("/v1/watch/"):]
|
|
key := req.URL.Path[len("/v1/watch/"):]
|
|
|
|
|
|
|
|
- command := &WatchCommand{}
|
|
|
|
|
- command.Key = key
|
|
|
|
|
|
|
+ command := &WatchCommand{
|
|
|
|
|
+ Key: key,
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if req.Method == "GET" {
|
|
if req.Method == "GET" {
|
|
|
debugf("[recv] GET http://%v/watch/%s", raftServer.Name(), key)
|
|
debugf("[recv] GET http://%v/watch/%s", raftServer.Name(), key)
|