From 80a59f00b7223eebdf1555369ae057e89609dd1a Mon Sep 17 00:00:00 2001
From: Yicheng Qin <qycqycqycqycqyc@gmail.com>
Date: Wed, 17 Jun 2015 16:55:16 -0700
Subject: [PATCH] storage: fix limit mismatch in Range func

---
 storage/kvstore.go      |  6 +++---
 storage/kvstore_test.go | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/storage/kvstore.go b/storage/kvstore.go
index 87e24c352..9399f8f80 100644
--- a/storage/kvstore.go
+++ b/storage/kvstore.go
@@ -260,9 +260,6 @@ func (s *store) rangeKeys(key, end []byte, limit, rangeRev int64) (kvs []storage
 	if len(revpairs) == 0 {
 		return nil, rev, nil
 	}
-	if limit > 0 && len(revpairs) > int(limit) {
-		revpairs = revpairs[:limit]
-	}
 
 	tx := s.b.BatchTx()
 	tx.Lock()
@@ -283,6 +280,9 @@ func (s *store) rangeKeys(key, end []byte, limit, rangeRev int64) (kvs []storage
 		if e.Type == storagepb.PUT {
 			kvs = append(kvs, e.Kv)
 		}
+		if limit > 0 && len(kvs) >= int(limit) {
+			break
+		}
 	}
 	return kvs, rev, nil
 }
diff --git a/storage/kvstore_test.go b/storage/kvstore_test.go
index 333b9927d..25ee47ac5 100644
--- a/storage/kvstore_test.go
+++ b/storage/kvstore_test.go
@@ -89,6 +89,40 @@ func TestRangeBadRev(t *testing.T) {
 	}
 }
 
+func TestRangeLimit(t *testing.T) {
+	s := newStore("test")
+	defer os.Remove("test")
+
+	s.Put([]byte("foo"), []byte("bar"))
+	s.Put([]byte("foo1"), []byte("bar1"))
+	s.Put([]byte("foo2"), []byte("bar2"))
+	s.DeleteRange([]byte("foo1"), nil)
+	kvs := []storagepb.KeyValue{
+		{Key: []byte("foo"), Value: []byte("bar")},
+		{Key: []byte("foo2"), Value: []byte("bar2")},
+	}
+
+	tests := []struct {
+		limit int64
+		wkvs  []storagepb.KeyValue
+	}{
+		// no limit
+		{0, kvs},
+		{1, kvs[:1]},
+		{2, kvs},
+		{3, kvs},
+	}
+	for i, tt := range tests {
+		kvs, _, err := s.Range([]byte("foo"), []byte("foo3"), tt.limit, 0)
+		if err != nil {
+			t.Fatalf("#%d: range error (%v)", i, err)
+		}
+		if !reflect.DeepEqual(kvs, tt.wkvs) {
+			t.Errorf("#%d: kvs = %+v, want %+v", i, kvs, tt.wkvs)
+		}
+	}
+}
+
 func TestSimpleDeleteRange(t *testing.T) {
 	tests := []struct {
 		key, end []byte