cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r816379 - in /incubator/cassandra/trunk: src/java/org/apache/cassandra/service/StorageService.java test/unit/org/apache/cassandra/db/CompactionsTest.java
Date Thu, 17 Sep 2009 21:09:53 GMT
Author: jbellis
Date: Thu Sep 17 21:09:52 2009
New Revision: 816379

URL: http://svn.apache.org/viewvc?rev=816379&view=rev
Log:
minor fixes
patch by jbellis; reviewed by goffinet for CASSANDRA-436

Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
    incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=816379&r1=816378&r2=816379&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Thu
Sep 17 21:09:52 2009
@@ -95,7 +95,7 @@
         return udpAddr_;
     }
 
-    public static IPartitioner getPartitioner() {
+    public static IPartitioner<?> getPartitioner() {
         return partitioner_;
     }
 

Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java?rev=816379&r1=816378&r2=816379&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java Thu Sep
17 21:09:52 2009
@@ -51,7 +51,7 @@
                 inserted.add(key);
             }
             store.forceBlockingFlush();
-            assertEquals(table.getColumnFamilyStore("Standard1").getKeyRange("", "", 10000).keys.size(),
inserted.size());
+            assertEquals(inserted.size(), table.getColumnFamilyStore("Standard1").getKeyRange("",
"", 10000).keys.size());
         }
         while (true)
         {
@@ -63,6 +63,6 @@
         {
             store.doCompaction(2, store.getSSTables().size());
         }
-        assertEquals(table.getColumnFamilyStore("Standard1").getKeyRange("", "", 10000).keys.size(),
inserted.size());
+        assertEquals(inserted.size(), table.getColumnFamilyStore("Standard1").getKeyRange("",
"", 10000).keys.size());
     }
 }



Mime
View raw message