Return-Path: 
 <commits-return-123015-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AE67517CDB
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Thu,  5 Feb 2015 14:33:38 +0000 (UTC)
Received: (qmail 50853 invoked by uid 500); 5 Feb 2015 14:33:38 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 50814 invoked by uid 500); 5 Feb 2015 14:33:38 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 50790 invoked by uid 99); 5 Feb 2015 14:33:38 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Feb 2015 14:33:38 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 4C6C0E03E8; Thu,  5 Feb 2015 14:33:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: benedict@apache.org
To: commits@cassandra.apache.org
Date: Thu, 05 Feb 2015 14:33:38 -0000
Message-Id: <6c1187e429304ebbaaa2878fd404467c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] cassandra git commit: remove extraneous Range.normalize() in
 SSTableScanner

Repository: cassandra
Updated Branches:
  refs/heads/trunk 4231b4e2a -> f161318fd


remove extraneous Range.normalize() in SSTableScanner


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1511341
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1511341
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1511341

Branch: refs/heads/trunk
Commit: b15113411a6efa725d3f420a7e0f6bc796aa9780
Parents: 2d5d301
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Thu Feb 5 14:32:54 2015 +0000
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Thu Feb 5 14:32:54 2015 +0000

----------------------------------------------------------------------
 src/java/org/apache/cassandra/io/sstable/SSTableScanner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1511341/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
index dc065af..676f87d 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
@@ -59,7 +59,7 @@ public class SSTableScanner implements ISSTableScanner
     public static ISSTableScanner getScanner(SSTableReader sstable, Collection<Range<Token>> tokenRanges, RateLimiter limiter)
     {
         // We want to avoid allocating a SSTableScanner if the range don't overlap the sstable (#5249)
-        List<Pair<Long, Long>> positions = sstable.getPositionsForRanges(Range.normalize(tokenRanges));
+        List<Pair<Long, Long>> positions = sstable.getPositionsForRanges(tokenRanges);
         if (positions.isEmpty())
             return new EmptySSTableScanner(sstable.getFilename());