From 1d63c55f7c39f1d99f43471d1f380a1649375683 Mon Sep 17 00:00:00 2001 From: Steve Yen Date: Wed, 9 Mar 2016 10:09:15 -0800 Subject: [PATCH] parse mossLowerLevelMaxBatchSize only when lower-level-store exists --- index/store/moss/store.go | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/index/store/moss/store.go b/index/store/moss/store.go index 0454018f..b4249e40 100644 --- a/index/store/moss/store.go +++ b/index/store/moss/store.go @@ -92,26 +92,11 @@ func New(mo store.MergeOperator, config map[string]interface{}) ( } } - mossLowerLevelMaxBatchSize := uint64(0) - v, ok = config["mossLowerLevelMaxBatchSize"] - if ok { - mossLowerLevelMaxBatchSizeF, ok := v.(float64) - if !ok { - return nil, fmt.Errorf("moss store,"+ - " could not parse config[mossLowerLevelMaxBatchSize]: %v", v) - } - - mossLowerLevelMaxBatchSize = uint64(mossLowerLevelMaxBatchSizeF) - } - - // -------------------------------------------------- - var llStore store.KVStore if options.LowerLevelInit == nil && options.LowerLevelUpdate == nil && mossLowerLevelStoreName != "" { mossLowerLevelStoreConfig := map[string]interface{}{} - v, ok := config["mossLowerLevelStoreConfig"] if ok { mossLowerLevelStoreConfig, ok = v.(map[string]interface{}) @@ -121,6 +106,18 @@ func New(mo store.MergeOperator, config map[string]interface{}) ( } } + mossLowerLevelMaxBatchSize := uint64(0) + v, ok = config["mossLowerLevelMaxBatchSize"] + if ok { + mossLowerLevelMaxBatchSizeF, ok := v.(float64) + if !ok { + return nil, fmt.Errorf("moss store,"+ + " could not parse config[mossLowerLevelMaxBatchSize]: %v", v) + } + + mossLowerLevelMaxBatchSize = uint64(mossLowerLevelMaxBatchSizeF) + } + lowerLevelInit, lowerLevelUpdate, lowerLevelStore, err := initLowerLevelStore(mo, config, mossLowerLevelStoreName,