svn commit: r1059717 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra: db/ColumnFamily.java service/ReadResponseResolver.java

[jbellis]

Author: jbellis
Date: Mon Jan 17 01:36:48 2011
New Revision: 1059717

URL: http://svn.apache.org/viewvc?rev=1059717&view=rev
Log:
r/m unused code and improve formatting

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamily.java
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=1059717&r1=1059716&r2=1059717&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamily.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamily.java
 Mon Jan 17 01:36:48 2011
@@ -129,9 +129,7 @@ public class ColumnFamily implements ICo
     public void addAll(ColumnFamily cf)
     {
         for (IColumn column : cf.getSortedColumns())
-        {
             addColumn(column);
-        }
         delete(cf);
     }
 
@@ -358,7 +356,7 @@ public class ColumnFamily implements ICo
         sb.append(cfm == null ? "<anonymous>" : cfm.cfName);
 
         if (isMarkedForDelete())
-            sb.append(" -deleted at " + getMarkedForDeleteAt() + "-");
+            sb.append(" -deleted at 
").append(getMarkedForDeleteAt()).append("-");
 
         sb.append(" 
[").append(getComparator().getColumnsString(getSortedColumns())).append("])");
         return sb.toString();
@@ -411,14 +409,6 @@ public class ColumnFamily implements ICo
         return cf1.diff(cf2);
     }
 
-    public static ColumnFamily resolve(ColumnFamily cf1, ColumnFamily cf2)
-    {
-        if (cf1 == null)
-            return cf2;
-        cf1.resolve(cf2);
-        return cf1;
-    }
-
     public void resolve(ColumnFamily cf)
     {
         // Row _does_ allow null CF objects :(  seems a necessary evil for 
efficiency

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java?rev=1059717&r1=1059716&r2=1059717&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java
 Mon Jan 17 01:36:48 2011
@@ -190,6 +190,7 @@ public class ReadResponseResolver implem
     static ColumnFamily resolveSuperset(List<ColumnFamily> versions)
     {
         assert versions.size() > 0;
+
         ColumnFamily resolved = null;
         for (ColumnFamily cf : versions)
         {
@@ -201,10 +202,10 @@ public class ReadResponseResolver implem
         }
         if (resolved == null)
             return null;
+
         for (ColumnFamily cf : versions)
-        {
             resolved.resolve(cf);
-        }
+
         return resolved;
     }