mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-24 02:59:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1054 from chrislusf/revert-1049-master

Browse Source 
Revert "use std encoding lib"
This commit is contained in:
Chris Lu 2019-08-23 08:06:19 -07:00 committed by GitHub
commit 396c4fc143
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -12,7 +12,6 @@ require (
github.com/disintegration/imaging v1.6.0
github.com/dustin/go-humanize v1.0.0
github.com/gabriel-vasile/mimetype v0.3.15
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/go-redis/redis v6.15.2+incompatible
github.com/go-sql-driver/mysql v1.4.1
github.com/gocql/gocql v0.0.0-20190717234527-2ba2dd7440dc

33
weed/util/bytes.go
View File

@ -1,10 +1,8 @@
package util
import "encoding/binary"
// big endian
func BytesToUint64Old(b []byte) (v uint64) {
func BytesToUint64(b []byte) (v uint64) {
length := uint(len(b))
for i := uint(0); i < length-1; i++ {
v += uint64(b[i])
@ -13,7 +11,7 @@ func BytesToUint64Old(b []byte) (v uint64) {
v += uint64(b[length-1])
return
}
func BytesToUint32Old(b []byte) (v uint32) {
func BytesToUint32(b []byte) (v uint32) {
length := uint(len(b))
for i := uint(0); i < length-1; i++ {
v += uint32(b[i])
@ -22,45 +20,26 @@ func BytesToUint32Old(b []byte) (v uint32) {
v += uint32(b[length-1])
return
}
func BytesToUint16Old(b []byte) (v uint16) {
func BytesToUint16(b []byte) (v uint16) {
v += uint16(b[0])
v <<= 8
v += uint16(b[1])
return
}
func Uint64toBytesOld(b []byte, v uint64) {
func Uint64toBytes(b []byte, v uint64) {
for i := uint(0); i < 8; i++ {
b[7-i] = byte(v >> (i * 8))
}
}
func Uint32toBytesOld(b []byte, v uint32) {
func Uint32toBytes(b []byte, v uint32) {
for i := uint(0); i < 4; i++ {
b[3-i] = byte(v >> (i * 8))
}
}
func Uint16toBytesOld(b []byte, v uint16) {
func Uint16toBytes(b []byte, v uint16) {
b[0] = byte(v >> 8)
b[1] = byte(v)
}
func BytesToUint64(b []byte) (v uint64) {
return binary.BigEndian.Uint64(b)
}
func BytesToUint32(b []byte) (v uint32) {
return binary.BigEndian.Uint32(b)
}
func BytesToUint16(b []byte) (v uint16) {
return binary.BigEndian.Uint16(b)
}
func Uint64toBytes(b []byte, v uint64) {
binary.BigEndian.PutUint64(b, v)
}
func Uint32toBytes(b []byte, v uint32) {
binary.BigEndian.PutUint32(b, v)
}
func Uint16toBytes(b []byte, v uint16) {
binary.BigEndian.PutUint16(b, v)
}
func Uint8toBytes(b []byte, v uint8) {
b[0] = byte(v)
}

62
weed/util/bytes_test.go
View File

@ -1,62 +0,0 @@
package util
import (
"reflect"
"testing"
)
// go test github.com/chrislusf/seaweedfs/weed/util -run '^(TestAll)$' -v
func TestAll(t *testing.T) {
for i := 0; i <= 0xff; i += 7 {
assertU16(t, uint16(i))
}
for i := 0; i <= 0xffff; i += 211 {
assertU32(t, uint32(i))
}
for i := 0; i <= 0xffffffff; i += 1000000007 {
assertU64(t, uint64(i))
}
}
func assertU16(t *testing.T, i uint16) {
var buf1, buf2 [2]byte
Uint16toBytesOld(buf1[:], i)
Uint16toBytes(buf2[:], i)
if !reflect.DeepEqual(buf1, buf2) {
t.Errorf("i: %d, buf1: %v, buf2: %v\n", i, buf1, buf2)
}
v1 := BytesToUint16Old(buf1[:])
v2 := BytesToUint16(buf2[:])
if v1 != v2 {
t.Errorf("buf1: %v, v1: %d, buf2: %v, v2: %d\n", buf1, v1, buf2, v2)
}
}
func assertU32(t *testing.T, i uint32) {
var buf1, buf2 [4]byte
Uint32toBytesOld(buf1[:], i)
Uint32toBytes(buf2[:], i)
if !reflect.DeepEqual(buf1, buf2) {
t.Errorf("i: %d, buf1: %v, buf2: %v\n", i, buf1, buf2)
}
v1 := BytesToUint32Old(buf1[:])
v2 := BytesToUint32(buf2[:])
if v1 != v2 {
t.Errorf("buf1: %v, v1: %d, buf2: %v, v2: %d\n", buf1, v1, buf2, v2)
}
}
func assertU64(t *testing.T, i uint64) {
var buf1, buf2 [8]byte
Uint64toBytesOld(buf1[:], i)
Uint64toBytes(buf2[:], i)
if !reflect.DeepEqual(buf1, buf2) {
t.Errorf("i: %d, buf1: %v, buf2: %v\n", i, buf1, buf2)
}
v1 := BytesToUint64Old(buf1[:])
v2 := BytesToUint64(buf2[:])
if v1 != v2 {
t.Errorf("buf1: %v, v1: %d, buf2: %v, v2: %d\n", buf1, v1, buf2, v2)
}
}