Return-Path: 
 <commits-return-56067-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 C6E79CFE2
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Thu, 21 Jun 2012 18:36:49 +0000 (UTC)
Received: (qmail 89004 invoked by uid 500); 21 Jun 2012 18:36:49 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 88966 invoked by uid 500); 21 Jun 2012 18:36:49 -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 88956 invoked by uid 99); 21 Jun 2012 18:36:49 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jun 2012 18:36:49 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 64BA162CF; Thu, 21 Jun 2012 18:36:49 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jbellis@apache.org
To: commits@cassandra.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: add short-circuit abort check in searchInternal patch by
 Daniel Doubleday; reviewed by jbellis for CASSANDRA-3708
Message-Id: <20120621183649.64BA162CF@tyr.zones.apache.org>
Date: Thu, 21 Jun 2012 18:36:49 +0000 (UTC)

Updated Branches:
  refs/heads/trunk e6610e469 -> 84bfdf27d


add short-circuit abort check in searchInternal
patch by Daniel Doubleday; reviewed by jbellis for CASSANDRA-3708


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

Branch: refs/heads/trunk
Commit: 84bfdf27dfbd8aa3c030fd77b188c245db9bf705
Parents: e6610e4
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Jun 21 13:36:29 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Jun 21 13:36:29 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/utils/IntervalTree.java   |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84bfdf27/src/java/org/apache/cassandra/utils/IntervalTree.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/IntervalTree.java b/src/java/org/apache/cassandra/utils/IntervalTree.java
index ec8e166..ba9e438 100644
--- a/src/java/org/apache/cassandra/utils/IntervalTree.java
+++ b/src/java/org/apache/cassandra/utils/IntervalTree.java
@@ -290,6 +290,9 @@ public class IntervalTree<C, D, I extends Interval<C, D>> implements Iterable<I>
 
         void searchInternal(Interval<C, D> searchInterval, List<D> results)
         {
+            if (comparePoints(searchInterval.max, low) < 0 || comparePoints(searchInterval.min, high) > 0)
+                return;
+
             if (contains(searchInterval, center))
             {
                 // Adds every interval contained in this node to the result set then search left and right for further