Browse Source

*: typo, remove string type assertions

Gyu-Ho Lee 9 years ago
parent
commit
a288188001
3 changed files with 6 additions and 6 deletions
  1. 1 1
      etcdserver/api/v3rpc/maintenance.go
  2. 4 4
      mvcc/backend/batch_tx.go
  3. 1 1
      mvcc/key_index.go

+ 1 - 1
etcdserver/api/v3rpc/maintenance.go

@@ -60,7 +60,7 @@ func (ms *maintenanceServer) Defragment(ctx context.Context, sr *pb.DefragmentRe
 	plog.Noticef("starting to defragment the storage backend...")
 	plog.Noticef("starting to defragment the storage backend...")
 	err := ms.bg.Backend().Defrag()
 	err := ms.bg.Backend().Defrag()
 	if err != nil {
 	if err != nil {
-		plog.Errorf("failed to deframent the storage backend (%v)", err)
+		plog.Errorf("failed to defragment the storage backend (%v)", err)
 		return nil, err
 		return nil, err
 	}
 	}
 	plog.Noticef("finished defragmenting the storage backend")
 	plog.Noticef("finished defragmenting the storage backend")

+ 4 - 4
mvcc/backend/batch_tx.go

@@ -52,7 +52,7 @@ func newBatchTx(backend *backend) *batchTx {
 func (t *batchTx) UnsafeCreateBucket(name []byte) {
 func (t *batchTx) UnsafeCreateBucket(name []byte) {
 	_, err := t.tx.CreateBucket(name)
 	_, err := t.tx.CreateBucket(name)
 	if err != nil && err != bolt.ErrBucketExists {
 	if err != nil && err != bolt.ErrBucketExists {
-		log.Fatalf("mvcc: cannot create bucket %s (%v)", string(name), err)
+		log.Fatalf("mvcc: cannot create bucket %s (%v)", name, err)
 	}
 	}
 	t.pending++
 	t.pending++
 }
 }
@@ -70,7 +70,7 @@ func (t *batchTx) UnsafeSeqPut(bucketName []byte, key []byte, value []byte) {
 func (t *batchTx) unsafePut(bucketName []byte, key []byte, value []byte, seq bool) {
 func (t *batchTx) unsafePut(bucketName []byte, key []byte, value []byte, seq bool) {
 	bucket := t.tx.Bucket(bucketName)
 	bucket := t.tx.Bucket(bucketName)
 	if bucket == nil {
 	if bucket == nil {
-		log.Fatalf("mvcc: bucket %s does not exist", string(bucketName))
+		log.Fatalf("mvcc: bucket %s does not exist", bucketName)
 	}
 	}
 	if seq {
 	if seq {
 		// it is useful to increase fill percent when the workloads are mostly append-only.
 		// it is useful to increase fill percent when the workloads are mostly append-only.
@@ -87,7 +87,7 @@ func (t *batchTx) unsafePut(bucketName []byte, key []byte, value []byte, seq boo
 func (t *batchTx) UnsafeRange(bucketName []byte, key, endKey []byte, limit int64) (keys [][]byte, vs [][]byte) {
 func (t *batchTx) UnsafeRange(bucketName []byte, key, endKey []byte, limit int64) (keys [][]byte, vs [][]byte) {
 	bucket := t.tx.Bucket(bucketName)
 	bucket := t.tx.Bucket(bucketName)
 	if bucket == nil {
 	if bucket == nil {
-		log.Fatalf("mvcc: bucket %s does not exist", string(bucketName))
+		log.Fatalf("mvcc: bucket %s does not exist", bucketName)
 	}
 	}
 
 
 	if len(endKey) == 0 {
 	if len(endKey) == 0 {
@@ -114,7 +114,7 @@ func (t *batchTx) UnsafeRange(bucketName []byte, key, endKey []byte, limit int64
 func (t *batchTx) UnsafeDelete(bucketName []byte, key []byte) {
 func (t *batchTx) UnsafeDelete(bucketName []byte, key []byte) {
 	bucket := t.tx.Bucket(bucketName)
 	bucket := t.tx.Bucket(bucketName)
 	if bucket == nil {
 	if bucket == nil {
-		log.Fatalf("mvcc: bucket %s does not exist", string(bucketName))
+		log.Fatalf("mvcc: bucket %s does not exist", bucketName)
 	}
 	}
 	err := bucket.Delete(key)
 	err := bucket.Delete(key)
 	if err != nil {
 	if err != nil {

+ 1 - 1
mvcc/key_index.go

@@ -24,7 +24,7 @@ import (
 )
 )
 
 
 var (
 var (
-	ErrRevisionNotFound = errors.New("stroage: revision not found")
+	ErrRevisionNotFound = errors.New("mvcc: revision not found")
 )
 )
 
 
 // keyIndex stores the revisions of a key in the backend.
 // keyIndex stores the revisions of a key in the backend.