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 2016/05/04 19:36:05 UTC
[3/3] cassandra git commit: replace deprecated sameThreadExecutor
with directExecutor
replace deprecated sameThreadExecutor with directExecutor
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/594183b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/594183b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/594183b0
Branch: refs/heads/trunk
Commit: 594183b0360aa252624f04e0e29fc12815fa39f4
Parents: f4233eb
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 4 10:21:25 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 4 14:32:09 2016 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 2 +-
src/java/org/apache/cassandra/service/ActiveRepairService.java | 4 ++--
src/java/org/apache/cassandra/streaming/StreamManager.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/594183b0/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
index 519fe5f..b06abb2 100644
--- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
+++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
@@ -154,7 +154,7 @@ public class RepairMessageVerbHandler implements IVerbHandler<RepairMessage>
{
MessagingService.instance().sendReply(new MessageOut(MessagingService.Verb.INTERNAL_RESPONSE), id, message.from);
}
- }, MoreExecutors.sameThreadExecutor());
+ }, MoreExecutors.directExecutor());
break;
case CLEANUP:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/594183b0/src/java/org/apache/cassandra/service/ActiveRepairService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index 6c75149..dd196b9 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -151,7 +151,7 @@ public class ActiveRepairService
gossiper.unregister(session);
sessions.remove(session.getId());
}
- }, MoreExecutors.sameThreadExecutor());
+ }, MoreExecutors.directExecutor());
session.start(executor);
return session;
}
@@ -401,7 +401,7 @@ public class ActiveRepairService
{
removeParentRepairSession(parentRepairSession);
}
- }, MoreExecutors.sameThreadExecutor());
+ }, MoreExecutors.directExecutor());
return allAntiCompactionResults;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/594183b0/src/java/org/apache/cassandra/streaming/StreamManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamManager.java b/src/java/org/apache/cassandra/streaming/StreamManager.java
index dc8ec19..52652c0 100644
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@ -131,7 +131,7 @@ public class StreamManager implements StreamManagerMBean
{
initiatedStreams.remove(result.planId);
}
- }, MoreExecutors.sameThreadExecutor());
+ }, MoreExecutors.directExecutor());
initiatedStreams.put(result.planId, result);
}
@@ -146,7 +146,7 @@ public class StreamManager implements StreamManagerMBean
{
receivingStreams.remove(result.planId);
}
- }, MoreExecutors.sameThreadExecutor());
+ }, MoreExecutors.directExecutor());
receivingStreams.put(result.planId, result);
}