gibheer
/
bleve
0
0
Fork 0
Code

Merge 5a66653614 into 6693a89441

This commit is contained in:
Minoru Osuka 2018-03-19 09:05:56 +00:00 committed by GitHub
parent 6693a89441 5a66653614
commit e6dc83327a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index_impl.go
View File

@ -38,7 +38,7 @@ import (
type indexImpl struct {
path string
name string
meta *indexMeta
meta *IndexMeta
i index.Index
m mapping.IndexMapping
mutex sync.RWMutex
@ -79,7 +79,7 @@ func newIndexUsing(path string, mapping mapping.IndexMapping, indexType string,
path: path,
name: path,
m: mapping,
meta: newIndexMeta(indexType, kvstore, kvconfig),
meta: NewIndexMeta(indexType, kvstore, kvconfig),
}
rv.stats = &IndexStat{i: &rv}
// at this point there is hope that we can be successful, so save index meta
@ -138,7 +138,7 @@ func openIndexUsing(path string, runtimeConfig map[string]interface{}) (rv *inde
}
rv.stats = &IndexStat{i: rv}
rv.meta, err = openIndexMeta(path)
rv.meta, err = OpenIndexMeta(path)
if err != nil {
return nil, err
}

12
index_meta.go
View File

@ -24,21 +24,21 @@ import (
const metaFilename = "index_meta.json"
type indexMeta struct {
type IndexMeta struct {
Storage string `json:"storage"`
IndexType string `json:"index_type"`
Config map[string]interface{} `json:"config,omitempty"`
}
func newIndexMeta(indexType string, storage string, config map[string]interface{}) *indexMeta {
return &indexMeta{
func NewIndexMeta(indexType string, storage string, config map[string]interface{}) *IndexMeta {
return &IndexMeta{
IndexType: indexType,
Storage: storage,
Config: config,
}
}
func openIndexMeta(path string) (*indexMeta, error) {
func OpenIndexMeta(path string) (*IndexMeta, error) {
if _, err := os.Stat(path); os.IsNotExist(err) {
return nil, ErrorIndexPathDoesNotExist
}
@ -47,7 +47,7 @@ func openIndexMeta(path string) (*indexMeta, error) {
if err != nil {
return nil, ErrorIndexMetaMissing
}
var im indexMeta
var im IndexMeta
err = json.Unmarshal(metaBytes, &im)
if err != nil {
return nil, ErrorIndexMetaCorrupt
@ -58,7 +58,7 @@ func openIndexMeta(path string) (*indexMeta, error) {
return &im, nil
}
func (i *indexMeta) Save(path string) (err error) {
func (i *IndexMeta) Save(path string) (err error) {
indexMetaPath := indexMetaPath(path)
// ensure any necessary parent directories exist
err = os.MkdirAll(path, 0700)

6
index_meta_test.go
View File

@ -29,13 +29,13 @@ func TestIndexMeta(t *testing.T) {
}()
// open non-existent meta should give an error
_, err := openIndexMeta(testIndexPath)
_, err := OpenIndexMeta(testIndexPath)
if err == nil {
t.Errorf("expected error, got nil")
}
// create meta
im := &indexMeta{Storage: "boltdb"}
im := &IndexMeta{Storage: "boltdb"}
err = im.Save(testIndexPath)
if err != nil {
t.Error(err)
@ -43,7 +43,7 @@ func TestIndexMeta(t *testing.T) {
im = nil
// open a meta that exists
im, err = openIndexMeta(testIndexPath)
im, err = OpenIndexMeta(testIndexPath)
if err != nil {
t.Error(err)
}