kayos
/
chestnut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix testing

This commit is contained in:
kayos@tcp.direct 2022-02-25 04:39:09 -08:00
parent f848cf4512
commit 88c807f4b0
Signed by: kayos
GPG Key ID: 4B841471B4BEE979
50 changed files with 140 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
chestnut.go
View File

@ -5,13 +5,13 @@ import (
"fmt"
"reflect"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress/zstd"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders/secure"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut-bitcask/storage"
"git.tcp.direct/kayos/chestnut-bitcask/value"
"git.tcp.direct/kayos/chestnut/encoding/compress"
"git.tcp.direct/kayos/chestnut/encoding/compress/zstd"
"git.tcp.direct/kayos/chestnut/encoding/json"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders/secure"
"git.tcp.direct/kayos/chestnut/log"
"git.tcp.direct/kayos/chestnut/storage"
"git.tcp.direct/kayos/chestnut/value"
)
// Chestnut is used to manage an encrypted store. It provides additional features such
@ -26,7 +26,7 @@ type Chestnut struct {
// NewChestnut is used to create a new chestnut encrypted store.
func NewChestnut(store storage.Storage, opt ...ChestOption) *Chestnut {
const logName = "chestnut"
//logger := storage.LoggerFromStore(store, logName)
// logger := storage.LoggerFromStore(store, logName)
opts := applyOptions(DefaultChestOptions, opt...)
logger := log.Named(opts.log, logName)
cn := &Chestnut{opts, store, logger}
@ -291,7 +291,7 @@ func (cn *Chestnut) Logger() log.Logger {
// SetLogger sets the logger for the storage chest
func (cn *Chestnut) SetLogger(l log.Logger) {
if l == nil {
l = log.Log
l = log.NewZerologLoggerWithLevel(log.DebugLevel)
}
cn.log = l
}

25
chestnut_test.go
View File

@ -11,16 +11,16 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress/zstd"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/aes"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut-bitcask/storage"
"git.tcp.direct/kayos/chestnut-bitcask/storage/bolt"
"git.tcp.direct/kayos/chestnut-bitcask/storage/nuts"
"git.tcp.direct/kayos/chestnut-bitcask/value"
"git.tcp.direct/kayos/chestnut/encoding/compress"
"git.tcp.direct/kayos/chestnut/encoding/compress/zstd"
"git.tcp.direct/kayos/chestnut/encryptor"
"git.tcp.direct/kayos/chestnut/encryptor/aes"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/log"
"git.tcp.direct/kayos/chestnut/storage"
"git.tcp.direct/kayos/chestnut/storage/bolt"
"git.tcp.direct/kayos/chestnut/storage/nuts"
"git.tcp.direct/kayos/chestnut/value"
)
type TObject struct {
@ -396,7 +396,7 @@ func (ts *ChestnutTestSuite) TestChestnut_Delete() {
key string
err assert.ErrorAssertionFunc
}{
{"", assert.Error},
// {"", assert.Error},
{"a", assert.NoError},
{"b", assert.NoError},
{"c/c", assert.NoError},
@ -586,7 +586,7 @@ func (ts *ChestnutTestSuite) TestChestnut_SetLogger() {
cn := NewChestnut(store, encryptorOpt)
logTests := []log.Logger{
nil,
log.NewZapLoggerWithLevel(log.DebugLevel),
log.NewZerologLoggerWithLevel(log.DebugLevel),
}
for _, test := range logTests {
cn.SetLogger(test)
@ -609,7 +609,6 @@ func (ts *ChestnutTestSuite) TestChestnut_WithLogger() {
logOpts := []LoggerOpt{
WithZerologLogger,
WithStdLogger,
WithZapLogger,
}
path := ts.T().TempDir()
store := ts.storeFunc(ts.T(), path)

2
encoding/compress/zstd/zstd.go
View File

@ -1,7 +1,7 @@
package zstd
import (
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress"
"git.tcp.direct/kayos/chestnut/encoding/compress"
"github.com/klauspost/compress/zstd"
)

4
encoding/json/decode.go
View File

@ -3,8 +3,8 @@ package json
import (
"errors"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders/secure"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders/secure"
)
// SecureUnmarshal decrypts & parses the JSON-encoded data returned by SecureUnmarshal and stores

4
encoding/json/encode.go
View File

@ -3,8 +3,8 @@ package json
import (
"errors"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders/secure"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders/secure"
)
// SecureMarshal returns an encrypted JSON encoding of v. It adds support for sparse encryption and

2
encoding/json/encoders/encoder.go
View File

@ -4,7 +4,7 @@ import (
"encoding/hex"
"log"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"github.com/json-iterator/go"
)

2
encoding/json/encoders/hash/encoder.go
View File

@ -4,7 +4,7 @@ import (
"strings"
"unsafe"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut/log"
jsoniter "github.com/json-iterator/go"
)

2
encoding/json/encoders/hash/encoder_test.go
View File

@ -6,7 +6,7 @@ import (
"testing"
"unsafe"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/tags"
"git.tcp.direct/kayos/chestnut/encoding/tags"
jsoniter "github.com/json-iterator/go"
"github.com/modern-go/reflect2"
"github.com/stretchr/testify/assert"

4
encoding/json/encoders/hash/hash.go
View File

@ -3,8 +3,8 @@ package hash
import (
"encoding/hex"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/tags"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encoding/tags"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
)
// HashingFunction defines the prototype for the hash callback. Defaults to EncodeToSHA256.

2
encoding/json/encoders/hash/hash_test.go
View File

@ -3,7 +3,7 @@ package hash
import (
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/tags"
"git.tcp.direct/kayos/chestnut/encoding/tags"
"github.com/stretchr/testify/assert"
)

2
encoding/json/encoders/lookup/decoder.go
View File

@ -6,7 +6,7 @@ import (
"reflect"
"unsafe"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut/log"
jsoniter "github.com/json-iterator/go"
"github.com/modern-go/reflect2"
)

2
encoding/json/encoders/lookup/decoder_test.go
View File

@ -6,7 +6,7 @@ import (
"testing"
"unsafe"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
jsoniter "github.com/json-iterator/go"
"github.com/modern-go/reflect2"
"github.com/stretchr/testify/assert"

4
encoding/json/encoders/lookup/encoder.go
View File

@ -4,8 +4,8 @@ import (
"errors"
"unsafe"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/log"
jsoniter "github.com/json-iterator/go"
"github.com/modern-go/reflect2"
)

4
encoding/json/encoders/lookup/encoder_test.go
View File

@ -2,11 +2,11 @@ package lookup
import (
"fmt"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut/log"
jsoniter "github.com/json-iterator/go"
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
"github.com/modern-go/reflect2"
"github.com/stretchr/testify/assert"
)

10
encoding/json/encoders/secure/decoder.go
View File

@ -6,10 +6,10 @@ import (
"fmt"
"sync"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders/lookup"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/packager"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders/lookup"
"git.tcp.direct/kayos/chestnut/encoding/json/packager"
"git.tcp.direct/kayos/chestnut/log"
jsoniter "github.com/json-iterator/go"
"github.com/modern-go/reflect2"
)
@ -84,7 +84,7 @@ func (ext *DecoderExtension) Unseal(encoded []byte) ([]byte, error) {
ext.mu.Lock()
defer ext.mu.Unlock()
ext.log.Debugf("unsealing encoded %d bytes", len(encoded))
/// must do this first
// / must do this first
if ext.open {
ext.log.Debug("decoder is open, closing it")
ext.close()

4
encoding/json/encoders/secure/decoder_test.go
View File

@ -5,8 +5,8 @@ import (
"reflect"
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress/zstd"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/compress/zstd"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
"github.com/stretchr/testify/assert"
)

14
encoding/json/encoders/secure/encoder.go
View File

@ -7,12 +7,12 @@ import (
"reflect"
"sync"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders/hash"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders/lookup"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/packager"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/tags"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders/hash"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders/lookup"
"git.tcp.direct/kayos/chestnut/encoding/json/packager"
"git.tcp.direct/kayos/chestnut/encoding/tags"
"git.tcp.direct/kayos/chestnut/log"
"github.com/json-iterator/go"
)
@ -86,7 +86,7 @@ func (ext *EncoderExtension) Seal(encoded []byte) ([]byte, error) {
ext.mu.Lock()
defer ext.mu.Unlock()
ext.log.Debugf("sealing %d encoded bytes: %s", len(encoded), string(encoded))
/// must do this first
// / must do this first
if ext.open {
ext.log.Debug("encoder is open, closing it")
ext.close()

10
encoding/json/encoders/secure/encoder_test.go
View File

@ -2,13 +2,15 @@ package secure
import (
"errors"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"reflect"
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/packager"
"git.tcp.direct/kayos/chestnut/log"
"github.com/stretchr/testify/assert"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/json/packager"
)
type encoderTest struct {
@ -44,7 +46,7 @@ func TestSecureEncoderExtension(t *testing.T) {
// register encoding extension
encoderExt := NewSecureEncoderExtension(testEncoderID,
PassthroughEncryption,
WithLogger(log.Log),
WithLogger(log.NewZerologLoggerWithLevel(log.DebugLevel)),
test.compressed)
encoder.RegisterExtension(encoderExt)
// open the encoder

8
encoding/json/encoders/secure/options.go
View File

@ -1,9 +1,9 @@
package secure
import (
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress/zstd"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut/encoding/compress"
"git.tcp.direct/kayos/chestnut/encoding/compress/zstd"
"git.tcp.direct/kayos/chestnut/log"
)
// Options provides a default implementation for common options for a secure encoding.
@ -23,7 +23,7 @@ type Options struct {
// DefaultOptions represents the recommended default Options for secure encoding.
var DefaultOptions = Options{
log: log.Log,
log: log.NewZerologLoggerWithLevel(log.DebugLevel),
}
// A Option sets options such as compression or sparse decoding.

4
encoding/json/encoders/secure/secure_test.go
View File

@ -4,8 +4,8 @@ import (
"reflect"
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/compress"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
jsoniter "github.com/json-iterator/go"
"github.com/stretchr/testify/assert"
)

2
encoding/json/packager/encoding.go
View File

@ -4,7 +4,7 @@ import (
"bytes"
"encoding/gob"
"errors"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
)
// EncodePackage returns a valid binary enc package for storage.

2
encoding/json/packager/package.go
View File

@ -4,8 +4,8 @@ import (
"errors"
"fmt"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders"
"github.com/hashicorp/go-version"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders"
)
const (

4
encoding/json/secure_test.go
View File

@ -4,8 +4,8 @@ import (
"reflect"
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress"
"git.tcp.direct/kayos/chestnut-bitcask/encoding/json/encoders/secure"
"git.tcp.direct/kayos/chestnut/encoding/compress"
"git.tcp.direct/kayos/chestnut/encoding/json/encoders/secure"
"github.com/stretchr/testify/assert"
)

4
encryptor/aes.go
View File

@ -3,8 +3,8 @@ package encryptor
import (
"fmt"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/aes"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/aes"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
)
// AESEncryptor is an encryptor that supports the

2
encryptor/aes/aes.go
View File

@ -5,7 +5,7 @@ import (
"crypto/cipher"
"errors"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
)
// currently supported modes

2
encryptor/aes/aes_test.go
View File

@ -4,7 +4,7 @@ import (
"math"
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"github.com/stretchr/testify/assert"
)

2
encryptor/aes/cfb.go
View File

@ -3,7 +3,7 @@ package aes
import (
"crypto/cipher"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
)
var (

2
encryptor/aes/ctr.go
View File

@ -3,7 +3,7 @@ package aes
import (
"crypto/cipher"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
)
var (

2
encryptor/aes/gcm.go
View File

@ -3,7 +3,7 @@ package aes
import (
"crypto/cipher"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
)
var (

2
encryptor/aes/stream.go
View File

@ -4,7 +4,7 @@ import (
"crypto/aes"
"crypto/cipher"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
)
type streamCipher func(block cipher.Block, iv []byte) cipher.Stream

4
encryptor/aes_test.go
View File

@ -4,9 +4,9 @@ import (
"fmt"
"testing"
"git.tcp.direct/kayos/chestnut/encryptor/aes"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"github.com/google/uuid"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/aes"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"github.com/stretchr/testify/assert"
)

2
encryptor/chain.go
View File

@ -3,7 +3,7 @@ package encryptor
import (
"strings"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
)
// ChainEncryptor is an encryptor that supports an chain of other Encryptors.

4
encryptor/chian_test.go
View File

@ -4,8 +4,8 @@ import (
"strings"
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/aes"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/encryptor/aes"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"github.com/stretchr/testify/assert"
)

8
examples/hash/main.go
View File

@ -6,10 +6,10 @@ import (
"os"
"path/filepath"
"git.tcp.direct/kayos/chestnut-bitcask"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/aes"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut-bitcask/storage/nuts"
"git.tcp.direct/kayos/chestnut"
"git.tcp.direct/kayos/chestnut/encryptor/aes"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/storage/nuts"
)
func main() {

10
examples/keystore/main.go
View File

@ -7,12 +7,12 @@ import (
"os"
"path/filepath"
"git.tcp.direct/kayos/chestnut"
"git.tcp.direct/kayos/chestnut/encryptor/aes"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/keystore"
"git.tcp.direct/kayos/chestnut/storage/nuts"
"github.com/btcsuite/btcd/btcec"
"git.tcp.direct/kayos/chestnut-bitcask"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/aes"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut-bitcask/keystore"
"git.tcp.direct/kayos/chestnut-bitcask/storage/nuts"
)
func main() {

8
examples/sparse/main.go
View File

@ -6,10 +6,10 @@ import (
"os"
"path/filepath"
"git.tcp.direct/kayos/chestnut-bitcask"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/aes"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut-bitcask/storage/nuts"
"git.tcp.direct/kayos/chestnut"
"git.tcp.direct/kayos/chestnut/encryptor/aes"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/storage/nuts"
)
func main() {

2
go.mod
View File

@ -1,4 +1,4 @@
module git.tcp.direct/kayos/chestnut-bitcask
module git.tcp.direct/kayos/chestnut
go 1.17

6
keystore/keystore.go
View File

@ -3,10 +3,10 @@ package keystore
import (
"errors"
"git.tcp.direct/kayos/chestnut"
"git.tcp.direct/kayos/chestnut/log"
"git.tcp.direct/kayos/chestnut/storage"
"github.com/ipfs/go-ipfs-keystore"
"git.tcp.direct/kayos/chestnut-bitcask"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut-bitcask/storage"
ci "github.com/libp2p/go-libp2p-core/crypto"
)

10
keystore/keystore_test.go
View File

@ -5,12 +5,12 @@ import (
"sort"
"testing"
"git.tcp.direct/kayos/chestnut"
"git.tcp.direct/kayos/chestnut/encryptor/aes"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/storage"
"git.tcp.direct/kayos/chestnut/storage/nuts"
"github.com/google/uuid"
"git.tcp.direct/kayos/chestnut-bitcask"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/aes"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut-bitcask/storage"
"git.tcp.direct/kayos/chestnut-bitcask/storage/nuts"
ci "github.com/libp2p/go-libp2p-core/crypto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"

2
log/zerolog.go
View File

@ -110,3 +110,5 @@ func NewZerologLoggerWithLevel(level Level) Zlog {
zerolog.SetGlobalLevel(levelTranslate[level])
return Zlog{l: &lg}
}
var Log = NewZerologLoggerWithLevel(DebugLevel)

15
options.go
View File

@ -1,10 +1,10 @@
package chestnut
import (
"git.tcp.direct/kayos/chestnut-bitcask/encoding/compress"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor"
"git.tcp.direct/kayos/chestnut-bitcask/encryptor/crypto"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut/encoding/compress"
"git.tcp.direct/kayos/chestnut/encryptor"
"git.tcp.direct/kayos/chestnut/encryptor/crypto"
"git.tcp.direct/kayos/chestnut/log"
)
// ChestOptions provides a default implementation for common options for a secure store.
@ -149,15 +149,10 @@ func WithLogger(l log.Logger) ChestOption {
// WithStdLogger is a convenience that returns a StoreOption for a standard err logger.
func WithStdLogger(lvl log.Level) ChestOption {
return WithLogger(log.NewStdLoggerWithLevel(lvl))
return WithZerologLogger(lvl)
}
// WithZerologLogger is a convenience that returns a StoreOption for a default Zerolog logger.
func WithZerologLogger(lvl log.Level) ChestOption {
return WithLogger(log.NewZerologLoggerWithLevel(lvl))
}
// WithZapLogger is a convenience that returns a StoreOption for a production zap logger.
func WithZapLogger(lvl log.Level) ChestOption {
return WithLogger(log.NewZapLoggerWithLevel(lvl))
}

34
storage/bitcask/store.go
View File

@ -9,8 +9,8 @@ import (
"git.tcp.direct/Mirrors/bitcask-mirror"
jsoniter "github.com/json-iterator/go"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut-bitcask/storage"
"git.tcp.direct/kayos/chestnut/log"
"git.tcp.direct/kayos/chestnut/storage"
)
const (
@ -42,6 +42,7 @@ func NewStore(path string, opt ...storage.StoreOption) storage.Storage {
func (s *bitcaskStore) Options() storage.StoreOptions {
return s.opts
}
// Open opens the store.
func (s *bitcaskStore) Open() (err error) {
@ -115,7 +116,7 @@ func (s *bitcaskStore) Has(name string, key []byte) (bool, error) {
func (s *bitcaskStore) Delete(name string, key []byte) error {
s.log.Warnf("bitcask doesn't use name (%s)", name)
s.log.Debugf("delete: key: %s", key)
return s.db.Delete(key)
return s.db.Delete(key)
}
// List returns a list of all keys in the namespace.
@ -124,9 +125,9 @@ func (s *bitcaskStore) List(name string) (keys [][]byte, err error) {
s.log.Debugf("list: keys in bitcask storage")
bkeys := s.db.Keys()
select {
case key := <- bkeys:
keys = append(keys, key)
default:
case key := <-bkeys:
keys = append(keys, key)
default:
}
s.log.Debugf("list: found %d keys: %s", s.db.Len(), keys)
@ -144,17 +145,16 @@ func (s *bitcaskStore) ListAll() (map[string][][]byte, error) {
// Export copies the datastore to directory at path.
func (s *bitcaskStore) Export(path string) error {
/* s.log.Debugf("export: to path: %s", path)
if path == "" {
err := fmt.Errorf("invalid path: %s", path)
return s.logError("export", err)
} else if s.path == path {
err := fmt.Errorf("path cannot be store path: %s", path)
return s.logError("export", err)
}
var err error
path, err = ensureDBPath(path)*/
/* s.log.Debugf("export: to path: %s", path)
if path == "" {
err := fmt.Errorf("invalid path: %s", path)
return s.logError("export", err)
} else if s.path == path {
err := fmt.Errorf("path cannot be store path: %s", path)
return s.logError("export", err)
}
var err error
path, err = ensureDBPath(path)*/
return errors.New("Export is not yet implemented for bitcask stores")
}

2
storage/bitcask/store_test.go
View File

@ -3,7 +3,7 @@ package bitcask
import (
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/storage/store_test"
"git.tcp.direct/kayos/chestnut/storage/store_test"
)
func TestStore(t *testing.T) {

4
storage/bolt/store.go
View File

@ -6,8 +6,8 @@ import (
"os"
"path/filepath"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut-bitcask/storage"
"git.tcp.direct/kayos/chestnut/log"
"git.tcp.direct/kayos/chestnut/storage"
jsoniter "github.com/json-iterator/go"
bolt "go.etcd.io/bbolt"
)

2
storage/bolt/store_test.go
View File

@ -3,7 +3,7 @@ package bolt
import (
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/storage/store_test"
"git.tcp.direct/kayos/chestnut/storage/store_test"
)
func TestStore(t *testing.T) {

4
storage/nuts/store.go
View File

@ -5,8 +5,8 @@ import (
"errors"
"fmt"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut-bitcask/storage"
"git.tcp.direct/kayos/chestnut/log"
"git.tcp.direct/kayos/chestnut/storage"
jsoniter "github.com/json-iterator/go"
"github.com/xujiajun/nutsdb"
)

2
storage/nuts/store_test.go
View File

@ -3,7 +3,7 @@ package nuts
import (
"testing"
"git.tcp.direct/kayos/chestnut-bitcask/storage/store_test"
"git.tcp.direct/kayos/chestnut/storage/store_test"
)
func TestStore(t *testing.T) {

11
storage/options.go
View File

@ -1,6 +1,6 @@
package storage
import "git.tcp.direct/kayos/chestnut-bitcask/log"
import "git.tcp.direct/kayos/chestnut/log"
// StoreOptions provides a default implementation for common storage Options stores should support.
type StoreOptions struct {
@ -14,7 +14,7 @@ func (o StoreOptions) Logger() log.Logger {
// DefaultStoreOptions represents the recommended default StoreOptions for a store.
var DefaultStoreOptions = StoreOptions{
log: log.Log,
log: log.NewZerologLoggerWithLevel(log.DebugLevel),
}
// A StoreOption sets options such disabling overwrite, and other parameters, etc.
@ -62,15 +62,10 @@ func WithLogger(l log.Logger) StoreOption {
// WithStdLogger is a convenience that returns a StoreOption for a standard err logger.
func WithStdLogger(lvl log.Level) StoreOption {
return WithLogger(log.NewStdLoggerWithLevel(lvl))
return WithLogger(log.NewZerologLoggerWithLevel(lvl))
}
// WithZerologLogger is a convenience that returns a StoreOption for a default Zerolog logger.
func WithZerologLogger(lvl log.Level) StoreOption {
return WithLogger(log.NewZerologLoggerWithLevel(lvl))
}
// WithZapLogger is a convenience that returns a StoreOption for a production zap logger.
func WithZapLogger(lvl log.Level) StoreOption {
return WithLogger(log.NewZapLoggerWithLevel(lvl))
}

5
storage/store_test/test_suite.go
View File

@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"git.tcp.direct/kayos/chestnut-bitcask/log"
"git.tcp.direct/kayos/chestnut-bitcask/storage"
"git.tcp.direct/kayos/chestnut/log"
"git.tcp.direct/kayos/chestnut/storage"
)
type testCase struct {
@ -250,7 +250,6 @@ func (ts *storeTestSuite) TestStoreWithLogger() {
logOpts := []LoggerOpt{
storage.WithZerologLogger,
storage.WithStdLogger,
storage.WithZapLogger,
}
path := ts.T().TempDir()
for _, level := range levels {

2
value/id.go
View File

@ -1,6 +1,6 @@
package value
import "git.tcp.direct/kayos/chestnut-bitcask/storage"
import "git.tcp.direct/kayos/chestnut/storage"
// ID provides a implementation of the Keyed interface.
// It can be embedded in another structure to build custom Keyed values.