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 2010/11/23 05:21:44 UTC
svn commit: r1037991 - in /cassandra/branches/cassandra-0.7: ./
src/java/org/apache/cassandra/concurrent/
src/java/org/apache/cassandra/service/
test/unit/org/apache/cassandra/service/
Author: jbellis
Date: Tue Nov 23 04:21:43 2010
New Revision: 1037991
URL: http://svn.apache.org/viewvc?rev=1037991&view=rev
Log:
fix capitalization, underscores in AE, request JMX names
Modified:
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/Stage.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/StageManager.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1037991&r1=1037990&r2=1037991&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Tue Nov 23 04:21:43 2010
@@ -1,6 +1,9 @@
dev
* fix live-column-count of slice ranges including tombstoned supercolumn
with live subcolumn (CASSANDRA-1591)
+ * rename o.a.c.internal.AntientropyStage -> AntiEntropyStage,
+ o.a.c.request.Request_responseStage -> RequestResponseStage,
+ o.a.c.internal.Internal_responseStage -> InternalResponseStage
0.7.0-rc1
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/Stage.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/Stage.java?rev=1037991&r1=1037990&r2=1037991&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/Stage.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/Stage.java Tue Nov 23 04:21:43 2010
@@ -28,7 +28,7 @@ public enum Stage
STREAM,
GOSSIP,
REQUEST_RESPONSE,
- ANTIENTROPY,
+ ANTI_ENTROPY,
MIGRATION,
MISC,
INTERNAL_RESPONSE;
@@ -37,7 +37,7 @@ public enum Stage
{
switch (this)
{
- case ANTIENTROPY:
+ case ANTI_ENTROPY:
case GOSSIP:
case MIGRATION:
case MISC:
@@ -55,6 +55,11 @@ public enum Stage
public String getJmxName()
{
- return toString().substring(0, 1) + toString().substring(1).toLowerCase() + "Stage";
+ String name = "";
+ for (String word : toString().split("_"))
+ {
+ name += word.substring(0, 1) + word.substring(1).toLowerCase();
+ }
+ return name + "Stage";
}
}
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/StageManager.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/StageManager.java?rev=1037991&r1=1037990&r2=1037991&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/StageManager.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/concurrent/StageManager.java Tue Nov 23 04:21:43 2010
@@ -47,7 +47,7 @@ public class StageManager
// the rest are all single-threaded
stages.put(Stage.STREAM, new JMXEnabledThreadPoolExecutor(Stage.STREAM));
stages.put(Stage.GOSSIP, new JMXEnabledThreadPoolExecutor(Stage.GOSSIP));
- stages.put(Stage.ANTIENTROPY, new JMXEnabledThreadPoolExecutor(Stage.ANTIENTROPY));
+ stages.put(Stage.ANTI_ENTROPY, new JMXEnabledThreadPoolExecutor(Stage.ANTI_ENTROPY));
stages.put(Stage.MIGRATION, new JMXEnabledThreadPoolExecutor(Stage.MIGRATION));
stages.put(Stage.MISC, new JMXEnabledThreadPoolExecutor(Stage.MISC));
}
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1037991&r1=1037990&r2=1037991&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java Tue Nov 23 04:21:43 2010
@@ -216,7 +216,7 @@ public class AntiEntropyService
for (Differencer differencer : differencers)
{
logger.info("Queueing comparison " + differencer);
- StageManager.getStage(Stage.ANTIENTROPY).execute(differencer);
+ StageManager.getStage(Stage.ANTI_ENTROPY).execute(differencer);
}
}
@@ -406,7 +406,7 @@ public class AntiEntropyService
for (MerkleTree.RowHash minrow : minrows)
range.addHash(minrow);
- StageManager.getStage(Stage.ANTIENTROPY).submit(this);
+ StageManager.getStage(Stage.ANTI_ENTROPY).submit(this);
logger.debug("Validated " + validated + " rows into AEService tree for " + request);
}
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1037991&r1=1037990&r2=1037991&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java Tue Nov 23 04:21:43 2010
@@ -181,8 +181,8 @@ public class StorageService implements I
put(Verb.STREAM_REQUEST, Stage.STREAM);
put(Verb.RANGE_SLICE, Stage.READ);
put(Verb.BOOTSTRAP_TOKEN, Stage.MISC);
- put(Verb.TREE_REQUEST, Stage.ANTIENTROPY);
- put(Verb.TREE_RESPONSE, Stage.ANTIENTROPY);
+ put(Verb.TREE_REQUEST, Stage.ANTI_ENTROPY);
+ put(Verb.TREE_RESPONSE, Stage.ANTI_ENTROPY);
put(Verb.GOSSIP_DIGEST_ACK, Stage.GOSSIP);
put(Verb.GOSSIP_DIGEST_ACK2, Stage.GOSSIP);
put(Verb.GOSSIP_DIGEST_SYN, Stage.GOSSIP);
Modified: cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java?rev=1037991&r1=1037990&r2=1037991&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java (original)
+++ cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java Tue Nov 23 04:21:43 2010
@@ -19,7 +19,6 @@
package org.apache.cassandra.service;
import java.net.InetAddress;
-import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
@@ -47,7 +46,6 @@ import org.apache.cassandra.locator.Toke
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MerkleTree;
-import static com.google.common.base.Charsets.UTF_8;
import static org.apache.cassandra.service.AntiEntropyService.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -244,7 +242,7 @@ public class AntiEntropyServiceTest exte
void flushAES() throws Exception
{
- final ThreadPoolExecutor stage = StageManager.getStage(Stage.ANTIENTROPY);
+ final ThreadPoolExecutor stage = StageManager.getStage(Stage.ANTI_ENTROPY);
final Callable noop = new Callable<Object>()
{
public Boolean call()