cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r794876 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: analytics/ config/ db/ service/
Date Thu, 16 Jul 2009 21:40:59 GMT
Author: eevans
Date: Thu Jul 16 21:40:59 2009
New Revision: 794876

URL: http://svn.apache.org/viewvc?rev=794876&view=rev
Log:
remove ganglia analytics package

Patch by eevans; reviewed by Michael Greene for CASSANDRA-297

Removed:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/analytics/AnalyticsContext.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/analytics/AnalyticsException.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/analytics/DBAnalyticsSource.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/analytics/IAnalyticsSource.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/analytics/MetricValue.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/analytics/MetricsRecord.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/analytics/OutputRecord.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/analytics/VMAnalyticsSource.java
Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=794876&r1=794875&r2=794876&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Thu Jul 16 21:40:59 2009
@@ -49,8 +49,6 @@
     private static long rpcTimeoutInMillis_ = 2000;
     private static Set<String> seeds_ = new HashSet<String>();
     private static String snapshotDirectory_;
-    /* Keeps the list of Ganglia servers to contact */
-    private static String[] gangliaServers_ ;
     /* Keeps the list of data file directories */
     private static String[] dataFileDirectories_;
     /* Current index into the above list of directories */
@@ -121,9 +119,6 @@
             /* Cluster Name */
             clusterName_ = xmlUtils.getNodeValue("/Storage/ClusterName");
 
-            /* Ganglia servers contact list */
-            gangliaServers_ = xmlUtils.getNodeValues("/Storage/GangliaServers/GangliaServer");
-
             /* Hashing strategy */
             partitionerClass_ = xmlUtils.getNodeValue("/Storage/Partitioner");
             try
@@ -544,18 +539,6 @@
     {
         return jobJarFileLocation_;
     }
-
-    public static String getGangliaServers()
-    {
-    	StringBuilder sb = new StringBuilder();
-    	for ( int i = 0; i < gangliaServers_.length; ++i )
-    	{
-    		sb.append(gangliaServers_[i]);
-    		if ( i != (gangliaServers_.length - 1) )
-    			sb.append(", ");
-    	}
-    	return sb.toString();
-    }
     
     public static Map<String, CFMetaData> getTableMetaData(String tableName)
     {

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=794876&r1=794875&r2=794876&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 Thu Jul 16 21:40:59
2009
@@ -28,7 +28,6 @@
 import org.apache.commons.collections.IteratorUtils;
 import org.apache.commons.collections.Predicate;
 
-import org.apache.cassandra.analytics.DBAnalyticsSource;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.dht.BootstrapInitiateMessage;
 import org.apache.cassandra.dht.Range;
@@ -309,8 +308,6 @@
     private Table.TableMetadata tableMetadata_;
     /* ColumnFamilyStore per column family */
     private Map<String, ColumnFamilyStore> columnFamilyStores_ = new HashMap<String,
ColumnFamilyStore>();
-    /* The AnalyticsSource instance which keeps track of statistics reported to Ganglia.
*/
-    private DBAnalyticsSource dbAnalyticsSource_;
     // cache application CFs since Range queries ask for them a _lot_
     private SortedSet<String> applicationColumnFamilies_;
 
@@ -473,7 +470,6 @@
     private Table(String table) throws IOException
     {
         table_ = table;
-        dbAnalyticsSource_ = new DBAnalyticsSource();
         tableMetadata_ = Table.TableMetadata.instance(table);
         for (String columnFamily : tableMetadata_.getColumnFamilies())
         {
@@ -594,7 +590,6 @@
     void load(Row row) throws IOException
     {
         String key = row.key();
-        long start = System.currentTimeMillis();
                 
         for (ColumnFamily columnFamily : row.getColumnFamilies())
         {
@@ -606,8 +601,6 @@
         	}
         }
         row.clear();
-        long timeTaken = System.currentTimeMillis() - start;
-        dbAnalyticsSource_.updateWriteStatistics(timeTaken);
     }
 
     public SortedSet<String> getApplicationColumnFamilies()

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=794876&r1=794875&r2=794876&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
Jul 16 21:40:59 2009
@@ -30,7 +30,6 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.apache.cassandra.analytics.AnalyticsContext;
 import org.apache.cassandra.concurrent.*;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.*;
@@ -267,8 +266,6 @@
         SelectorManager.getSelectorManager().start();
         SelectorManager.getUdpSelectorManager().start();
 
-        /* start the analytics context package */
-        AnalyticsContext.instance().start();
         /* starts a load timer thread */
         loadTimer_.schedule( new LoadDisseminator(), StorageService.threshold_, StorageService.threshold_);
         



Mime
View raw message