cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 29 Jun 2012 00:16:45 GMT
Updated Branches:
  refs/heads/cassandra-1.1 bc2dea8b6 -> 67c26d471
  refs/heads/trunk a4add9573 -> 1f8b2e9d7


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 1f8b2e9d769c2342baeb1a7b572a4f1cdb2e2dba
Parents: a4add95 67c26d4
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Jun 28 19:16:33 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Jun 28 19:16:33 2012 -0500

----------------------------------------------------------------------
 .../apache/cassandra/db/commitlog/CommitLog.java   |    1 +
 .../cassandra/db/commitlog/CommitLogAllocator.java |    2 +-
 .../cassandra/db/commitlog/CommitLogReplayer.java  |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f8b2e9d/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f8b2e9d/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f8b2e9d/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 6a20027,e12e5ba..ef45a6d
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@@ -112,13 -117,11 +112,13 @@@ public class CommitLogReplaye
      public void recover(File file) throws IOException
      {
          logger.info("Replaying " + file.getPath());
 -        final long segment = CommitLogSegment.idFromFilename(file.getName());
 +        CommitLogDescriptor desc = CommitLogDescriptor.fromFileName(file.getName());
 +        final long segment = desc.id;
 +        int version = desc.getMessagingVersion();
          RandomAccessReader reader = RandomAccessReader.open(new File(file.getAbsolutePath()),
true);
-         assert reader.length() <= Integer.MAX_VALUE;
          try
          {
+             assert reader.length() <= Integer.MAX_VALUE;
              int replayPosition;
              if (globalPosition.segment < segment)
                  replayPosition = 0;


Mime
View raw message