cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject git commit: remove dead code
Date Sat, 08 Feb 2014 04:06:20 GMT
Updated Branches:
  refs/heads/trunk 813da911b -> bcfaeaa9c


remove dead code


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcfaeaa9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcfaeaa9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcfaeaa9

Branch: refs/heads/trunk
Commit: bcfaeaa9c88c056cc36b47ae2df49062316cac83
Parents: 813da91
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Fri Feb 7 23:05:41 2014 -0500
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Fri Feb 7 23:05:41 2014 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/db/commitlog/CommitLogReplayer.java    | 4 ++--
 src/java/org/apache/cassandra/service/StorageProxy.java         | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcfaeaa9/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 00c8bb4..df28b8e 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -147,7 +147,7 @@ public class CommitLogReplayer
         return end;
     }
 
-    private int getStartOffset(long segmentId, int version, File file)
+    private int getStartOffset(long segmentId, int version)
     {
         if (globalPosition.segment < segmentId)
         {
@@ -236,7 +236,7 @@ public class CommitLogReplayer
         try
         {
             assert reader.length() <= Integer.MAX_VALUE;
-            int offset = getStartOffset(segmentId, version, file);
+            int offset = getStartOffset(segmentId, version);
             if (offset < 0)
             {
                 logger.debug("skipping replay of fully-flushed {}", file);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcfaeaa9/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 69d7123..8c31192 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -563,7 +563,7 @@ public class StorageProxy implements StorageProxyMBean
             syncWriteToBatchlog(mutations, batchlogEndpoints, batchUUID);
 
             // now actually perform the writes and wait for them to complete
-            syncWriteBatchedMutations(wrappers, localDataCenter, consistency_level);
+            syncWriteBatchedMutations(wrappers, localDataCenter);
 
             // remove the batchlog entries asynchronously
             asyncRemoveFromBatchlog(batchlogEndpoints, batchUUID);
@@ -630,8 +630,7 @@ public class StorageProxy implements StorageProxyMBean
     }
 
     private static void syncWriteBatchedMutations(List<WriteResponseHandlerWrapper>
wrappers,
-                                                  String localDataCenter,
-                                                  ConsistencyLevel consistencyLevel)
+                                                  String localDataCenter)
     throws WriteTimeoutException, OverloadedException
     {
         for (WriteResponseHandlerWrapper wrapper : wrappers)


Mime
View raw message