From 0106a20696293c94ad184a4448e1dad4f0d04755 Mon Sep 17 00:00:00 2001 From: Todd Gruben Date: Thu, 23 Jan 2014 13:16:06 -0600 Subject: [PATCH] corrected error for post to non-existant fragment --- commands/pilosa-loader/loader.go | 22 ++++++++++++---------- core/batch.go | 2 +- db/topology.go | 5 +++++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/commands/pilosa-loader/loader.go b/commands/pilosa-loader/loader.go index c9c3c96cb..42c087b4a 100644 --- a/commands/pilosa-loader/loader.go +++ b/commands/pilosa-loader/loader.go @@ -4,15 +4,14 @@ import ( "bufio" "flag" "fmt" - "io/ioutil" "log" - "net/http" "net/url" "os" "pilosa/db" "pilosa/index" "strconv" "strings" + "github.com/davecgh/go-spew/spew" ) func post(database, base_url, id, compressed_string, frame_type string, slice int) { @@ -22,14 +21,17 @@ func post(database, base_url, id, compressed_string, frame_type string, slice in values.Set("frame", frame_type) values.Set("slice", fmt.Sprintf("%d", slice)) values.Set("bitmap", compressed_string) - r, err := http.PostForm(base_url, values) - if err != nil { - log.Printf("error posting stat to stathat: %s", err) - return - } - //body, _ := ioutil.ReadAll(r.Body) - ioutil.ReadAll(r.Body) - r.Body.Close() + spew.Dump(values) + /* + r, err := http.PostForm(base_url, values) + if err != nil { + log.Printf("error posting stat to stathat: %s", err) + return + } + //body, _ := ioutil.ReadAll(r.Body) + ioutil.ReadAll(r.Body) + r.Body.Close() + */ } func Load(database, url, fullpath string, frame_type string) error { diff --git a/core/batch.go b/core/batch.go index aec3ce059..ed30a39e4 100644 --- a/core/batch.go +++ b/core/batch.go @@ -45,7 +45,7 @@ func (self *Service) Batch(database_name, frame, compressed_bitmap string, bitma dest_id := fragment.GetProcess().Id() self.Transport.Send(&batch, &dest_id) - _, err := self.Hold.Get(&id, 60) + _, err = self.Hold.Get(&id, 60) } return err diff --git a/db/topology.go b/db/topology.go index 6c33c83fb..56dce5088 100644 --- a/db/topology.go +++ b/db/topology.go @@ -313,9 +313,14 @@ func (d *Database) GetFragmentForBitmap(slice *Slice, bitmap *Bitmap) (*Fragment //defer d.mutex.Unlock() frame, _ := d.getFrame(bitmap.FrameType) fsi, err := d.GetFrameSliceIntersect(frame, slice) + if err != nil { + log.Fatal(err) + return nil, err + } frag_id_s, err := fsi.hashring.Get(fmt.Sprintf("%d", bitmap.Id)) if err != nil { log.Fatal(err) + return nil, err } frag_id := util.Hex_to_SUUID(frag_id_s) return fsi.GetFragment(frag_id)