natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix saved key cache not loading at startup; patch by yukim reviewed by jbellis for CASSANDRA-5166

This commit is contained in:
Yuki Morishita 2013-01-18 11:47:01 -06:00
parent 1311649b4e
commit f930eb79cd
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -1,3 +1,6 @@
1.1.10
* fix saved key cache not loading at startup (CASSANDRA-5166)
1.1.9
* Simplify CompressedRandomAccessReader to work around JDK FD bug (CASSANDRA-5088)
* Improve handling a changing target throttle rate mid-compaction (CASSANDRA-5087)

4
src/java/org/apache/cassandra/io/sstable/SSTableReader.java
View File

@ -353,7 +353,9 @@ public class SSTableReader extends SSTable
*/
private void load(boolean recreatebloom, Set<DecoratedKey> keysToLoadInCache) throws IOException
{
boolean cacheLoading = keyCache != null && !keysToLoadInCache.isEmpty();
boolean cacheLoading = !keysToLoadInCache.isEmpty();
if (cacheLoading && keyCache == null)
keyCache = CacheService.instance.keyCache;
SegmentedFile.Builder ibuilder = SegmentedFile.getBuilder(DatabaseDescriptor.getIndexAccessMode());
SegmentedFile.Builder dbuilder = compression

32
test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
View File

@ -35,7 +35,10 @@ import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.cache.KeyCacheKey;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
import org.apache.cassandra.db.compaction.CompactionManager;
@ -43,6 +46,7 @@ import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.io.util.SequentialWriter;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.io.util.FileUtils;
@ -284,6 +288,34 @@ public class SSTableReaderTest extends SchemaLoader
assert target.last.equals(lastKey);
}
@Test
public void testLoadingSavedKeyCache() throws Exception
{
final String ks = "Keyspace1";
final String cf = "Standard1";
CFMetaData meta = Schema.instance.getCFMetaData(ks, cf);
Table.clear(ks);
ByteBuffer key = ByteBufferUtil.bytes("key");
CacheService.instance.keyCache.setCapacity(1024);
File dir = Directories.create(ks, cf).getDirectoryForNewSSTables(100);
SSTableSimpleWriter writer = new SSTableSimpleWriter(dir, meta, StorageService.getPartitioner());
writer.newRow(key);
writer.addColumn(ByteBufferUtil.bytes("col"), ByteBufferUtil.EMPTY_BYTE_BUFFER, 1);
writer.close();
Descriptor desc = Descriptor.fromFilename(dir, String.format("%s-%s-%s-1-Data.db", ks, cf, Descriptor.CURRENT_VERSION)).left;
File cachePath = CacheService.instance.keyCache.getCachePath(ks, cf);
SequentialWriter out = SequentialWriter.open(cachePath);
new KeyCacheKey(desc, key).write(out.stream);
out.close();
ColumnFamilyStore cfs = Table.open(ks).getColumnFamilyStore(cf);
cfs.disableAutoCompaction();
SSTableReader sstable = cfs.getSSTables().iterator().next();
assert 0 == sstable.getCachedPosition(StorageService.getPartitioner().decorateKey(key), false);
}
private void assertIndexQueryWorks(ColumnFamilyStore indexedCFS) throws IOException
{
assert "Indexed1".equals(indexedCFS.getColumnFamilyName());