From e85fa4643104ec679a0caaca724fecb7b25c515e Mon Sep 17 00:00:00 2001
From: ngaut <ngaut@126.com>
Date: Tue, 3 Nov 2015 16:01:54 +0800
Subject: [PATCH] localstore: clean up

---
 store/localstore/txn.go | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/store/localstore/txn.go b/store/localstore/txn.go
index b906e9098a..d6769a386d 100644
--- a/store/localstore/txn.go
+++ b/store/localstore/txn.go
@@ -42,16 +42,15 @@ type dbTxn struct {
 	snapshotVals map[string]struct{} // origin version in snapshot
 }
 
-func (txn *dbTxn) markOrigin(k []byte) error {
+func (txn *dbTxn) markOrigin(k []byte) {
 	keystr := string(k)
 
 	// Already exist, do nothing.
 	if _, ok := txn.snapshotVals[keystr]; ok {
-		return nil
+		return
 	}
 
 	txn.snapshotVals[keystr] = struct{}{}
-	return nil
 }
 
 // Implement transaction interface
@@ -60,9 +59,7 @@ func (txn *dbTxn) Inc(k kv.Key, step int64) (int64, error) {
 	log.Debugf("Inc %q, step %d txn:%d", k, step, txn.tid)
 	k = kv.EncodeKey(k)
 
-	if err := txn.markOrigin(k); err != nil {
-		return 0, errors.Trace(err)
-	}
+	txn.markOrigin(k)
 	val, err := txn.UnionStore.Get(k)
 	if kv.IsErrNotFound(err) {
 		err = txn.UnionStore.Set(k, []byte(strconv.FormatInt(step, 10)))
@@ -137,10 +134,7 @@ func (txn *dbTxn) Set(k kv.Key, data []byte) error {
 	if err != nil {
 		return errors.Trace(err)
 	}
-	if err := txn.markOrigin(k); err != nil {
-		return errors.Trace(err)
-	}
-
+	txn.markOrigin(k)
 	txn.store.compactor.OnSet(k)
 	return nil
 }
@@ -167,10 +161,7 @@ func (txn *dbTxn) Delete(k kv.Key) error {
 	if err != nil {
 		return errors.Trace(err)
 	}
-	if err := txn.markOrigin(k); err != nil {
-		return errors.Trace(err)
-	}
-
+	txn.markOrigin(k)
 	txn.store.compactor.OnDelete(k)
 	return nil
 }
@@ -268,9 +259,7 @@ func (txn *dbTxn) Rollback() error {
 func (txn *dbTxn) LockKeys(keys ...kv.Key) error {
 	for _, key := range keys {
 		key = kv.EncodeKey(key)
-		if err := txn.markOrigin(key); err != nil {
-			return errors.Trace(err)
-		}
+		txn.markOrigin(key)
 	}
 	return nil
 }