Author: jbellis
Date: Tue Jan 12 04:05:53 2010
New Revision: 898180
URL: http://svn.apache.org/viewvc?rev=898180&view=rev
Log:
r/m unused code. patch by jbellis
Removed:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/DataFileVerbHandler.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=898180&r1=898179&r2=898180&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Tue Jan 12 04:05:53 2010
@@ -254,43 +254,6 @@
return fileSet;
}
- /*
- * This method is called to obtain statistics about
- * the Column Family represented by this Column Family
- * Store. It will report the total number of files on
- * disk and the total space oocupied by the data files
- * associated with this Column Family.
- */
- public String cfStats(String newLineSeparator)
- {
- StringBuilder sb = new StringBuilder();
- /*
- * We want to do this so that if there are
- * no files on disk we do not want to display
- * something ugly on the admin page.
- */
- if (ssTables_.size() == 0)
- {
- return sb.toString();
- }
- sb.append(columnFamily_ + " statistics :");
- sb.append(newLineSeparator);
- sb.append("Number of files on disk : " + ssTables_.size());
- sb.append(newLineSeparator);
- double totalSpace = 0d;
- for (SSTableReader sstable: ssTables_)
- {
- File f = new File(sstable.getFilename());
- totalSpace += f.length();
- }
- String diskSpace = FileUtils.stringifyFileSize(totalSpace);
- sb.append("Total disk space : " + diskSpace);
- sb.append(newLineSeparator);
- sb.append("--------------------------------------");
- sb.append(newLineSeparator);
- return sb.toString();
- }
-
/**
* @return the name of the column family
*/
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=898180&r1=898179&r2=898180&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
Tue Jan 12 04:05:53 2010
@@ -82,7 +82,6 @@
public final static String streamInitiateVerbHandler_ =
"BOOTSTRAP-INITIATE-VERB-HANDLER";
public final static String streamInitiateDoneVerbHandler_ =
"BOOTSTRAP-INITIATE-DONE-VERB-HANDLER";
public final static String streamFinishedVerbHandler_ =
"BOOTSTRAP-TERMINATE-VERB-HANDLER";
- public final static String dataFileVerbHandler_ = "DATA-FILE-VERB-HANDLER";
public final static String streamRequestVerbHandler_ =
"BS-METADATA-VERB-HANDLER";
public final static String rangeVerbHandler_ = "RANGE-VERB-HANDLER";
public final static String rangeSliceVerbHandler_ =
"RANGE-SLICE-VERB-HANDLER";
@@ -210,7 +209,6 @@
MessagingService.instance().registerVerbHandlers(mutationVerbHandler_,
new RowMutationVerbHandler());
MessagingService.instance().registerVerbHandlers(readRepairVerbHandler_, new
ReadRepairVerbHandler());
MessagingService.instance().registerVerbHandlers(readVerbHandler_, new
ReadVerbHandler());
- MessagingService.instance().registerVerbHandlers(dataFileVerbHandler_,
new DataFileVerbHandler() );
MessagingService.instance().registerVerbHandlers(rangeVerbHandler_,
new RangeVerbHandler());
MessagingService.instance().registerVerbHandlers(rangeSliceVerbHandler_, new
RangeSliceVerbHandler());
// see BootStrapper for a summary of how the bootstrap verbs interact
