Ensure the count is right when limit is specified.

server/etcdserver/txn/txn.go

@@ -216,12 +216,13 @@ func processKvsInRange(r *pb.RangeRequest, rr *mvcc.RangeResult, resp *pb.RangeR
 		pruneKVs(rr, f)
 	}
 
+        // No more prunning after this point; we can count now.
+        resp.Count = int64(len(rr.KVs))
 	// If r.CountOnly was specified:
 	//   * r.SortOrder is useless and ignored.
 	//   * r.Limit is useless and ignored.
 	if r.CountOnly {
 		resp.Kvs = make([]*mvccpb.KeyValue, 0)
-		resp.Count = int64(len(rr.KVs))
 		return
 	}
 
@@ -272,7 +273,6 @@ func processKvsInRange(r *pb.RangeRequest, rr *mvcc.RangeResult, resp *pb.RangeR
 		}
 		resp.Kvs[i] = &rr.KVs[i]
 	}
-	resp.Count = int64(len(resp.Kvs))
 }
 
 func Txn(ctx context.Context, lg *zap.Logger, rt *pb.TxnRequest, txnModeWriteWithSharedBuffer bool, kv mvcc.KV, lessor lease.Lessor) (*pb.TxnResponse, *traceutil.Trace, error) {