From bf2b4e9284d3e9724d8c1f79fff05f4f1b40b9f4 Mon Sep 17 00:00:00 2001 From: Travis Turner Date: Thu, 5 Jul 2018 20:50:00 -0500 Subject: [PATCH] remove index and field MarshalJSON --- field.go | 15 --------------- index.go | 19 ------------------- 2 files changed, 34 deletions(-) diff --git a/field.go b/field.go index 4cf1861df..bcdb800f8 100644 --- a/field.go +++ b/field.go @@ -1092,21 +1092,6 @@ func (f *Field) ImportValue(columnIDs []uint64, values []int64) error { return nil } -func (f *Field) MarshalJSON() ([]byte, error) { - thing := struct { - Name string `json:"name"` - Options FieldOptions `json:"options"` - Views []*ViewInfo `json:"views"` - }{ - Name: f.Name(), - Options: f.Options(), - } - for _, viewname := range f.viewNames() { - thing.Views = append(thing.Views, &ViewInfo{Name: viewname}) - } - return json.Marshal(thing) -} - type fieldSlice []*Field func (p fieldSlice) Swap(i, j int) { p[i], p[j] = p[j], p[i] } diff --git a/index.go b/index.go index 0f6d222be..7217bb659 100644 --- a/index.go +++ b/index.go @@ -15,7 +15,6 @@ package pilosa import ( - "encoding/json" "fmt" "io/ioutil" "os" @@ -76,24 +75,6 @@ func NewIndex(path, name string) (*Index, error) { }, nil } -func (i *Index) MarshalJSON() ([]byte, error) { - fields := make([]*Field, 0, len(i.fields)) - for _, f := range i.fields { - - fields = append(fields, f) - } - thing := struct { - Name string `json:"name"` - Options IndexOptions `json:"options"` - Fields []*Field `json:"fields"` - }{ - Name: i.name, - Options: i.Options(), - Fields: fields, - } - return json.Marshal(thing) -} - // Name returns name of the index. func (i *Index) Name() string { return i.name }