You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/08/20 19:24:34 UTC
svn commit: r806267 - in /incubator/cassandra/trunk: ./ conf/ lib/
lib/licenses/ src/java/org/apache/cassandra/config/
src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/procedures/
src/java/org/apache/cassandra/service/ test/conf/
Author: jbellis
Date: Thu Aug 20 17:24:33 2009
New Revision: 806267
URL: http://svn.apache.org/viewvc?rev=806267&view=rev
Log:
remove groovy jar, half-baked Callout code. patch by Michael Greene; reviewed by jbellis for CASSANDRA-380
Removed:
incubator/cassandra/trunk/lib/groovy-1.5.6.jar
incubator/cassandra/trunk/lib/licenses/groovy-1.5.6.jar.LICENSE
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CalloutDeployMessage.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CalloutDeployVerbHandler.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CalloutManager.java
Modified:
incubator/cassandra/trunk/NOTICE.txt
incubator/cassandra/trunk/conf/storage-conf.xml
incubator/cassandra/trunk/pom.xml
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
incubator/cassandra/trunk/test/conf/storage-conf.xml
Modified: incubator/cassandra/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/NOTICE.txt?rev=806267&r1=806266&r2=806267&view=diff
==============================================================================
--- incubator/cassandra/trunk/NOTICE.txt (original)
+++ incubator/cassandra/trunk/NOTICE.txt Thu Aug 20 17:24:33 2009
@@ -4,7 +4,4 @@
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
-This product includes software developed by The Groovy community
-(http://groovy.codehaus.org/).
-Copyright 2003-2007 The respective authors and developers.
Developers and Contributors are listed in the project POM file
Modified: incubator/cassandra/trunk/conf/storage-conf.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/conf/storage-conf.xml?rev=806267&r1=806266&r2=806267&view=diff
==============================================================================
--- incubator/cassandra/trunk/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/conf/storage-conf.xml Thu Aug 20 17:24:33 2009
@@ -138,7 +138,6 @@
<DataFileDirectories>
<DataFileDirectory>/var/cassandra/data</DataFileDirectory>
</DataFileDirectories>
- <CalloutLocation>/var/cassandra/callouts</CalloutLocation>
<BootstrapFileDirectory>/var/cassandra/bootstrap</BootstrapFileDirectory>
<StagingFileDirectory>/var/cassandra/staging</StagingFileDirectory>
Modified: incubator/cassandra/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/pom.xml?rev=806267&r1=806266&r2=806267&view=diff
==============================================================================
--- incubator/cassandra/trunk/pom.xml (original)
+++ incubator/cassandra/trunk/pom.xml Thu Aug 20 17:24:33 2009
@@ -181,11 +181,6 @@
<version>3.1.3</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
<version>1.0-rc1</version>
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=806267&r1=806266&r2=806267&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 Aug 20 17:24:33 2009
@@ -113,8 +113,6 @@
* high throughput on reads but at the cost of consistency.
*/
private static boolean doConsistencyCheck_ = true;
- /* Callout directories */
- private static String calloutLocation_;
/* Job Jar Location */
private static String jobJarFileLocation_;
/* Address where to run the job tracker */
@@ -222,9 +220,6 @@
throw new ConfigurationException("Invalid endpointsnitch class " + endPointSnitchClassName);
}
- /* Callout location */
- calloutLocation_ = xmlUtils.getNodeValue("/Storage/CalloutLocation");
-
/* JobTracker address */
jobTrackerHost_ = xmlUtils.getNodeValue("/Storage/JobTrackerHost");
@@ -673,11 +668,6 @@
return replicaPlacementStrategyClass_;
}
- public static String getCalloutLocation()
- {
- return calloutLocation_;
- }
-
public static String getJobTrackerAddress()
{
return jobTrackerHost_;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java?rev=806267&r1=806266&r2=806267&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java Thu Aug 20 17:24:33 2009
@@ -1,31 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.cassandra.procedures;
-
-import groovy.lang.GroovyShell;
-
-public class GroovyScriptRunner
-{
- private static GroovyShell groovyShell_ = new GroovyShell();
-
- public static String evaluateString(String script)
- {
- return groovyShell_.evaluate(script).toString();
- }
-}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java?rev=806267&r1=806266&r2=806267&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java Thu Aug 20 17:24:33 2009
@@ -36,7 +36,6 @@
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.db.RecoveryManager;
-import org.apache.cassandra.db.CalloutManager;
/**
* This class supports two methods for creating a Cassandra node daemon,
@@ -77,8 +76,6 @@
});
// initialize stuff
- CalloutManager.instance().onStart();
-
Set<String> tables = DatabaseDescriptor.getTableToColumnFamilyMap().keySet();
for (String table : tables)
{
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=806267&r1=806266&r2=806267&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 Aug 20 17:24:33 2009
@@ -76,7 +76,6 @@
public final static String dataFileVerbHandler_ = "DATA-FILE-VERB-HANDLER";
public final static String mbrshipCleanerVerbHandler_ = "MBRSHIP-CLEANER-VERB-HANDLER";
public final static String bsMetadataVerbHandler_ = "BS-METADATA-VERB-HANDLER";
- public final static String calloutDeployVerbHandler_ = "CALLOUT-DEPLOY-VERB-HANDLER";
public final static String rangeVerbHandler_ = "RANGE-VERB-HANDLER";
public static enum ConsistencyLevel
@@ -252,7 +251,6 @@
MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.dataFileVerbHandler_, new DataFileVerbHandler() );
MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.mbrshipCleanerVerbHandler_, new MembershipCleanerVerbHandler() );
MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.bsMetadataVerbHandler_, new BootstrapMetadataVerbHandler() );
- MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.calloutDeployVerbHandler_, new CalloutDeployVerbHandler() );
MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.rangeVerbHandler_, new RangeVerbHandler());
/* register the stage for the mutations */
Modified: incubator/cassandra/trunk/test/conf/storage-conf.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/conf/storage-conf.xml?rev=806267&r1=806266&r2=806267&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/test/conf/storage-conf.xml Thu Aug 20 17:24:33 2009
@@ -37,7 +37,6 @@
<DataFileDirectories>
<DataFileDirectory>build/test/cassandra/data</DataFileDirectory>
</DataFileDirectories>
- <CalloutLocation>build/test/cassandra/callouts</CalloutLocation>
<BootstrapFileDirectory>build/test/cassandra/bootstrap</BootstrapFileDirectory>
<StagingFileDirectory>build/test/cassandra/staging</StagingFileDirectory>
<MemtableSizeInMB>1</MemtableSizeInMB>