Author: gdusbabek
Date: Fri Nov 19 15:27:45 2010
New Revision: 1036893
URL: http://svn.apache.org/viewvc?rev=1036893&view=rev
Log:
replace modifiable CFM members with private fields and public getters. patch by
gdusbabek, reviewe by jbellis. CASSANDRA-1715
Modified:
cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java
cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
cassandra/trunk/test/long/org/apache/cassandra/db/LongCompactionSpeedTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java Fri
Nov 19 15:27:45 2010
@@ -147,22 +147,22 @@ public final class CFMetaData
public final AbstractType subcolumnComparator; // like comparator, for
supercolumns
//OPTIONAL
- public final String comment; // default none, for
humans only
- public final double rowCacheSize; // default 0
- public final double keyCacheSize; // default 0.01
- public final double readRepairChance; // default 1.0 (always),
chance [0.0,1.0] of read repair
- public final int gcGraceSeconds; // default 864000 (ten
days)
- public final AbstractType defaultValidator; // default none, use
comparator types
- public final Integer minCompactionThreshold; // default 4
- public final Integer maxCompactionThreshold; // default 32
- public final int rowCacheSavePeriodInSeconds; // default 0 (off)
- public final int keyCacheSavePeriodInSeconds; // default 3600 (1 hour)
- public final int memtableFlushAfterMins; // default 60
- public final int memtableThroughputInMb; // default based on heap
size
- public final double memtableOperationsInMillions; // default based on
throughput
+ private String comment; // default none, for
humans only
+ private double rowCacheSize; // default 0
+ private double keyCacheSize; // default 0.01
+ private double readRepairChance; // default 1.0 (always),
chance [0.0,1.0] of read repair
+ private int gcGraceSeconds; // default 864000 (ten
days)
+ private AbstractType defaultValidator; // default none, use
comparator types
+ private Integer minCompactionThreshold; // default 4
+ private Integer maxCompactionThreshold; // default 32
+ private int rowCacheSavePeriodInSeconds; // default 0 (off)
+ private int keyCacheSavePeriodInSeconds; // default 3600 (1 hour)
+ private int memtableFlushAfterMins; // default 60
+ private int memtableThroughputInMb; // default based on heap
size
+ private double memtableOperationsInMillions; // default based on
throughput
// NOTE: if you find yourself adding members to this class, make sure you
keep the convert methods in lockstep.
- public final Map<ByteBuffer, ColumnDefinition> column_metadata;
+ private final Map<ByteBuffer, ColumnDefinition> column_metadata;
private CFMetaData(String tableName,
String cfName,
@@ -436,7 +436,77 @@ public final class CFMetaData
cf.id,
column_metadata);
}
+
+ public String getComment()
+ {
+ return comment;
+ }
+
+ public double getRowCacheSize()
+ {
+ return rowCacheSize;
+ }
+
+ public double getKeyCacheSize()
+ {
+ return keyCacheSize;
+ }
+
+ public double getReadRepairChance()
+ {
+ return readRepairChance;
+ }
+
+ public int getGcGraceSeconds()
+ {
+ return gcGraceSeconds;
+ }
+
+ public AbstractType getDefaultValidator()
+ {
+ return defaultValidator;
+ }
+
+ public Integer getMinCompactionThreshold()
+ {
+ return minCompactionThreshold;
+ }
+ public Integer getMaxCompactionThreshold()
+ {
+ return maxCompactionThreshold;
+ }
+
+ public int getRowCacheSavePeriodInSeconds()
+ {
+ return rowCacheSavePeriodInSeconds;
+ }
+
+ public int getKeyCacheSavePeriodInSeconds()
+ {
+ return keyCacheSavePeriodInSeconds;
+ }
+
+ public int getMemtableFlushAfterMins()
+ {
+ return memtableFlushAfterMins;
+ }
+
+ public int getMemtableThroughputInMb()
+ {
+ return memtableThroughputInMb;
+ }
+
+ public double getMemtableOperationsInMillions()
+ {
+ return memtableOperationsInMillions;
+ }
+
+ public Map<ByteBuffer, ColumnDefinition> getColumn_metadata()
+ {
+ return Collections.unmodifiableMap(column_metadata);
+ }
+
public boolean equals(Object obj)
{
if (obj == this)
Modified:
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Fri Nov 19 15:27:45 2010
@@ -945,7 +945,7 @@ public class DatabaseDescriptor
public static int getKeysCachedFor(String tableName, String
columnFamilyName, long expectedKeys)
{
CFMetaData cfm = getCFMetaData(tableName, columnFamilyName);
- double v = (cfm == null) ? CFMetaData.DEFAULT_KEY_CACHE_SIZE :
cfm.keyCacheSize;
+ double v = (cfm == null) ? CFMetaData.DEFAULT_KEY_CACHE_SIZE :
cfm.getKeyCacheSize();
return (int)Math.min(FBUtilities.absoluteFromFraction(v,
expectedKeys), Integer.MAX_VALUE);
}
@@ -955,7 +955,7 @@ public class DatabaseDescriptor
public static int getRowsCachedFor(String tableName, String
columnFamilyName, long expectedRows)
{
CFMetaData cfm = getCFMetaData(tableName, columnFamilyName);
- double v = (cfm == null) ? CFMetaData.DEFAULT_ROW_CACHE_SIZE :
cfm.rowCacheSize;
+ double v = (cfm == null) ? CFMetaData.DEFAULT_ROW_CACHE_SIZE :
cfm.getRowCacheSize();
return (int)Math.min(FBUtilities.absoluteFromFraction(v,
expectedRows), Integer.MAX_VALUE);
}
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=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri
Nov 19 15:27:45 2010
@@ -161,15 +161,15 @@ public class ColumnFamilyStore implement
// only update these runtime-modifiable settings if they have not been
modified.
if (!minCompactionThreshold.isModified())
- minCompactionThreshold = new
DefaultInteger(metadata.minCompactionThreshold);
+ minCompactionThreshold = new
DefaultInteger(metadata.getMinCompactionThreshold());
if (!maxCompactionThreshold.isModified())
- maxCompactionThreshold = new
DefaultInteger(metadata.maxCompactionThreshold);
+ maxCompactionThreshold = new
DefaultInteger(metadata.getMaxCompactionThreshold());
if (!memtime.isModified())
- memtime = new DefaultInteger(metadata.memtableFlushAfterMins);
+ memtime = new DefaultInteger(metadata.getMemtableFlushAfterMins());
if (!memsize.isModified())
- memsize = new DefaultInteger(metadata.memtableThroughputInMb);
+ memsize = new DefaultInteger(metadata.getMemtableThroughputInMb());
if (!memops.isModified())
- memops = new DefaultDouble(metadata.memtableOperationsInMillions);
+ memops = new
DefaultDouble(metadata.getMemtableOperationsInMillions());
// reset the memtable with new settings.
try
@@ -190,7 +190,7 @@ public class ColumnFamilyStore implement
// drop indexes no longer needed
Set<ByteBuffer> indexesToDrop = new HashSet<ByteBuffer>();
for (ByteBuffer indexName : indexedColumns.keySet())
- if (!metadata.column_metadata.containsKey(indexName))
+ if (!metadata.getColumn_metadata().containsKey(indexName))
indexesToDrop.add(indexName);
for (ByteBuffer indexName : indexesToDrop)
{
@@ -204,7 +204,7 @@ public class ColumnFamilyStore implement
// so don't bother with them.
// add indexes that are new
- for (Map.Entry<ByteBuffer, ColumnDefinition> entry :
metadata.column_metadata.entrySet())
+ for (Map.Entry<ByteBuffer, ColumnDefinition> entry :
metadata.getColumn_metadata().entrySet())
if (!indexedColumns.containsKey(entry.getKey()) &&
entry.getValue().index_type != null)
addIndex(entry.getValue());
}
@@ -215,11 +215,11 @@ public class ColumnFamilyStore implement
this.table = table;
columnFamily = columnFamilyName;
this.metadata = metadata;
- this.minCompactionThreshold = new
DefaultInteger(metadata.minCompactionThreshold);
- this.maxCompactionThreshold = new
DefaultInteger(metadata.maxCompactionThreshold);
- this.memtime = new DefaultInteger(metadata.memtableFlushAfterMins);
- this.memsize = new DefaultInteger(metadata.memtableThroughputInMb);
- this.memops = new DefaultDouble(metadata.memtableOperationsInMillions);
+ this.minCompactionThreshold = new
DefaultInteger(metadata.getMinCompactionThreshold());
+ this.maxCompactionThreshold = new
DefaultInteger(metadata.getMaxCompactionThreshold());
+ this.memtime = new
DefaultInteger(metadata.getMemtableFlushAfterMins());
+ this.memsize = new
DefaultInteger(metadata.getMemtableThroughputInMb());
+ this.memops = new
DefaultDouble(metadata.getMemtableOperationsInMillions());
this.partitioner = partitioner;
fileIndexGenerator.set(generation);
memtable = new Memtable(this);
@@ -256,7 +256,7 @@ public class ColumnFamilyStore implement
// create the private ColumnFamilyStores for the secondary column
indexes
indexedColumns = new ConcurrentSkipListMap<ByteBuffer,
ColumnFamilyStore>(getComparator());
- for (ColumnDefinition info : metadata.column_metadata.values())
+ for (ColumnDefinition info : metadata.getColumn_metadata().values())
{
if (info.index_type != null)
addIndex(info);
@@ -319,7 +319,7 @@ public class ColumnFamilyStore implement
final CFMetaData indexedCfMetadata =
CFMetaData.newIndexMetadata(table.name, columnFamily, info, columnComparator);
ColumnFamilyStore indexedCfs =
ColumnFamilyStore.createColumnFamilyStore(table,
indexedCfMetadata.cfName,
-
new LocalPartitioner(metadata.column_metadata.get(info.name).validator),
+
new LocalPartitioner(metadata.getColumn_metadata().get(info.name).validator),
indexedCfMetadata);
// record that the column is supposed to be indexed, before we start
building it
// (so we don't omit indexing writes that happen during build process)
@@ -503,8 +503,8 @@ public class ColumnFamilyStore implement
public void initRowCache()
{
String msgSuffix = String.format(" row cache for %s of %s",
columnFamily, table.name);
- int rowCacheSavePeriodInSeconds =
DatabaseDescriptor.getTableMetaData(table.name).get(columnFamily).rowCacheSavePeriodInSeconds;
- int keyCacheSavePeriodInSeconds =
DatabaseDescriptor.getTableMetaData(table.name).get(columnFamily).keyCacheSavePeriodInSeconds;
+ int rowCacheSavePeriodInSeconds =
DatabaseDescriptor.getTableMetaData(table.name).get(columnFamily).getRowCacheSavePeriodInSeconds();
+ int keyCacheSavePeriodInSeconds =
DatabaseDescriptor.getTableMetaData(table.name).get(columnFamily).getKeyCacheSavePeriodInSeconds();
long start = System.currentTimeMillis();
logger.info(String.format("loading%s", msgSuffix));
@@ -1068,7 +1068,7 @@ public class ColumnFamilyStore implement
public int gcBefore()
{
- return (int) (System.currentTimeMillis() / 1000) -
metadata.gcGraceSeconds;
+ return (int) (System.currentTimeMillis() / 1000) -
metadata.getGcGraceSeconds();
}
private ColumnFamily cacheRow(DecoratedKey key)
@@ -1274,7 +1274,7 @@ public class ColumnFamilyStore implement
Iterables.addAll(sstables, ssTables);
RowIterator iterator = RowIteratorFactory.getIterator(memtables,
sstables, startWith, stopAt, filter, getComparator(), this);
- int gcBefore = (int)(System.currentTimeMillis() / 1000) -
metadata.gcGraceSeconds;
+ int gcBefore = (int)(System.currentTimeMillis() / 1000) -
metadata.getGcGraceSeconds();
try
{
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java Fri
Nov 19 15:27:45 2010
@@ -121,7 +121,7 @@ public class CompactionManager implement
// if we have too many to compact all at once,
compact older ones first -- this avoids
// re-compacting files we just created.
Collections.sort(sstables);
- return doCompaction(cfs, sstables.subList(0,
Math.min(sstables.size(), maxThreshold)), (int) (System.currentTimeMillis() /
1000) - cfs.metadata.gcGraceSeconds);
+ return doCompaction(cfs, sstables.subList(0,
Math.min(sstables.size(), maxThreshold)), (int) (System.currentTimeMillis() /
1000) - cfs.metadata.getGcGraceSeconds());
}
}
}
@@ -182,7 +182,7 @@ public class CompactionManager implement
public void performMajor(final ColumnFamilyStore cfStore) throws
InterruptedException, ExecutionException
{
- submitMajor(cfStore, 0, (int) (System.currentTimeMillis() / 1000) -
cfStore.metadata.gcGraceSeconds).get();
+ submitMajor(cfStore, 0, (int) (System.currentTimeMillis() / 1000) -
cfStore.metadata.getGcGraceSeconds()).get();
}
public Future<Object> submitMajor(final ColumnFamilyStore cfStore, final
long skip, final int gcBefore)
@@ -387,7 +387,7 @@ public class CompactionManager implement
logger.debug("Expected bloom filter size : " +
expectedBloomFilterSize);
SSTableWriter writer = null;
- CompactionIterator ci = new AntiCompactionIterator(cfs, sstables,
ranges, (int) (System.currentTimeMillis() / 1000) -
cfs.metadata.gcGraceSeconds, cfs.isCompleteSSTables(sstables));
+ CompactionIterator ci = new AntiCompactionIterator(cfs, sstables,
ranges, (int) (System.currentTimeMillis() / 1000) -
cfs.metadata.getGcGraceSeconds(), cfs.isCompleteSSTables(sstables));
Iterator<AbstractCompactedRow> nni = new FilterIterator(ci,
PredicateUtils.notNullPredicate());
executor.beginCompaction(cfs, ci);
@@ -596,7 +596,7 @@ public class CompactionManager implement
{
public ValidationCompactionIterator(ColumnFamilyStore cfs) throws
IOException
{
- super(cfs, cfs.getSSTables(), (int) (System.currentTimeMillis() /
1000) - cfs.metadata.gcGraceSeconds, true);
+ super(cfs, cfs.getSSTables(), (int) (System.currentTimeMillis() /
1000) - cfs.metadata.getGcGraceSeconds(), true);
}
@Override
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/RowIteratorFactory.java
Fri Nov 19 15:27:45 2010
@@ -107,7 +107,7 @@ public class RowIteratorFactory
// reduce rows from all sources into a single row
ReducingIterator<IColumnIterator, Row> reduced = new
ReducingIterator<IColumnIterator, Row>(collated)
{
- private final int gcBefore = (int) (System.currentTimeMillis() /
1000) - cfs.metadata.gcGraceSeconds;
+ private final int gcBefore = (int) (System.currentTimeMillis() /
1000) - cfs.metadata.getGcGraceSeconds();
private final List<IColumnIterator> colIters = new
ArrayList<IColumnIterator>();
private DecoratedKey key;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java Fri Nov
19 15:27:45 2010
@@ -41,7 +41,6 @@ import org.apache.cassandra.thrift.Colum
import org.apache.cassandra.thrift.Deletion;
import org.apache.cassandra.thrift.Mutation;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
public class RowMutation
@@ -105,7 +104,7 @@ public class RowMutation
{
ByteBuffer combined =
HintedHandOffManager.makeCombinedName(rm.getTable(), cf.metadata().cfName);
QueryPath path = new QueryPath(HintedHandOffManager.HINTS_CF,
rm.key(), combined);
- add(path, FBUtilities.EMPTY_BYTE_BUFFER,
System.currentTimeMillis(), cf.metadata().gcGraceSeconds);
+ add(path, FBUtilities.EMPTY_BYTE_BUFFER,
System.currentTimeMillis(), cf.metadata().getGcGraceSeconds());
}
}
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java
Fri Nov 19 15:27:45 2010
@@ -12,7 +12,6 @@ import org.apache.cassandra.config.Confi
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.db.CompactionManager;
import org.apache.cassandra.db.SystemTable;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.utils.FBUtilities;
@@ -93,12 +92,12 @@ public class UpdateColumnFamily extends
table.reloadCf(newCfm.cfId);
// clean up obsolete index data files
- for (Map.Entry<ByteBuffer, ColumnDefinition> entry :
oldCfm.column_metadata.entrySet())
+ for (Map.Entry<ByteBuffer, ColumnDefinition> entry :
oldCfm.getColumn_metadata().entrySet())
{
ByteBuffer column = entry.getKey();
ColumnDefinition def = entry.getValue();
if (def.index_type != null
- && (!newCfm.column_metadata.containsKey(column) ||
newCfm.column_metadata.get(column).index_type == null))
+ && (!newCfm.getColumn_metadata().containsKey(column)
|| newCfm.getColumn_metadata().get(column).index_type == null))
{
ColumnFamilyStore indexCfs =
oldCfs.getIndexedColumnFamilyStore(column);
SystemTable.setIndexRemoved(table.name,
indexCfs.columnFamily);
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Fri
Nov 19 15:27:45 2010
@@ -597,7 +597,7 @@ public class StorageProxy implements Sto
private static boolean randomlyReadRepair(ReadCommand command)
{
CFMetaData cfmd =
DatabaseDescriptor.getTableMetaData(command.table).get(command.getColumnFamilyName());
- return cfmd.readRepairChance > random.nextDouble();
+ return cfmd.getReadRepairChance() > random.nextDouble();
}
public long getReadOperations()
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Fri Nov 19 15:27:45 2010
@@ -1982,17 +1982,17 @@ public class StorageService implements I
RawColumnFamily rcf = new RawColumnFamily();
rcf.name = cfm.cfName;
rcf.compare_with = cfm.comparator.getClass().getName();
- rcf.default_validation_class =
cfm.defaultValidator.getClass().getName();
+ rcf.default_validation_class =
cfm.getDefaultValidator().getClass().getName();
rcf.compare_subcolumns_with = cfm.subcolumnComparator == null
? null : cfm.subcolumnComparator.getClass().getName();
rcf.column_type = cfm.cfType;
- rcf.comment = cfm.comment;
- rcf.keys_cached = cfm.keyCacheSize;
- rcf.read_repair_chance = cfm.readRepairChance;
- rcf.gc_grace_seconds = cfm.gcGraceSeconds;
- rcf.rows_cached = cfm.rowCacheSize;
- rcf.column_metadata = new
RawColumnDefinition[cfm.column_metadata.size()];
+ rcf.comment = cfm.getComment();
+ rcf.keys_cached = cfm.getKeyCacheSize();
+ rcf.read_repair_chance = cfm.getReadRepairChance();
+ rcf.gc_grace_seconds = cfm.getGcGraceSeconds();
+ rcf.rows_cached = cfm.getRowCacheSize();
+ rcf.column_metadata = new
RawColumnDefinition[cfm.getColumn_metadata().size()];
int j = 0;
- for (ColumnDefinition cd : cfm.column_metadata.values())
+ for (ColumnDefinition cd : cfm.getColumn_metadata().values())
{
RawColumnDefinition rcd = new RawColumnDefinition();
rcd.index_name = cd.index_name;
Modified:
cassandra/trunk/test/long/org/apache/cassandra/db/LongCompactionSpeedTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/long/org/apache/cassandra/db/LongCompactionSpeedTest.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
---
cassandra/trunk/test/long/org/apache/cassandra/db/LongCompactionSpeedTest.java
(original)
+++
cassandra/trunk/test/long/org/apache/cassandra/db/LongCompactionSpeedTest.java
Fri Nov 19 15:27:45 2010
@@ -95,7 +95,7 @@ public class LongCompactionSpeedTest ext
Thread.sleep(1000);
long start = System.currentTimeMillis();
- CompactionManager.instance.doCompaction(store, sstables, (int)
(System.currentTimeMillis() / 1000) - DatabaseDescriptor.getCFMetaData(TABLE1,
"Standard1").gcGraceSeconds);
+ CompactionManager.instance.doCompaction(store, sstables, (int)
(System.currentTimeMillis() / 1000) - DatabaseDescriptor.getCFMetaData(TABLE1,
"Standard1").getGcGraceSeconds());
System.out.println(String.format("%s: sstables=%d rowsper=%d
colsper=%d: %d ms",
this.getClass().getName(),
sstableCount,
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
---
cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
(original)
+++
cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
Fri Nov 19 15:27:45 2010
@@ -312,7 +312,7 @@ public class ColumnFamilyStoreTest exten
rm.apply();
ColumnFamilyStore cfs = table.getColumnFamilyStore("Indexed2");
- ColumnDefinition old =
cfs.metadata.column_metadata.get(ByteBufferUtil.bytes("birthdate"));
+ ColumnDefinition old =
cfs.metadata.getColumn_metadata().get(ByteBufferUtil.bytes("birthdate"));
ColumnDefinition cd = new ColumnDefinition(old.name,
old.validator.getClass().getName(), IndexType.KEYS, "birthdate_index");
cfs.addIndex(cd);
while (!SystemTable.isIndexBuilt("Keyspace1",
cfs.getIndexedColumnFamilyStore(ByteBufferUtil.bytes("birthdate")).columnFamily))
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java?rev=1036893&r1=1036892&r2=1036893&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java Fri Nov 19
15:27:45 2010
@@ -552,12 +552,12 @@ public class DefsTest extends CleanupHel
cf_def.setKeyspace(cf.tableName);
cf_def.setName(cf.cfName);
cf_def.setColumn_type(cf.cfType.name());
- cf_def.setComment(cf.comment);
+ cf_def.setComment(cf.getComment());
cf_def.setComparator_type(cf.comparator.getClass().getName());
cf_def.setSubcomparator_type(null);
- cf_def.setGc_grace_seconds(cf.gcGraceSeconds);
- cf_def.setKey_cache_size(cf.keyCacheSize);
- cf_def.setRead_repair_chance(cf.readRepairChance);
+ cf_def.setGc_grace_seconds(cf.getGcGraceSeconds());
+ cf_def.setKey_cache_size(cf.getKeyCacheSize());
+ cf_def.setRead_repair_chance(cf.getReadRepairChance());
cf_def.setRow_cache_size(43.3);
cf_def.setColumn_metadata(new ArrayList<ColumnDef>());
cf_def.setDefault_validation_class("BytesType");
@@ -608,12 +608,12 @@ public class DefsTest extends CleanupHel
// can't test changing the reconciler because there is only one impl.
// check the cumulative affect.
- assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).comment.equals(cf_def.comment);
- assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).rowCacheSize == cf_def.row_cache_size;
- assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).keyCacheSize == cf_def.key_cache_size;
- assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).readRepairChance == cf_def.read_repair_chance;
- assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).gcGraceSeconds == cf_def.gc_grace_seconds;
- assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).defaultValidator == UTF8Type.instance;
+ assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).getComment().equals(cf_def.comment);
+ assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).getRowCacheSize() == cf_def.row_cache_size;
+ assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).getKeyCacheSize() == cf_def.key_cache_size;
+ assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).getReadRepairChance() == cf_def.read_repair_chance;
+ assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).getGcGraceSeconds() == cf_def.gc_grace_seconds;
+ assert DatabaseDescriptor.getCFMetaData(cf.tableName,
cf.cfName).getDefaultValidator() == UTF8Type.instance;
// make sure some invalid operations fail.
int oldId = cf_def.id;
