GOMODULES
/
bbolt
mirror of https://github.com/etcd-io/bbolt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get rid of os.Getpagesize() calls where appropriate

pull/16/head
Anthony Romano 2017-08-10 16:43:35 -07:00
parent 12923fe56c
commit 78ca4fde00
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bucket_test.go
View File

@ -1214,7 +1214,7 @@ func TestBucket_Stats(t *testing.T) {
}
// Only check allocations for 4KB pages.
if os.Getpagesize() == 4096 {
if db.Info().PageSize == 4096 {
if stats.BranchAlloc != 4096 {
t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
} else if stats.LeafAlloc != 36864 {
@ -1347,7 +1347,7 @@ func TestBucket_Stats_Small(t *testing.T) {
t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
}
if os.Getpagesize() == 4096 {
if db.Info().PageSize == 4096 {
if stats.BranchAlloc != 0 {
t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
} else if stats.LeafAlloc != 0 {
@ -1406,7 +1406,7 @@ func TestBucket_Stats_EmptyBucket(t *testing.T) {
t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
}
if os.Getpagesize() == 4096 {
if db.Info().PageSize == 4096 {
if stats.BranchAlloc != 0 {
t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
} else if stats.LeafAlloc != 0 {
@ -1508,7 +1508,7 @@ func TestBucket_Stats_Nested(t *testing.T) {
t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
}
if os.Getpagesize() == 4096 {
if db.Info().PageSize == 4096 {
if stats.BranchAlloc != 0 {
t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
} else if stats.LeafAlloc != 8192 {
@ -1581,7 +1581,7 @@ func TestBucket_Stats_Large(t *testing.T) {
t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
}
if os.Getpagesize() == 4096 {
if db.Info().PageSize == 4096 {
if stats.BranchAlloc != 53248 {
t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
} else if stats.LeafAlloc != 4898816 {

4
db.go
View File

@ -221,7 +221,7 @@ func Open(path string, mode os.FileMode, options *Options) (*DB, error) {
// If the first page is invalid and this OS uses a different
// page size than what the database was created with then we
// are out of luck and cannot access the database.
db.pageSize = os.Getpagesize()
db.pageSize = defaultPageSize
} else {
db.pageSize = int(m.pageSize)
}
@ -371,7 +371,7 @@ func (db *DB) mmapSize(size int) (int, error) {
// init creates a new database file and initializes its meta pages.
func (db *DB) init() error {
// Set the page size to the OS page size.
db.pageSize = os.Getpagesize()
db.pageSize = defaultPageSize
// Create two meta pages on a buffer.
buf := make([]byte, db.pageSize*4)

3
db_test.go
View File

@ -347,12 +347,13 @@ func TestOpen_FileTooSmall(t *testing.T) {
if err != nil {
t.Fatal(err)
}
pageSize := int64(db.Info().PageSize)
if err := db.Close(); err != nil {
t.Fatal(err)
}
// corrupt the database
if err := os.Truncate(path, int64(os.Getpagesize())); err != nil {
if err := os.Truncate(path, pageSize); err != nil {
t.Fatal(err)
}