svn commit: r938179 - in /cassandra/trunk/src/java/org/apache/cassandra/db/commitlog: CommitLog.java CommitLogSegment.java

[jb...@apache.org]

Author: jbellis
Date: Mon Apr 26 18:31:14 2010
New Revision: 938179

URL: http://svn.apache.org/viewvc?rev=938179&view=rev
Log:
add filename check for commitlog replay
patch by jbellis; reviewed by gdusbabek for CASSANDRA-999


Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
    cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java

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=938179&r1=938178&r2=938179&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 Mon Apr 26 18:31:14 2010
@@ -161,8 +161,7 @@ public class CommitLog
         {
             public boolean accept(File dir, String name)
             {
-                // throw out anything that starts with dot.
-                return !name.matches("\\..*");
+                return CommitLogSegment.possibleCommitLogFile(name);
             }
         });
         if (files.length == 0)

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java?rev=938179&r1=938178&r2=938179&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java Mon Apr 26 18:31:14 2010
@@ -63,6 +63,11 @@ public class CommitLogSegment
         }
     }
 
+    public static boolean possibleCommitLogFile(String filename)
+    {
+        return filename.matches("CommitLog-\\d+.log");
+    }
+
     public void writeHeader() throws IOException
     {
         seekAndWriteCommitLogHeader(header.toByteArray());