Author: jbellis
Date: Fri Jan 28 18:26:04 2011
New Revision: 1064809
URL: http://svn.apache.org/viewvc?rev=1064809&view=rev
Log:
merge from 0.7
Modified:
cassandra/trunk/ (props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
(props changed)
cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java
cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
cassandra/trunk/src/java/org/apache/cassandra/io/DeletionService.java
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
cassandra/trunk/test/unit/org/apache/cassandra/EmbeddedServer.java
cassandra/trunk/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
Propchange: cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 18:26:04 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1064713
-/cassandra/branches/cassandra-0.7:1026516-1064763
+/cassandra/branches/cassandra-0.7:1026516-1064808
/cassandra/branches/cassandra-0.7.0:1053690-1055654
/cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3:774578-796573
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 18:26:04 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1064713
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1064763
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1064808
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 18:26:04 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1064713
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1064763
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1064808
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 18:26:04 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1064713
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1064763
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1064808
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1053690-1055654
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 18:26:04 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1052356,1052358-1053452,1053454,1053456-1064713
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1064763
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1064808
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1053690-1055654
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 18:26:04 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1052356,1052358-1053452,1053454,1053456-1064713
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1064763
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1064808
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1053690-1055654
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java?rev=1064809&r1=1064808&r2=1064809&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java Fri
Jan 28 18:26:04 2011
@@ -141,12 +141,12 @@ public class BinaryMemtable implements I
public void flushAndSignal(final CountDownLatch latch, ExecutorService
sorter, final ExecutorService writer)
{
- sorter.submit(new Runnable()
+ sorter.execute(new Runnable()
{
public void run()
{
final List<DecoratedKey> sortedKeys = getSortedKeys();
- writer.submit(new WrappedRunnable()
+ writer.execute(new WrappedRunnable()
{
public void runMayThrow() throws IOException
{
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=1064809&r1=1064808&r2=1064809&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
Fri Jan 28 18:26:04 2011
@@ -298,7 +298,7 @@ public class HintedHandOffManager
deliverHintsToEndpoint(to);
}
};
- executor_.submit(r);
+ executor_.execute(r);
}
public void deliverHints(String to) throws UnknownHostException
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java?rev=1064809&r1=1064808&r2=1064809&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java Fri Jan 28
18:26:04 2011
@@ -167,7 +167,7 @@ public class Memtable implements Compara
public void flushAndSignal(final CountDownLatch latch, ExecutorService
sorter, final ExecutorService writer)
{
cfs.getMemtablesPendingFlush().add(this); // it's ok for the MT to
briefly be both active and pendingFlush
- writer.submit(new WrappedRunnable()
+ writer.execute(new WrappedRunnable()
{
public void runMayThrow() throws IOException
{
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java?rev=1064809&r1=1064808&r2=1064809&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
Fri Jan 28 18:26:04 2011
@@ -434,8 +434,8 @@ public class CommitLog
{
logger.info("Discarding obsolete commit log:" + segment);
segment.close();
- DeletionService.submitDelete(segment.getHeaderPath());
- DeletionService.submitDelete(segment.getPath());
+ DeletionService.executeDelete(segment.getHeaderPath());
+ DeletionService.executeDelete(segment.getPath());
// usually this will be the first (remaining) segment, but not
always, if segment A contains
// writes to a CF that is unflushed but is followed by segment
B whose CFs are all flushed.
iter.remove();
Modified: cassandra/trunk/src/java/org/apache/cassandra/io/DeletionService.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/DeletionService.java?rev=1064809&r1=1064808&r2=1064809&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/DeletionService.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/DeletionService.java Fri
Jan 28 18:26:04 2011
@@ -36,17 +36,16 @@ public class DeletionService
public static final ExecutorService executor = new
JMXEnabledThreadPoolExecutor("FILEUTILS-DELETE-POOL");
- public static void submitDelete(final String file)
+ public static void executeDelete(final String file)
{
Runnable deleter = new WrappedRunnable()
{
- @Override
protected void runMayThrow() throws IOException
{
FileUtils.deleteWithConfirm(new File(file));
}
};
- executor.submit(deleter);
+ executor.execute(deleter);
}
public static void waitFor() throws InterruptedException,
ExecutionException
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1064809&r1=1064808&r2=1064809&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
Fri Jan 28 18:26:04 2011
@@ -262,7 +262,7 @@ public class AntiEntropyService
* 2. add() - 0 or more times, to add hashes to the tree.
* 3. complete() - Enqueues any operations that were blocked waiting for a
valid tree.
*/
- public static class Validator implements Callable<Object>
+ public static class Validator implements Runnable
{
public final TreeRequest request;
public final MerkleTree tree;
@@ -409,7 +409,7 @@ public class AntiEntropyService
for (MerkleTree.RowHash minrow : minrows)
range.addHash(minrow);
- StageManager.getStage(Stage.ANTI_ENTROPY).submit(this);
+ StageManager.getStage(Stage.ANTI_ENTROPY).execute(this);
logger.debug("Validated " + validated + " rows into AEService tree
for " + request);
}
@@ -418,13 +418,10 @@ public class AntiEntropyService
*
* @return A meaningless object.
*/
- public Object call() throws Exception
+ public void run()
{
// respond to the request that triggered this validation
AntiEntropyService.instance.respond(this,
FBUtilities.getLocalAddress());
-
- // return any old object
- return AntiEntropyService.class;
}
}
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1064809&r1=1064808&r2=1064809&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Fri
Jan 28 18:26:04 2011
@@ -552,7 +552,7 @@ public class StorageProxy implements Sto
{
if (logger.isDebugEnabled())
logger.debug("reading data for " + command + " locally");
- StageManager.getStage(Stage.READ).submit(new
LocalReadRunnable(command, handler));
+ StageManager.getStage(Stage.READ).execute(new
LocalReadRunnable(command, handler));
}
else
{
@@ -571,7 +571,7 @@ public class StorageProxy implements Sto
{
if (logger.isDebugEnabled())
logger.debug("reading digest for " + command + "
locally");
- StageManager.getStage(Stage.READ).submit(new
LocalReadRunnable(digestCommand, handler));
+ StageManager.getStage(Stage.READ).execute(new
LocalReadRunnable(digestCommand, handler));
}
else
{
Modified: cassandra/trunk/test/unit/org/apache/cassandra/EmbeddedServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/EmbeddedServer.java?rev=1064809&r1=1064808&r2=1064809&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/EmbeddedServer.java
(original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/EmbeddedServer.java Fri Jan
28 18:26:04 2011
@@ -47,7 +47,7 @@ public class EmbeddedServer extends Clea
public static void startCassandra() throws IOException
{
- executor.submit(new Runnable()
+ executor.execute(new Runnable()
{
public void run()
{
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java?rev=1064809&r1=1064808&r2=1064809&view=diff
==============================================================================
---
cassandra/trunk/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
(original)
+++
cassandra/trunk/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
Fri Jan 28 18:26:04 2011
@@ -50,7 +50,7 @@ public class DebuggableThreadPoolExecuto
long start = System.currentTimeMillis();
for (int i = 0; i < 10; i++)
{
- executor.submit(runnable);
+ executor.execute(runnable);
}
assert q.size() > 0 : q.size();
while (executor.getCompletedTaskCount() < 10)
