Author: goffinet Date: Thu Jun 2 22:54:21 2011 New Revision: 1130866 URL: http://svn.apache.org/viewvc?rev=1130866&view=rev Log: Merge 0.8
Modified: cassandra/trunk/ (props changed) cassandra/trunk/contrib/ (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (props changed) cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java cassandra/trunk/src/java/org/apache/cassandra/cache/IRowCacheProvider.java cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCache.java cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java cassandra/trunk/test/unit/org/apache/cassandra/cache/CacheProviderTest.java Propchange: cassandra/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 2 22:54:21 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000 /cassandra/branches/cassandra-0.7:1026516-1127143,1129151 /cassandra/branches/cassandra-0.7.0:1053690-1055654 -/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463 +/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463,1130863 /cassandra/branches/cassandra-0.8.0:1125021-1127636,1129154 /cassandra/branches/cassandra-0.8.1:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689 Propchange: cassandra/trunk/contrib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 2 22:54:21 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009 /cassandra/branches/cassandra-0.7/contrib:1026516-1127143,1129151 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654 -/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463 +/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463,1130863 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1127636,1129154 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 2 22:54:21 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1127143,1129151 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463,1130863 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1127636,1129154 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 2 22:54:21 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1127143,1129151 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463,1130863 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1127636,1129154 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 2 22:54:21 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1127143,1129151 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463,1130863 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1125021-1127636,1129154 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 2 22:54:21 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1127143,1129151 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463,1130863 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1125021-1127636,1129154 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 2 22:54:21 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1127143,1129151 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1128306,1128319,1129091,1129094-1129095,1129155,1129462-1129463,1130863 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1125021-1127636,1129154 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689 Modified: cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java?rev=1130866&r1=1130865&r2=1130866&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java Thu Jun 2 22:54:21 2011 @@ -40,7 +40,7 @@ public class ConcurrentLinkedHashCache<K this.map = map; } - public static <K, V> ConcurrentLinkedHashCache<K, V> create(int capacity) + public static <K, V> ConcurrentLinkedHashCache<K, V> create(int capacity, String tableName, String cfname) { ConcurrentLinkedHashMap<K, V> map = new ConcurrentLinkedHashMap.Builder<K, V>() .weigher(Weighers.<V>singleton()) Modified: cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java?rev=1130866&r1=1130865&r2=1130866&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java Thu Jun 2 22:54:21 2011 @@ -27,8 +27,8 @@ import org.apache.cassandra.db.Decorated public class ConcurrentLinkedHashCacheProvider implements IRowCacheProvider { - public ICache<DecoratedKey, ColumnFamily> create(int capacity) + public ICache<DecoratedKey, ColumnFamily> create(int capacity, String tableName, String cfName) { - return ConcurrentLinkedHashCache.create(capacity); + return ConcurrentLinkedHashCache.create(capacity, tableName, cfName); } } Modified: cassandra/trunk/src/java/org/apache/cassandra/cache/IRowCacheProvider.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cache/IRowCacheProvider.java?rev=1130866&r1=1130865&r2=1130866&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cache/IRowCacheProvider.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cache/IRowCacheProvider.java Thu Jun 2 22:54:21 2011 @@ -29,5 +29,5 @@ import org.apache.cassandra.db.Decorated */ public interface IRowCacheProvider { - public ICache<DecoratedKey, ColumnFamily> create(int capacity); + public ICache<DecoratedKey, ColumnFamily> create(int capacity, String tableName, String cfName); } Modified: cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCache.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCache.java?rev=1130866&r1=1130865&r2=1130866&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCache.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCache.java Thu Jun 2 22:54:21 2011 @@ -47,7 +47,7 @@ public class SerializingCache<K, V> impl private final ConcurrentLinkedHashMap<K, FreeableMemory> map; private final ICompactSerializer3<V> serializer; - public SerializingCache(int capacity, ICompactSerializer3<V> serializer) + public SerializingCache(int capacity, ICompactSerializer3<V> serializer, String tableName, String cfName) { this.serializer = serializer; Modified: cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java?rev=1130866&r1=1130865&r2=1130866&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java Thu Jun 2 22:54:21 2011 @@ -41,8 +41,8 @@ public class SerializingCacheProvider im } } - public ICache<DecoratedKey, ColumnFamily> create(int capacity) + public ICache<DecoratedKey, ColumnFamily> create(int capacity, String tableName, String cfName) { - return new SerializingCache<DecoratedKey, ColumnFamily>(capacity, ColumnFamily.serializer()); + return new SerializingCache<DecoratedKey, ColumnFamily>(capacity, ColumnFamily.serializer(), tableName, cfName); } } Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1130866&r1=1130865&r2=1130866&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Thu Jun 2 22:54:21 2011 @@ -262,9 +262,9 @@ public class ColumnFamilyStore implement if (logger.isDebugEnabled()) logger.debug("Starting CFS {}", columnFamily); - ICache<Pair<Descriptor, DecoratedKey>, Long> kc = ConcurrentLinkedHashCache.create(0); + ICache<Pair<Descriptor, DecoratedKey>, Long> kc = ConcurrentLinkedHashCache.create(0, table.name, columnFamilyName); keyCache = new AutoSavingKeyCache<Pair<Descriptor, DecoratedKey>, Long>(kc, table.name, columnFamilyName); - ICache<DecoratedKey, ColumnFamily> rc = metadata.getRowCacheProvider().create(0); + ICache<DecoratedKey, ColumnFamily> rc = metadata.getRowCacheProvider().create(0, table.name, columnFamilyName); rowCache = new AutoSavingRowCache<DecoratedKey, ColumnFamily>(rc, table.name, columnFamilyName); // scan for sstables corresponding to this cf and load them Modified: cassandra/trunk/test/unit/org/apache/cassandra/cache/CacheProviderTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/cache/CacheProviderTest.java?rev=1130866&r1=1130865&r2=1130866&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/cache/CacheProviderTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/cache/CacheProviderTest.java Thu Jun 2 22:54:21 2011 @@ -42,6 +42,8 @@ public class CacheProviderTest extends S String key4 = "key4"; String key5 = "key5"; private static final int CAPACITY = 4; + private String tableName = "Keyspace1"; + private String cfName = "Standard1"; private void simpleCase(ColumnFamily cf, ICache<String, ColumnFamily> cache) { @@ -92,7 +94,7 @@ public class CacheProviderTest extends S private ColumnFamily createCF() { - ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1"); + ColumnFamily cf = ColumnFamily.create(tableName, cfName); cf.addColumn(column("vijay", "great", 1)); cf.addColumn(column("awesome", "vijay", 1)); return cf; @@ -101,7 +103,7 @@ public class CacheProviderTest extends S @Test public void testHeapCache() throws InterruptedException { - ICache<String, ColumnFamily> cache = ConcurrentLinkedHashCache.create(CAPACITY); + ICache<String, ColumnFamily> cache = ConcurrentLinkedHashCache.create(CAPACITY, tableName, cfName); ColumnFamily cf = createCF(); simpleCase(cf, cache); concurrentCase(cf, cache); @@ -110,7 +112,7 @@ public class CacheProviderTest extends S @Test public void testSerializingCache() throws InterruptedException { - ICache<String, ColumnFamily> cache = new SerializingCache<String, ColumnFamily>(CAPACITY, ColumnFamily.serializer()); + ICache<String, ColumnFamily> cache = new SerializingCache<String, ColumnFamily>(CAPACITY, ColumnFamily.serializer(), tableName, cfName); ColumnFamily cf = createCF(); simpleCase(cf, cache); // concurrentCase(cf, cache);