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 2009/09/07 16:50:43 UTC
svn commit: r812170 -
/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Author: jbellis
Date: Mon Sep 7 14:50:42 2009
New Revision: 812170
URL: http://svn.apache.org/viewvc?rev=812170&view=rev
Log:
merge r812163 (CASSANDRA-418) from trunk
Modified:
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=812170&r1=812169&r2=812170&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Mon Sep 7 14:50:42 2009
@@ -338,11 +338,6 @@
return Integer.parseInt(index);
}
- String getNextFileName()
- {
- return String.format("%s-%s-Data.db", columnFamily_, fileIndexGenerator_.incrementAndGet());
- }
-
/*
* @return a temporary file name for an sstable.
* When the sstable object is closed, it will be renamed to a non-temporary
@@ -350,15 +345,12 @@
*/
String getTempSSTablePath()
{
- // increment twice so that we do not generate consecutive numbers
String fname = getTempSSTableFileName();
return new File(DatabaseDescriptor.getDataFileLocationForTable(table_), fname).getAbsolutePath();
}
String getTempSSTableFileName()
{
- fileIndexGenerator_.incrementAndGet();
-
return String.format("%s-%s-%s-Data.db",
columnFamily_, SSTable.TEMPFILE_MARKER, fileIndexGenerator_.incrementAndGet());
}