mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-05 10:31:30 -06:00
Code Issues Packages Projects Releases 126 Wiki Activity

Fix startup crash in server binary.

Browse Source 
Also change ChunkStore from being embedded in server to being a field of it. It is equivalent, but this feels more semantically correct and it's less code anyway.
This commit is contained in:
Aaron Boodman
2015-07-21 10:12:42 -07:00
parent e20ed5c289
commit 4182ad0a33
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
clients/server/server.go
View File

@@ -17,7 +17,7 @@ var (
)
type server struct {
chunks.ChunkStore
cs chunks.ChunkStore
}
func (s server) handle(w http.ResponseWriter, r *http.Request) {
@@ -25,9 +25,8 @@ func (s server) handle(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path[1:] {
case "root":
cs := s.ChunkStore
w.Header().Add("content-type", "text/plain")
fmt.Fprintf(w, "%v", cs.Root().String())
fmt.Fprintf(w, "%v", s.cs.Root().String())
case "get":
if refs, ok := r.URL.Query()["ref"]; ok {
s.handleGetRef(w, refs[0])
@@ -46,14 +45,13 @@ func (s server) handle(w http.ResponseWriter, r *http.Request) {
}
func (s server) handleGetRef(w http.ResponseWriter, hashString string) {
cs := s.ChunkStore
ref, err := ref.Parse(hashString)
if err != nil {
http.Error(w, fmt.Sprintf("Parse error: %v", err), http.StatusBadRequest)
return
}
reader, err := cs.Get(ref)
reader, err := s.cs.Get(ref)
if err != nil {
// TODO: Maybe we should not expose the internal path?
http.Error(w, fmt.Sprintf("Fetch error: %v", err), http.StatusNotFound)
@@ -71,8 +69,7 @@ func (s server) handleGetRef(w http.ResponseWriter, hashString string) {
}
func (s server) handleGetDataset(w http.ResponseWriter, id string) {
cs := s.ChunkStore
rootDataStore := datas.NewDataStore(cs, cs.(chunks.RootTracker))
rootDataStore := datas.NewDataStore(s.cs, s.cs.(chunks.RootTracker))
dataset := mgmt.GetDatasetRoot(mgmt.GetDatasets(rootDataStore), id)
if dataset == nil {
http.Error(w, fmt.Sprintf("Dataset not found: %s", id), http.StatusNotFound)
@@ -92,6 +89,6 @@ func main() {
return
}
http.HandleFunc("/", cs.(server).handle)
http.HandleFunc("/", server{cs}.handle)
http.ListenAndServe(fmt.Sprintf(":%s", *port), nil)
}