scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-09 12:27:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

accumulate set bits per frame, don't mix into one set across frames

Browse source
This commit is contained in:
Michael Baird 2017-06-26 16:52:51 -05:00 • committed by Linh Vo
parent 7cbe679640
commit 7592a43b9d
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
handler.go
View file

@ -1643,7 +1643,7 @@ func (h *Handler) handlePostInput(w http.ResponseWriter, r *http.Request) {
return
}
for _, req := range reqs {
bits, err := h.JSONParser(req.(map[string]interface{}), index, inputDefName)
bits, err := h.InputJsonDataParser(req.(map[string]interface{}), index, inputDefName)
if err == ErrInputDefinitionNotFound {
http.Error(w, err.Error(), http.StatusNotFound)
return
@ -1664,8 +1664,8 @@ func (h *Handler) handlePostInput(w http.ResponseWriter, r *http.Request) {
}
}
// JSONParser validate input json file and execute SetBit
func (h *Handler) JSONParser(req map[string]interface{}, index *Index, name string) (map[string][]*Bit, error) {
// InputJsonDataParser validate input json file and execute SetBit
func (h *Handler) InputJsonDataParser(req map[string]interface{}, index *Index, name string) (map[string][]*Bit, error) {
inputDef := index.inputDefinition(name)
if inputDef == nil {
return nil, ErrInputDefinitionNotFound
@ -1686,11 +1686,9 @@ func (h *Handler) JSONParser(req map[string]interface{}, index *Index, name stri
}
}
var bits []*Bit
setBits := make(map[string][]*Bit)
for _, field := range inputDef.Fields() {
// skip field that defined in definition but not in input data
//var colValue uint64
if _, ok := req[field.Name]; !ok {
continue
}
@ -1709,8 +1707,9 @@ func (h *Handler) JSONParser(req map[string]interface{}, index *Index, name stri
if err != nil {
return nil, fmt.Errorf("error handling action: %s, err: %s", action.ValueDestination, err)
}
//bits = append(bits, bit)
setBits[frame] = append(bits, bit)
if bit != nil {
setBits[frame] = append(setBits[frame], bit)
}
}
}
return setBits, nil