replace util/bytes.go with binary.BigEndian

This commit is contained in:
Jianfei Wang
2016-04-06 17:03:32 +08:00
parent 6876bfa685
commit 7bc10d46e3
11 changed files with 63 additions and 109 deletions

View File

@@ -1,6 +1,7 @@
package storage
import (
"encoding/binary"
"encoding/hex"
"errors"
"fmt"
@@ -15,7 +16,6 @@ import (
"github.com/chrislusf/seaweedfs/go/glog"
"github.com/chrislusf/seaweedfs/go/images"
"github.com/chrislusf/seaweedfs/go/operation"
"github.com/chrislusf/seaweedfs/go/util"
)
const (
@@ -222,7 +222,7 @@ func ParseKeyHash(key_hash_string string) (uint64, uint32, error) {
glog.V(0).Infoln("Invalid key_hash", key_hash_string, "length:", key_hash_len, "error", khe)
return 0, 0, errors.New("Invalid key and hash:" + key_hash_string)
}
key := util.BytesToUint64(key_hash_bytes[0 : key_hash_len-4])
hash := util.BytesToUint32(key_hash_bytes[key_hash_len-4 : key_hash_len])
key := binary.BigEndian.Uint64(key_hash_bytes[0 : key_hash_len-4])
hash := binary.BigEndian.Uint32(key_hash_bytes[key_hash_len-4 : key_hash_len])
return key, hash, nil
}