cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r799743 - /incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
Date Fri, 31 Jul 2009 20:42:54 GMT
Author: jbellis
Date: Fri Jul 31 20:42:54 2009
New Revision: 799743

URL: http://svn.apache.org/viewvc?rev=799743&view=rev
Log:
unmix line endings in Table.java.  patch by Jeff Hodges; reviewed by jbellis for CASSANDRA-333

Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=799743&r1=799742&r2=799743&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Fri Jul 31 20:42:54
2009
@@ -656,7 +656,7 @@
      * @param maxResults
      * @return list of keys between startWith and stopAt
      */
-    public RangeReply getKeyRange(String columnFamily, final String startWith, final String
stopAt, int maxResults)
+    public RangeReply getKeyRange(String columnFamily, final String startWith, final String
stopAt, int maxResults)
     throws IOException, ExecutionException, InterruptedException
     {
         assert getColumnFamilyStore(columnFamily) != null : columnFamily;
@@ -672,7 +672,7 @@
         }
     }
 
-    private RangeReply getKeyRangeUnsafe(final String cfName, final String startWith, final
String stopAt, int maxResults) throws IOException, ExecutionException, InterruptedException
+    private RangeReply getKeyRangeUnsafe(final String cfName, final String startWith, final
String stopAt, int maxResults) throws IOException, ExecutionException, InterruptedException
     {
         // (OPP key decoration is a no-op so using the "decorated" comparator against raw
keys is fine)
         final Comparator<String> comparator = StorageService.getPartitioner().getDecoratedKeyComparator();
@@ -729,12 +729,12 @@
             // pull keys out of the CollatedIterator.  checking tombstone status is expensive,
             // so we set an arbitrary limit on how many we'll do at once.
             List<String> keys = new ArrayList<String>();
-            boolean rangeCompletedLocally = false;
+            boolean rangeCompletedLocally = false;
             for (String current : reduced)
             {
                 if (!stopAt.isEmpty() && comparator.compare(stopAt, current) <
0)
                 {
-                    rangeCompletedLocally = true;
+                    rangeCompletedLocally = true;
                     break;
                 }
                 // make sure there is actually non-tombstone content associated w/ this key
@@ -746,11 +746,11 @@
                 }
                 if (keys.size() >= maxResults)
                 {
-                    rangeCompletedLocally = true;
+                    rangeCompletedLocally = true;
                     break;
                 }
             }
-            return new RangeReply(keys, rangeCompletedLocally);
+            return new RangeReply(keys, rangeCompletedLocally);
         }
         finally
         {



Mime
View raw message