Merge pull request #178 from seifer/underlining.in.collection.name

fix extract collection name from .dat file
This commit is contained in:
chrislusf 2015-08-18 10:19:11 -07:00
commit 1c6729d4c1

View file

@ -207,7 +207,7 @@ func (l *DiskLocation) loadExistingVolumes(needleMapKind NeedleMapType) {
if !dir.IsDir() && strings.HasSuffix(name, ".dat") {
collection := ""
base := name[:len(name)-len(".dat")]
i := strings.Index(base, "_")
i := strings.LastIndex(base, "_")
if i > 0 {
collection, base = base[0:i], base[i+1:]
}
@ -216,6 +216,8 @@ func (l *DiskLocation) loadExistingVolumes(needleMapKind NeedleMapType) {
if v, e := NewVolume(l.Directory, collection, vid, needleMapKind, nil, nil); e == nil {
l.volumes[vid] = v
glog.V(0).Infof("data file %s, replicaPlacement=%s v=%d size=%d ttl=%s", l.Directory+"/"+name, v.ReplicaPlacement, v.Version(), v.Size(), v.Ttl.String())
} else {
glog.V(0).Infof("new volume %s error %s", name, e)
}
}
}