svn commit: r1072815 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable: Descriptor.java SSTable.java

[jbellis]

Author: jbellis
Date: Mon Feb 21 00:15:07 2011
New Revision: 1072815

URL: http://svn.apache.org/viewvc?rev=1072815&view=rev
Log:
revert generic toStrings that made logging worse

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/Descriptor.java
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTable.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/Descriptor.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/Descriptor.java?rev=1072815&r1=1072814&r2=1072815&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/Descriptor.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/Descriptor.java
 Mon Feb 21 00:15:07 2011
@@ -186,20 +186,9 @@ public class Descriptor
     }
 
     @Override
-    public String toString() {
-        return "Descriptor(baseFilename=" + baseFilename() +
-               ", directory=" + directory +
-               ", ksname='" + ksname + '\'' +
-               ", cfname='" + cfname + '\'' +
-               ", version='" + version + '\'' +
-               ", generation=" + generation +
-               ", temporary=" + temporary +
-               ", usesOldBloomFilter=" + usesOldBloomFilter +
-               ", isLatestVersion=" + isLatestVersion +
-               ", hasStringsInBloomFilter=" + hasStringsInBloomFilter +
-               ", hasIntRowSize=" + hasIntRowSize +
-               ", hasEncodedKeys=" + hasEncodedKeys +
-               ")";
+    public String toString()
+    {
+        return baseFilename();
     }
 
     @Override

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTable.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTable.java?rev=1072815&r1=1072814&r2=1072815&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTable.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTable.java
 Mon Feb 21 00:15:07 2011
@@ -257,15 +257,10 @@ public abstract class SSTable
     }
 
     @Override
-    public String toString() {
-        return getClass().getSimpleName() + "(descriptor=" + descriptor +
-               ", path='" + getFilename() + '\'' +
-               ", metadata=" + metadata +
-               toSubString() +
-               ")";
-    }
-
-    protected String toSubString() {
-        return "";
+    public String toString()
+    {
+        return getClass().getName() + "(" +
+               "path='" + getFilename() + '\'' +
+               ')';
     }
 }