Author: jbellis
Date: Tue Sep 8 18:59:21 2009
New Revision: 812640
URL: http://svn.apache.org/viewvc?rev=812640&view=rev
Log:
rename getIndex -> getGeneration
patch by jbellis; reviewed by Eric Evans for CASSANDRA-424
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/FileNameComparator.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=812640&r1=812639&r2=812640&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Tue Sep 8 18:59:21 2009
@@ -103,7 +103,7 @@
* the max which in this case is n and increment it to use it for next
* index.
*/
- List<Integer> indices = new ArrayList<Integer>();
+ List<Integer> generations = new ArrayList<Integer>();
String[] dataFileDirectories =
DatabaseDescriptor.getAllDataFileLocationsForTable(table);
for (String directory : dataFileDirectories)
{
@@ -117,13 +117,12 @@
if (cfName.equals(columnFamily))
{
- int index = getIndexFromFileName(filename);
- indices.add(index);
+ generations.add(getGenerationFromFileName(filename));
}
}
}
- Collections.sort(indices);
- int value = (indices.size() > 0) ? (indices.get(indices.size() - 1)) :
0;
+ Collections.sort(generations);
+ int value = (generations.size() > 0) ?
(generations.get(generations.size() - 1)) : 0;
ColumnFamilyStore cfs = new ColumnFamilyStore(table, columnFamily,
"Super".equals(DatabaseDescriptor.getColumnType(table, columnFamily)), value);
@@ -310,7 +309,7 @@
return filename.split("-")[0];
}
- protected static int getIndexFromFileName(String filename)
+ protected static int getGenerationFromFileName(String filename)
{
/*
* File name is of the form <table>-<column family>-<index>-Data.db.
@@ -683,6 +682,8 @@
{
continue;
}
+ // if we have too many to compact all at once, compact older ones
first -- this avoids
+ // re-compacting files we just created.
Collections.sort(files, new
FileNameComparator(FileNameComparator.Ascending));
filesCompacted += doFileCompaction(files.subList(0,
Math.min(files.size(), maxThreshold)));
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/FileNameComparator.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/FileNameComparator.java?rev=812640&r1=812639&r2=812640&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/FileNameComparator.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/FileNameComparator.java
Tue Sep 8 18:59:21 2009
@@ -35,8 +35,8 @@
public int compare(String f, String f2)
{
if( order_ == 1 )
- return ColumnFamilyStore.getIndexFromFileName(f2) -
ColumnFamilyStore.getIndexFromFileName(f);
+ return ColumnFamilyStore.getGenerationFromFileName(f2) -
ColumnFamilyStore.getGenerationFromFileName(f);
else
- return ColumnFamilyStore.getIndexFromFileName(f) -
ColumnFamilyStore.getIndexFromFileName(f2);
+ return ColumnFamilyStore.getGenerationFromFileName(f) -
ColumnFamilyStore.getGenerationFromFileName(f2);
}
}
\ No newline at end of file
