Author: jbellis
Date: Tue Jan 12 04:05:03 2010
New Revision: 898178
URL: http://svn.apache.org/viewvc?rev=898178&view=rev
Log:
make rowcache, keycache configurable per-CF
patch by jbellis; reviewed by goffinet for CASSANDRA-678
Modified:
incubator/cassandra/trunk/conf/storage-conf.xml
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Pair.java
incubator/cassandra/trunk/test/conf/storage-conf.xml
Modified: incubator/cassandra/trunk/conf/storage-conf.xml
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/conf/storage-conf.xml?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
--- incubator/cassandra/trunk/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/conf/storage-conf.xml Tue Jan 12 04:05:03 2010
@@ -56,17 +56,9 @@
<Keyspaces>
<Keyspace Name="Keyspace1">
<!--
- ~ The fraction of keys per sstable whose locations we keep in
- ~ memory in "mostly LRU" order. (JUST the key locations, NOT any
- ~ column values.)
-
- ~ The amount of memory used by the default setting of 0.01 is
- ~ comparable to the amount used by the internal per-sstable key
- ~ index. Consider increasing this if you have fewer, wider rows.
- ~ Set to 0 to disable entirely.
- -->
- <KeysCachedFraction>0.01</KeysCachedFraction>
- <!--
+ ~ ColumnFamily definitions have one required attribute (Name)
+ ~ and several optional ones.
+ ~
~ The CompareWith attribute tells Cassandra how to sort the columns
~ for slicing operations. The default is BytesType, which is a
~ straightforward lexical comparison of the bytes in each column.
@@ -90,8 +82,25 @@
~
~ An optional `Comment` attribute may be used to attach additional
~ human-readable information about the column family to its definition.
+ ~
+ ~ The optional KeysCachedFraction attribute specifies
+ ~ The fraction of keys per sstable whose locations we keep in
+ ~ memory in "mostly LRU" order. (JUST the key locations, NOT any
+ ~ column values.) The amount of memory used by the default setting of
+ ~ 0.01 is comparable to the amount used by the internal per-sstable key
+ ~ index. Consider increasing this if you have fewer, wider rows.
+ ~ Set to 0 to disable entirely.
+ ~
+ ~ The optional RowsCachedFraction attribute specifies
+ ~ The fraction of rows per sstable whose entire contents we cache in
+ ~ memory. Do not use this on ColumnFamilies with large rows, or
+ ~ ColumnFamilies with high write:read ratios. As with key caching,
+ ~ valid values are from 0 to 1. The default 0 disables it entirely.
-->
- <ColumnFamily CompareWith="BytesType" Name="Standard1"/>
+ <ColumnFamily CompareWith="BytesType"
+ Name="Standard1"
+ RowsCachedFraction="0.1"
+ KeysCachedFraction="0"/>
<ColumnFamily CompareWith="UTF8Type" Name="Standard2"/>
<ColumnFamily CompareWith="TimeUUIDType" Name="StandardByUUID1"/>
<ColumnFamily ColumnType="Super"
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Tue Jan 12 04:05:03 2010
@@ -26,6 +26,7 @@
import org.apache.cassandra.locator.IEndPointSnitch;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.XMLUtils;
import org.apache.log4j.Logger;
import org.w3c.dom.Node;
@@ -85,7 +86,9 @@
private static Set<String> applicationColumnFamilies_ = new
HashSet<String>();
private static int bmtThreshold_ = 256;
- private static Map<String, Double> tableKeysCachedFractions_;
+ private static Map<Pair<String, String>, Double> tableKeysCachedFractions_
= new HashMap<Pair<String, String>, Double>();
+ private static Map<Pair<String, String>, Double> tableRowsCachedFractions_
= new HashMap<Pair<String, String>, Double>();
+
/*
* A map from table names to the set of column families for the table and
the
* corresponding meta data for that column family.
@@ -435,7 +438,6 @@
CommitLog.setSegmentSize(Integer.parseInt(value) * 1024 *
1024);
tableToCFMetaDataMap_ = new HashMap<String, Map<String,
CFMetaData>>();
- tableKeysCachedFractions_ = new HashMap<String, Double>();
/* See which replica placement strategy to use */
String replicaPlacementStrategyClassName =
xmlUtils.getNodeValue("/Storage/ReplicaPlacementStrategy");
@@ -472,17 +474,6 @@
tables_.add(tName);
tableToCFMetaDataMap_.put(tName, new HashMap<String,
CFMetaData>());
- String xqlCacheSize = "/Storage/Keyspaces/keyspa...@name='" +
tName + "']/KeysCachedFraction";
- value = xmlUtils.getNodeValue(xqlCacheSize);
- if (value == null)
- {
- tableKeysCachedFractions_.put(tName, 0.01);
- }
- else
- {
- tableKeysCachedFractions_.put(tName,
Double.valueOf(value));
- }
-
String xqlTable = "/Storage/Keyspaces/keyspa...@name='" +
tName + "']/";
NodeList columnFamilies =
xmlUtils.getRequestedNodeList(xqlTable + "ColumnFamily");
@@ -527,6 +518,16 @@
throw new
ConfigurationException("CompareSubcolumnsWith is only a valid attribute on
super columnfamilies (not regular columnfamily " + cfName + ")");
}
+ if ((value = XMLUtils.getAttributeValue(columnFamily,
"KeysCachedFraction")) != null)
+ {
+ tableKeysCachedFractions_.put(Pair.create(tName,
cfName), Double.valueOf(value));
+ }
+
+ if ((value = XMLUtils.getAttributeValue(columnFamily,
"RowsCachedFraction")) != null)
+ {
+ tableRowsCachedFractions_.put(Pair.create(tName,
cfName), Double.valueOf(value));
+ }
+
// Parse out user-specified logical names for the various
dimensions
// of a the column family from the config.
String cfComment = xmlUtils.getNodeValue(xqlCF +
"Comment");
@@ -567,7 +568,6 @@
systemMetadata.put(data.cfName, data);
tableToCFMetaDataMap_.put(Table.SYSTEM_TABLE, systemMetadata);
- tableKeysCachedFractions_.put(Table.SYSTEM_TABLE, 0.0);
/* Load the seeds for node contact points */
String[] seeds = xmlUtils.getNodeValues("/Storage/Seeds/Seed");
@@ -953,9 +953,16 @@
return tableToCFMetaDataMap_;
}
- public static double getKeysCachedFraction(String tableName)
+ public static double getKeysCachedFraction(String tableName, String
columnFamilyName)
+ {
+ Double v = tableKeysCachedFractions_.get(Pair.create(tableName,
columnFamilyName));
+ return v == null ? 0.01 : v;
+ }
+
+ public static double getRowsCachedFraction(String tableName, String
columnFamilyName)
{
- return tableKeysCachedFractions_.get(tableName);
+ Double v = tableRowsCachedFractions_.get(Pair.create(tableName,
columnFamilyName));
+ return v == null ? 0.01 : v;
}
private static class ConfigurationException extends Exception
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java
Tue Jan 12 04:05:03 2010
@@ -149,7 +149,7 @@
assert bytes.length > 0;
writer.append(key, bytes);
}
- SSTableReader sstable =
writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table_));
+ SSTableReader sstable =
writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table_,
cfName_));
logger_.info("Completed flushing " + writer.getFilename());
return sstable;
}
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=898178&r1=898177&r2=898178&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 Jan 12 04:05:03 2010
@@ -185,9 +185,12 @@
}
ssTables_ = new SSTableTracker(sstables);
- int cacheSize = (int)(0.2 *
SSTableReader.estimatedKeys(columnFamilyName));
- logger_.info("cache size for " + columnFamilyName + " is " +
cacheSize);
- rowCache = new InstrumentedCache<String, ColumnFamily>(table,
columnFamilyName + "RowCache", cacheSize);
+ double v = DatabaseDescriptor.getRowsCachedFraction(table,
columnFamilyName);
+ int cacheSize = (int)(v *
SSTableReader.estimatedKeys(columnFamilyName));
+ if (logger_.isDebugEnabled())
+ logger_.debug("cache size for " + columnFamilyName + " is " +
cacheSize);
+ if (cacheSize > 0)
+ rowCache = new InstrumentedCache<String, ColumnFamily>(table,
columnFamilyName + "RowCache", cacheSize);
}
public static ColumnFamilyStore createColumnFamilyStore(String table,
String columnFamily) throws IOException
@@ -1259,7 +1262,13 @@
public void invalidate(String key)
{
- rowCache.remove(key);
+ if (rowCache != null)
+ rowCache.remove(key);
+ }
+
+ public boolean isRowCacheEnabled()
+ {
+ return rowCache != null;
}
/**
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
Tue Jan 12 04:05:03 2010
@@ -306,7 +306,7 @@
ci.close();
}
- SSTableReader ssTable =
writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table.name));
+ SSTableReader ssTable =
writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table.name,
cfs.getColumnFamilyName()));
cfs.replaceCompactedSSTables(sstables, Arrays.asList(ssTable));
gcAfterRpcTimeout();
submitMinorIfNeeded(cfs);
@@ -386,7 +386,7 @@
if (writer != null)
{
-
results.add(writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table.name)));
+
results.add(writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table.name,
cfs.getColumnFamilyName())));
String format = "AntiCompacted to %s. %d/%d bytes for %d keys.
Time: %dms.";
long dTime = System.currentTimeMillis() - startTime;
logger.info(String.format(format, writer.getFilename(),
SSTable.getTotalBytes(sstables), results.get(0).length(), totalkeysWritten,
dTime));
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
Tue Jan 12 04:05:03 2010
@@ -167,7 +167,7 @@
writer.append(key, buffer);
}
- SSTableReader ssTable =
writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table));
+ SSTableReader ssTable =
writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table,
columnfamilyName));
logger.info("Completed flushing " + ssTable.getFilename());
return ssTable;
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Tue
Jan 12 04:05:03 2010
@@ -407,6 +407,7 @@
HashMap<ColumnFamilyStore,Memtable> memtablesToFlush = new
HashMap<ColumnFamilyStore, Memtable>(2);
// write the mutation to the commitlog and memtables
+ boolean invalidateRequired = false;
flusherLock.readLock().lock();
try
{
@@ -417,6 +418,7 @@
{
Memtable memtableToFlush;
ColumnFamilyStore cfStore =
columnFamilyStores.get(columnFamily.name());
+ invalidateRequired |= cfStore.isRowCacheEnabled();
if ((memtableToFlush=cfStore.apply(mutation.key(),
columnFamily)) != null)
memtablesToFlush.put(cfStore, memtableToFlush);
}
@@ -427,10 +429,13 @@
}
// invalidate cache. 2nd loop over CFs here to avoid prolonging the
lock section unnecessarily.
- for (ColumnFamily cf : mutation.getColumnFamilies())
+ if (invalidateRequired)
{
- ColumnFamilyStore cfs = columnFamilyStores.get(cf.name());
- cfs.invalidate(mutation.key());
+ for (ColumnFamily cf : mutation.getColumnFamilies())
+ {
+ ColumnFamilyStore cfs = columnFamilyStores.get(cf.name());
+ cfs.invalidate(mutation.key());
+ }
}
// flush memtables that got filled up. usually mTF will be empty and
this will be a no-op
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java Tue
Jan 12 04:05:03 2010
@@ -67,11 +67,16 @@
public SSTable(String filename, IPartitioner partitioner)
{
assert filename.endsWith("-Data.db");
- columnFamilyName = new File(filename).getName().split("-")[0];
+ columnFamilyName = parseColumnFamilyName(filename);
this.path = filename;
this.partitioner = partitioner;
}
+ protected static String parseColumnFamilyName(String filename)
+ {
+ return new File(filename).getName().split("-")[0];
+ }
+
protected static String indexFilename(String dataFile)
{
String[] parts = dataFile.split("-");
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
Tue Jan 12 04:05:03 2010
@@ -173,10 +173,12 @@
public static SSTableReader open(String dataFileName) throws IOException
{
- return open(dataFileName, StorageService.getPartitioner(),
DatabaseDescriptor.getKeysCachedFraction(parseTableName(dataFileName)));
+ return open(dataFileName,
+ StorageService.getPartitioner(),
+
DatabaseDescriptor.getKeysCachedFraction(parseTableName(dataFileName),
parseColumnFamilyName(dataFileName)));
}
- public static SSTableReader open(String dataFileName, IPartitioner
partitioner, double cacheFraction) throws IOException
+ public static SSTableReader open(String dataFileName, IPartitioner
partitioner, double keysCacheFraction) throws IOException
{
assert partitioner != null;
assert openedFiles.get(dataFileName) == null;
@@ -185,9 +187,9 @@
SSTableReader sstable = new SSTableReader(dataFileName, partitioner);
sstable.loadIndexFile();
sstable.loadBloomFilter();
- if (cacheFraction > 0)
+ if (keysCacheFraction > 0)
{
- sstable.keyCache =
createKeyCache((int)((sstable.getIndexPositions().size() + 1) * INDEX_INTERVAL
* cacheFraction));
+ sstable.keyCache =
createKeyCache((int)((sstable.getIndexPositions().size() + 1) * INDEX_INTERVAL
* keysCacheFraction));
}
if (logger.isDebugEnabled())
logger.debug("INDEX LOAD TIME for " + dataFileName + ": " +
(System.currentTimeMillis() - start) + " ms.");
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java
Tue Jan 12 04:05:03 2010
@@ -176,7 +176,9 @@
SSTableWriter.rename(indexFilename(dataFileName));
SSTableWriter.rename(filterFilename(dataFileName));
dataFileName = SSTableWriter.rename(dataFileName);
- return SSTableReader.open(dataFileName,
StorageService.getPartitioner(),
DatabaseDescriptor.getKeysCachedFraction(parseTableName(dataFileName)));
+ return SSTableReader.open(dataFileName,
+ StorageService.getPartitioner(),
+
DatabaseDescriptor.getKeysCachedFraction(parseTableName(dataFileName),
parseColumnFamilyName(dataFileName)));
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Pair.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Pair.java?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Pair.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Pair.java Tue
Jan 12 04:05:03 2010
@@ -53,4 +53,9 @@
{
return "(" + left + "," + right + ")";
}
+
+ public static <X, Y> Pair<X, Y> create(X x, Y y)
+ {
+ return new Pair<X, Y>(x, y);
+ }
}
Modified: incubator/cassandra/trunk/test/conf/storage-conf.xml
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/conf/storage-conf.xml?rev=898178&r1=898177&r2=898178&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/test/conf/storage-conf.xml Tue Jan 12 04:05:03
2010
@@ -44,7 +44,7 @@
<MemtableOperationsInMillions>0.00002</MemtableOperationsInMillions> <!--
20 -->
<Keyspaces>
<Keyspace Name = "Keyspace1">
- <ColumnFamily Name="Standard1"/>
+ <ColumnFamily Name="Standard1" RowsCachedFraction="0.1"
KeysCachedFraction="0"/>
<ColumnFamily Name="Standard2"/>
<ColumnFamily CompareWith="LongType" Name="StandardLong1"/>
<ColumnFamily CompareWith="LongType" Name="StandardLong2"/>
