From 4d014d6d7e30f470725e3a0984f706292fe76366 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 19 Jul 2016 18:45:42 +0200 Subject: [PATCH] Godeps: bump github.com/syndtr/goleveldb/... to ab8b5dcf104 --- Godeps/Godeps.json | 24 ++++++------- .../syndtr/goleveldb/leveldb/batch.go | 1 + .../syndtr/goleveldb/leveldb/db_compaction.go | 4 +-- .../leveldb/storage/file_storage_nacl.go | 34 +++++++++++++++++++ .../syndtr/goleveldb/leveldb/util/hash.go | 28 +++++++-------- 5 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_nacl.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index fc9523e53c..edfa8ad1ea 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -152,51 +152,51 @@ }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/cache", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/comparer", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/errors", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/filter", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/iterator", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/journal", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/memdb", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/opt", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/storage", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/table", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb/util", - "Rev": "917f41c560270110ceb73c5b38be2a9127387071" + "Rev": "ab8b5dcf1042e818ab68e770d465112a899b668e" }, { "ImportPath": "golang.org/x/crypto/pbkdf2", diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go index 652fa41248..501006717b 100644 --- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go +++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go @@ -158,6 +158,7 @@ func (b *Batch) append(p *Batch) { b.grow(len(p.data) - batchHdrLen) b.data = append(b.data, p.data[batchHdrLen:]...) b.rLen += p.rLen + b.bLen += p.bLen } if p.sync { b.sync = true diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go index 9664e64d0e..659f00dc6e 100644 --- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go +++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go @@ -172,7 +172,7 @@ func (db *DB) compactionTransact(name string, t compactionTransactInterface) { disableBackoff = db.s.o.GetDisableCompactionBackoff() ) for n := 0; ; n++ { - // Check wether the DB is closed. + // Check whether the DB is closed. if db.isClosed() { db.logf("%s exiting", name) db.compactionExitTransact() @@ -688,7 +688,7 @@ func (db *DB) compTrigger(compC chan<- cCmd) { } } -// This will trigger auto compation and/or wait for all compaction to be done. +// This will trigger auto compaction and/or wait for all compaction to be done. func (db *DB) compTriggerWait(compC chan<- cCmd) (err error) { ch := make(chan error) defer close(ch) diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_nacl.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_nacl.go new file mode 100644 index 0000000000..5545aeef2a --- /dev/null +++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_nacl.go @@ -0,0 +1,34 @@ +// Copyright (c) 2012, Suryandaru Triandana +// All rights reserved. +// +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// +build nacl + +package storage + +import ( + "os" + "syscall" +) + +func newFileLock(path string, readOnly bool) (fl fileLock, err error) { + return nil, syscall.ENOTSUP +} + +func setFileLock(f *os.File, readOnly, lock bool) error { + return syscall.ENOTSUP +} + +func rename(oldpath, newpath string) error { + return syscall.ENOTSUP +} + +func isErrInvalid(err error) bool { + return false +} + +func syncDir(name string) error { + return syscall.ENOTSUP +} diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/hash.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/hash.go index 54903660ff..7f3fa4e2c7 100644 --- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/hash.go +++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/hash.go @@ -7,38 +7,38 @@ package util import ( - "bytes" "encoding/binary" ) // Hash return hash of the given data. func Hash(data []byte, seed uint32) uint32 { // Similar to murmur hash - var m uint32 = 0xc6a4a793 - var r uint32 = 24 - h := seed ^ (uint32(len(data)) * m) + const ( + m = uint32(0xc6a4a793) + r = uint32(24) + ) + var ( + h = seed ^ (uint32(len(data)) * m) + i int + ) - buf := bytes.NewBuffer(data) - for buf.Len() >= 4 { - var w uint32 - binary.Read(buf, binary.LittleEndian, &w) - h += w + for n := len(data) - len(data)%4; i < n; i += 4 { + h += binary.LittleEndian.Uint32(data[i:]) h *= m h ^= (h >> 16) } - rest := buf.Bytes() - switch len(rest) { + switch len(data) - i { default: panic("not reached") case 3: - h += uint32(rest[2]) << 16 + h += uint32(data[i+2]) << 16 fallthrough case 2: - h += uint32(rest[1]) << 8 + h += uint32(data[i+1]) << 8 fallthrough case 1: - h += uint32(rest[0]) + h += uint32(data[i]) h *= m h ^= (h >> r) case 0: