From 1912b28f4fd02edbfe1ca6a235e1a7128ee85bd5 Mon Sep 17 00:00:00 2001 From: disksing Date: Fri, 6 Nov 2015 10:24:29 +0800 Subject: [PATCH] hbase-store: fix build error --- store/hbase/snapshot.go | 4 ++-- store/hbase/txn.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/store/hbase/snapshot.go b/store/hbase/snapshot.go index 8feb9676ca..189afa96b5 100644 --- a/store/hbase/snapshot.go +++ b/store/hbase/snapshot.go @@ -142,10 +142,10 @@ type hbaseIter struct { valid bool } -func (it *hbaseIter) Next() (kv.Iterator, error) { +func (it *hbaseIter) Next() error { it.rs = it.ThemisScanner.Next() it.valid = it.rs != nil && len(it.rs.Columns) > 0 && !it.ThemisScanner.Closed() - return it, nil + return nil } func (it *hbaseIter) Valid() bool { diff --git a/store/hbase/txn.go b/store/hbase/txn.go index 671ba6b26f..ad851c18b7 100644 --- a/store/hbase/txn.go +++ b/store/hbase/txn.go @@ -154,7 +154,7 @@ func (txn *hbaseTxn) Delete(k kv.Key) error { func (txn *hbaseTxn) each(f func(kv.Iterator) error) error { iter := txn.UnionStore.Dirty.NewIterator(nil) defer iter.Close() - for ; iter.Valid(); iter, _ = iter.Next() { + for ; iter.Valid(); iter.Next() { if err := f(iter); err != nil { return errors.Trace(err) }