rename CFS.columnFamily -> CFS.name
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e14e195 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e14e195 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e14e195 Branch: refs/heads/trunk Commit: 9e14e195a401e51d9c0d5a7a1d95cdd47806938a Parents: 853456d Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Nov 29 21:35:33 2012 +0900 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Nov 29 22:01:30 2012 +0900 ---------------------------------------------------------------------- .../apache/cassandra/cache/AutoSavingCache.java | 4 +- .../org/apache/cassandra/config/CFMetaData.java | 60 +++++++------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 53 ++++++------- src/java/org/apache/cassandra/db/DataTracker.java | 4 +- src/java/org/apache/cassandra/db/DefsTable.java | 2 +- src/java/org/apache/cassandra/db/Memtable.java | 4 +- .../org/apache/cassandra/db/SliceQueryPager.java | 2 +- src/java/org/apache/cassandra/db/Table.java | 4 +- .../db/compaction/CompactionController.java | 4 +- .../cassandra/db/compaction/CompactionManager.java | 8 +- .../cassandra/db/compaction/CompactionTask.java | 4 +- .../db/compaction/LeveledCompactionStrategy.java | 2 +- .../cassandra/db/compaction/LeveledManifest.java | 2 +- .../compaction/SizeTieredCompactionStrategy.java | 2 +- .../AbstractSimplePerColumnSecondaryIndex.java | 6 +- .../db/index/composites/CompositesSearcher.java | 4 +- .../cassandra/db/index/keys/KeysSearcher.java | 4 +- .../cassandra/metrics/ColumnFamilyMetrics.java | 2 +- .../org/apache/cassandra/service/CacheService.java | 4 +- .../apache/cassandra/service/StorageService.java | 4 +- .../org/apache/cassandra/utils/StatusLogger.java | 2 +- .../apache/cassandra/db/MeteredFlusherTest.java | 2 +- test/unit/org/apache/cassandra/db/CleanupTest.java | 2 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 6 +- .../cassandra/io/sstable/SSTableReaderTest.java | 2 +- .../service/AntiEntropyServiceTestAbstract.java | 2 +- .../cassandra/streaming/StreamingTransferTest.java | 16 ++-- 27 files changed, 104 insertions(+), 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/cache/AutoSavingCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java b/src/java/org/apache/cassandra/cache/AutoSavingCache.java index 14c379c..ece95d0 100644 --- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java +++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java @@ -102,7 +102,7 @@ public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K long start = System.currentTimeMillis(); // old cache format that only saves keys - File path = getCachePath(cfs.table.name, cfs.columnFamily, null); + File path = getCachePath(cfs.table.name, cfs.name, null); if (path.exists()) { DataInputStream in = null; @@ -130,7 +130,7 @@ public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K } // modern format, allows both key and value (so key cache load can be purely sequential) - path = getCachePath(cfs.table.name, cfs.columnFamily, CURRENT_VERSION); + path = getCachePath(cfs.table.name, cfs.name, CURRENT_VERSION); if (path.exists()) { DataInputStream in = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index 699aa38..c7b94bd 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -108,35 +108,35 @@ public final class CFMetaData + "strategy_options text" + ") WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=8640"); public static final CFMetaData SchemaColumnFamiliesCf = compile(9, "CREATE TABLE " + SystemTable.SCHEMA_COLUMNFAMILIES_CF + "(" - + "keyspace_name text," - + "columnfamily_name text," - + "id int," - + "type text," - + "comparator text," - + "subcomparator text," - + "comment text," - + "read_repair_chance double," - + "local_read_repair_chance double," - + "replicate_on_write boolean," - + "gc_grace_seconds int," - + "default_validator text," - + "key_validator text," - + "min_compaction_threshold int," - + "max_compaction_threshold int," - + "memtable_flush_period_in_ms int," - + "key_alias text," // that one is kept for compatibility sake - + "key_aliases text," - + "bloom_filter_fp_chance double," - + "caching text," - + "compaction_strategy_class text," - + "compression_parameters text," - + "value_alias text," - + "column_aliases text," - + "compaction_strategy_options text," - + "default_read_consistency text," - + "default_write_consistency text," - + "PRIMARY KEY (keyspace_name, columnfamily_name)" - + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=8640"); + + "keyspace_name text," + + "columnfamily_name text," + + "id int," + + "type text," + + "comparator text," + + "subcomparator text," + + "comment text," + + "read_repair_chance double," + + "local_read_repair_chance double," + + "replicate_on_write boolean," + + "gc_grace_seconds int," + + "default_validator text," + + "key_validator text," + + "min_compaction_threshold int," + + "max_compaction_threshold int," + + "memtable_flush_period_in_ms int," + + "key_alias text," // that one is kept for compatibility sake + + "key_aliases text," + + "bloom_filter_fp_chance double," + + "caching text," + + "compaction_strategy_class text," + + "compression_parameters text," + + "value_alias text," + + "column_aliases text," + + "compaction_strategy_options text," + + "default_read_consistency text," + + "default_write_consistency text," + + "PRIMARY KEY (keyspace_name, columnfamily_name)" + + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=8640"); public static final CFMetaData SchemaColumnsCf = compile(10, "CREATE TABLE " + SystemTable.SCHEMA_COLUMNS_CF + "(" + "keyspace_name text," + "columnfamily_name text," @@ -1136,7 +1136,7 @@ public final class CFMetaData Set<String> indexNames = new HashSet<String>(); for (ColumnFamilyStore cfs : ColumnFamilyStore.all()) { - if (cfToExclude == null || !cfs.getColumnFamilyName().equals(cfToExclude)) + if (cfToExclude == null || !cfs.name.equals(cfToExclude)) for (ColumnDefinition cd : cfs.metadata.getColumn_metadata().values()) indexNames.add(cd.getIndexName()); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index c90e481..f93cf8c 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -106,7 +106,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean } public final Table table; - public final String columnFamily; + public final String name; public final CFMetaData metadata; public final IPartitioner partitioner; private final String mbeanName; @@ -275,7 +275,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean assert metadata != null : "null metadata for " + table + ":" + columnFamilyName; this.table = table; - columnFamily = columnFamilyName; + name = columnFamilyName; this.metadata = metadata; this.minCompactionThreshold = new DefaultInteger(metadata.getMinCompactionThreshold()); this.maxCompactionThreshold = new DefaultInteger(metadata.getMaxCompactionThreshold()); @@ -288,7 +288,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean Caching caching = metadata.getCaching(); if (logger.isDebugEnabled()) - logger.debug("Starting CFS {}", columnFamily); + logger.debug("Starting CFS {}", name); // scan for sstables corresponding to this cf and load them data = new DataTracker(this); @@ -329,7 +329,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean // register the mbean String type = this.partitioner instanceof LocalPartitioner ? "IndexColumnFamilies" : "ColumnFamilies"; - mbeanName = "org.apache.cassandra.db:type=" + type + ",keyspace=" + this.table.name + ",columnfamily=" + columnFamily; + mbeanName = "org.apache.cassandra.db:type=" + type + ",keyspace=" + this.table.name + ",columnfamily=" + name; try { MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); @@ -502,7 +502,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean System.currentTimeMillis() - start, cachedRowsRead, table.name, - columnFamily)); + name)); } /** @@ -523,7 +523,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean */ public synchronized void loadNewSSTables() { - logger.info("Loading new SSTables for " + table.name + "/" + columnFamily + "..."); + logger.info("Loading new SSTables for " + table.name + "/" + name + "..."); Set<Descriptor> currentDescriptors = new HashSet<Descriptor>(); for (SSTableReader sstable : data.getView().sstables) @@ -569,11 +569,11 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean if (newSSTables.isEmpty()) { - logger.info("No new SSTables were found for " + table.name + "/" + columnFamily); + logger.info("No new SSTables were found for " + table.name + "/" + name); return; } - logger.info("Loading new SSTables and building secondary indexes for " + table.name + "/" + columnFamily + ": " + newSSTables); + logger.info("Loading new SSTables and building secondary indexes for " + table.name + "/" + name + ": " + newSSTables); SSTableReader.acquireReferences(newSSTables); data.addSSTables(newSSTables); try @@ -585,7 +585,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean SSTableReader.releaseReferences(newSSTables); } - logger.info("Done loading load new SSTables for " + table.name + "/" + columnFamily); + logger.info("Done loading load new SSTables for " + table.name + "/" + name); } public static void rebuildSecondaryIndex(String ksName, String cfName, String... idxNames) @@ -609,12 +609,9 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean } } - /** - * @return the name of the column family - */ public String getColumnFamilyName() { - return columnFamily; + return name; } public String getTempSSTablePath(File directory) @@ -627,7 +624,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean Descriptor desc = new Descriptor(version, directory, table.name, - columnFamily, + name, fileIndexGenerator.incrementAndGet(), true); return desc.filenameFor(Component.DATA); @@ -735,7 +732,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean if (clean) { - logger.debug("forceFlush requested but everything is clean in {}", columnFamily); + logger.debug("forceFlush requested but everything is clean in {}", name); return null; } @@ -950,7 +947,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean */ public void addSSTable(SSTableReader sstable) { - assert sstable.getColumnFamilyName().equals(columnFamily); + assert sstable.getColumnFamilyName().equals(name); addSSTables(Arrays.asList(sstable)); } @@ -1198,7 +1195,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean private ColumnFamily getThroughCache(UUID cfId, QueryFilter filter) { assert isRowCacheEnabled() - : String.format("Row cache is not enabled on column family [" + getColumnFamilyName() + "]"); + : String.format("Row cache is not enabled on column family [" + name + "]"); RowCacheKey key = new RowCacheKey(cfId, filter.key); @@ -1223,7 +1220,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean try { - ColumnFamily data = getTopLevelColumns(QueryFilter.getIdentityFilter(filter.key, new QueryPath(columnFamily)), + ColumnFamily data = getTopLevelColumns(QueryFilter.getIdentityFilter(filter.key, new QueryPath(name)), Integer.MIN_VALUE, true); if (sentinelSuccess && data != null) @@ -1240,7 +1237,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean ColumnFamily getColumnFamily(QueryFilter filter, int gcBefore) { - assert columnFamily.equals(filter.getColumnFamilyName()) : filter.getColumnFamilyName(); + assert name.equals(filter.getColumnFamilyName()) : filter.getColumnFamilyName(); ColumnFamily result = null; @@ -1249,10 +1246,10 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean { if (isRowCacheEnabled()) { - UUID cfId = Schema.instance.getId(table.name, columnFamily); + UUID cfId = Schema.instance.getId(table.name, name); if (cfId == null) { - logger.trace("no id found for {}.{}", table.name, columnFamily); + logger.trace("no id found for {}.{}", table.name, name); return null; } @@ -1405,7 +1402,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean public ColumnFamily getTopLevelColumns(QueryFilter filter, int gcBefore, boolean forCache) { - Tracing.trace("Executing single-partition query on {}", columnFamily); + Tracing.trace("Executing single-partition query on {}", name); CollationController controller = new CollationController(this, forCache, filter, gcBefore); ColumnFamily columns = controller.getTopLevelColumns(); metric.updateSSTableIterated(controller.getSstablesIterated()); @@ -1434,7 +1431,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean final RowPosition startWith = range.left; final RowPosition stopAt = range.right; - QueryFilter filter = new QueryFilter(null, new QueryPath(columnFamily, superColumn, null), columnFilter); + QueryFilter filter = new QueryFilter(null, new QueryPath(name, superColumn, null), columnFilter); final ViewFragment view = markReferenced(startWith, stopAt); Tracing.trace("Executing seq scan across {} sstables for {}", view.sstables.size(), range.getString(metadata.getKeyValidator())); @@ -1528,7 +1525,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean IDiskAtomFilter extraFilter = filter.getExtraFilter(data); if (extraFilter != null) { - QueryPath path = new QueryPath(columnFamily); + QueryPath path = new QueryPath(name); ColumnFamily cf = filter.cfs.getColumnFamily(new QueryFilter(rawRow.key, path, extraFilter)); if (cf != null) data.addAll(cf, HeapAllocator.instance); @@ -1703,7 +1700,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean public void invalidateCachedRow(DecoratedKey key) { - UUID cfId = Schema.instance.getId(table.name, this.columnFamily); + UUID cfId = Schema.instance.getId(table.name, this.name); if (cfId == null) return; // secondary index @@ -1775,7 +1772,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean // beginning if we restart before they are discarded for normal reasons // post-truncate. So we need to create a "dummy" sstable containing // only the replay position. This is done by CompactionManager.submitTruncate. - logger.debug("truncating {}", columnFamily); + logger.debug("truncating {}", name); if (DatabaseDescriptor.isAutoSnapshot()) { @@ -1820,7 +1817,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean long truncatedAt = System.currentTimeMillis(); if (DatabaseDescriptor.isAutoSnapshot()) - snapshot(Table.getTimestampedSnapshotName(columnFamily)); + snapshot(Table.getTimestampedSnapshotName(name)); return CompactionManager.instance.submitTruncate(this, truncatedAt); } @@ -1855,7 +1852,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean { return "CFS(" + "Keyspace='" + table.name + '\'' + - ", ColumnFamily='" + columnFamily + '\'' + + ", ColumnFamily='" + name + '\'' + ')'; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/DataTracker.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java index 7e8887f..75620e5 100644 --- a/src/java/org/apache/cassandra/db/DataTracker.java +++ b/src/java/org/apache/cassandra/db/DataTracker.java @@ -337,7 +337,7 @@ public class DataTracker assert sstable.getKeySamples() != null; if (logger.isDebugEnabled()) logger.debug(String.format("adding %s to list of files tracked for %s.%s", - sstable.descriptor, cfstore.table.name, cfstore.getColumnFamilyName())); + sstable.descriptor, cfstore.table.name, cfstore.name)); long size = sstable.bytesOnDisk(); StorageMetrics.load.inc(size); cfstore.metric.liveDiskSpaceUsed.inc(size); @@ -352,7 +352,7 @@ public class DataTracker { if (logger.isDebugEnabled()) logger.debug(String.format("removing %s from list of files tracked for %s.%s", - sstable.descriptor, cfstore.table.name, cfstore.getColumnFamilyName())); + sstable.descriptor, cfstore.table.name, cfstore.name)); long size = sstable.bytesOnDisk(); StorageMetrics.load.dec(size); cfstore.metric.liveDiskSpaceUsed.dec(size); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/DefsTable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DefsTable.java b/src/java/org/apache/cassandra/db/DefsTable.java index 2ea3433..fc77499 100644 --- a/src/java/org/apache/cassandra/db/DefsTable.java +++ b/src/java/org/apache/cassandra/db/DefsTable.java @@ -597,7 +597,7 @@ public class DefsTable if (!StorageService.instance.isClientMode()) { if (DatabaseDescriptor.isAutoSnapshot()) - cfs.snapshot(Table.getTimestampedSnapshotName(cfs.columnFamily)); + cfs.snapshot(Table.getTimestampedSnapshotName(cfs.name)); Table.open(ksm.name).dropCf(cfm.cfId); MigrationManager.instance.notifyDropColumnFamily(cfm); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index bbbe272..7455cdf 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -273,7 +273,7 @@ public class Memtable public String toString() { return String.format("Memtable-%s@%s(%s/%s serialized/live bytes, %s ops)", - cfs.getColumnFamilyName(), hashCode(), currentSize, getLiveSize(), currentOperations); + cfs.name, hashCode(), currentSize, getLiveSize(), currentOperations); } /** @@ -462,7 +462,7 @@ public class Memtable // and BL data is strictly local, so we don't need to preserve tombstones for repair. // If we have a data row + row level tombstone, then writing it is effectively an expensive no-op so we skip it. // See CASSANDRA-4667. - if (cfs.columnFamily.equals(SystemTable.BATCHLOG_CF) && cfs.table.name.equals(Table.SYSTEM_KS) && !cf.isEmpty()) + if (cfs.name.equals(SystemTable.BATCHLOG_CF) && cfs.table.name.equals(Table.SYSTEM_KS) && !cf.isEmpty()) continue; // Pedantically, you could purge column level tombstones that are past GcGRace when writing to the SSTable. http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/SliceQueryPager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SliceQueryPager.java b/src/java/org/apache/cassandra/db/SliceQueryPager.java index 0f45f8c..cd555a5 100644 --- a/src/java/org/apache/cassandra/db/SliceQueryPager.java +++ b/src/java/org/apache/cassandra/db/SliceQueryPager.java @@ -51,7 +51,7 @@ public class SliceQueryPager implements Iterator<ColumnFamily> if (exhausted) return null; - QueryPath path = new QueryPath(cfs.getColumnFamilyName()); + QueryPath path = new QueryPath(cfs.name); SliceQueryFilter sliceFilter = new SliceQueryFilter(slices, false, DEFAULT_PAGE_SIZE); QueryFilter filter = new QueryFilter(key, path, sliceFilter); ColumnFamily cf = cfs.getColumnFamily(filter); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/Table.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Table.java b/src/java/org/apache/cassandra/db/Table.java index 121b7bb..c5df634 100644 --- a/src/java/org/apache/cassandra/db/Table.java +++ b/src/java/org/apache/cassandra/db/Table.java @@ -182,7 +182,7 @@ public class Table boolean tookSnapShot = false; for (ColumnFamilyStore cfStore : columnFamilyStores.values()) { - if (columnFamilyName == null || cfStore.columnFamily.equals(columnFamilyName)) + if (columnFamilyName == null || cfStore.name.equals(columnFamilyName)) { tookSnapShot = true; cfStore.snapshot(snapshotName); @@ -336,7 +336,7 @@ public class Table { // re-initializing an existing CF. This will happen if you cleared the schema // on this node and it's getting repopulated from the rest of the cluster. - assert cfs.getColumnFamilyName().equals(cfName); + assert cfs.name.equals(cfName); cfs.metadata.reload(); cfs.reload(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java index 2c8ddba..7783d28 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@ -102,7 +102,7 @@ public class CompactionController public String getColumnFamily() { - return cfs.columnFamily; + return cfs.name; } /** @@ -156,7 +156,7 @@ public class CompactionController { String keyString = cfs.metadata.getKeyValidator().getString(rows.get(0).getKey().key); logger.info(String.format("Compacting large row %s/%s:%s (%d bytes) incrementally", - cfs.table.name, cfs.columnFamily, keyString, rowSize)); + cfs.table.name, cfs.name, keyString, rowSize)); return new LazilyCompactedRow(this, rows); } return new PrecompactedRow(this, rows); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 4399948..7f1b72e 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -129,13 +129,13 @@ public class CompactionManager implements CompactionManagerMBean if (count > 0 && executor.getActiveCount() >= executor.getMaximumPoolSize()) { logger.debug("Background compaction is still running for {}.{} ({} remaining). Skipping", - new Object[] {cfs.table.name, cfs.columnFamily, count}); + new Object[] {cfs.table.name, cfs.name, count}); return Collections.emptyList(); } logger.debug("Scheduling a background task check for {}.{} with {}", new Object[] {cfs.table.name, - cfs.columnFamily, + cfs.name, cfs.getCompactionStrategy().getClass().getSimpleName()}); List<Future<?>> futures = new ArrayList<Future<?>>(); // if we have room for more compactions, then fill up executor @@ -163,7 +163,7 @@ public class CompactionManager implements CompactionManagerMBean compactionLock.readLock().lock(); try { - logger.debug("Checking {}.{}", cfs.table.name, cfs.columnFamily); // log after we get the lock so we can see delays from that if any + logger.debug("Checking {}.{}", cfs.table.name, cfs.name); // log after we get the lock so we can see delays from that if any if (!cfs.isValid()) { logger.debug("Aborting compaction for dropped CF"); @@ -735,7 +735,7 @@ public class CompactionManager implements CompactionManagerMBean // flush first so everyone is validating data that is as similar as possible try { - StorageService.instance.forceTableFlush(cfs.table.name, cfs.getColumnFamilyName()); + StorageService.instance.forceTableFlush(cfs.table.name, cfs.name); } catch (ExecutionException e) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java index 3c676a6..cb47354 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java @@ -103,11 +103,11 @@ public class CompactionTask extends AbstractCompactionTask assert sstables != null && dataDirectory != null; if (DatabaseDescriptor.isSnapshotBeforeCompaction()) - cfs.snapshotWithoutFlush(System.currentTimeMillis() + "-compact-" + cfs.columnFamily); + cfs.snapshotWithoutFlush(System.currentTimeMillis() + "-compact-" + cfs.name); // sanity check: all sstables must belong to the same cfs for (SSTableReader sstable : toCompact) - assert sstable.descriptor.cfname.equals(cfs.columnFamily); + assert sstable.descriptor.cfname.equals(cfs.name); CompactionController controller = new CompactionController(cfs, toCompact, gcBefore); // new sstables from flush can be added during a compaction, but only the compaction can remove them, http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java index 1522d18..101566c 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java @@ -278,7 +278,7 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy implem @Override public String toString() { - return String.format("LCS@%d(%s)", hashCode(), cfs.columnFamily); + return String.format("LCS@%d(%s)", hashCode(), cfs.name); } private SSTableReader findDroppableSSTable(final int gcBefore) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index a992d11..8f103ff 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -641,7 +641,7 @@ public class LeveledManifest } logger.debug("Estimating {} compactions to do for {}.{}", - new Object[] {Arrays.toString(estimated), cfs.table.name, cfs.columnFamily}); + new Object[] {Arrays.toString(estimated), cfs.table.name, cfs.name }); return Ints.checkedCast(tasks); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java index 7fc9f13..cb585d2 100644 --- a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java @@ -54,7 +54,7 @@ public class SizeTieredCompactionStrategy extends AbstractCompactionStrategy bucketHigh = optionValue == null ? DEFAULT_BUCKET_HIGH : Double.parseDouble(optionValue); if (bucketHigh <= bucketLow) { - logger.warn("Bucket low/high marks for {} incorrect, using defaults.", cfs.getColumnFamilyName()); + logger.warn("Bucket low/high marks for {} incorrect, using defaults.", cfs.name); bucketLow = DEFAULT_BUCKET_LOW; bucketHigh = DEFAULT_BUCKET_HIGH; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java b/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java index 63af51b..4bb14fc 100644 --- a/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java +++ b/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java @@ -63,7 +63,7 @@ public abstract class AbstractSimplePerColumnSecondaryIndex extends PerColumnSec double averageColumnCount = indexCfs.getMeanColumns(); if (averageColumnCount > 0 && estimatedKeys / averageColumnCount > 1) { - logger.debug("turning row cache on for " + indexCfs.getColumnFamilyName()); + logger.debug("turning row cache on for " + indexCfs.name); indexCfs.metadata.caching(baseCaching); indexCfs.initRowCache(); } @@ -79,7 +79,7 @@ public abstract class AbstractSimplePerColumnSecondaryIndex extends PerColumnSec public String expressionString(IndexExpression expr) { return String.format("'%s.%s %s %s'", - baseCfs.columnFamily, + baseCfs.name, getExpressionComparator().getString(expr.column_name), expr.op, baseCfs.metadata.getColumn_metadata().get(expr.column_name).getValidator().getString(expr.value)); @@ -163,7 +163,7 @@ public abstract class AbstractSimplePerColumnSecondaryIndex extends PerColumnSec public String getIndexName() { - return indexCfs.columnFamily; + return indexCfs.name; } public long getLiveSize() http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java index 4817a00..29333b1 100644 --- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java +++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java @@ -161,7 +161,7 @@ public class CompositesSearcher extends SecondaryIndexSearcher { private ByteBuffer lastSeenPrefix = startPrefix; private Deque<IColumn> indexColumns; - private final QueryPath path = new QueryPath(baseCfs.columnFamily); + private final QueryPath path = new QueryPath(baseCfs.name); private int columnsRead = Integer.MAX_VALUE; private final int meanColumns = Math.max(index.getIndexCfs().getMeanColumns(), 1); @@ -218,7 +218,7 @@ public class CompositesSearcher extends SecondaryIndexSearcher ((AbstractSimplePerColumnSecondaryIndex)index).expressionString(primary), indexComparator.getString(startPrefix)); QueryFilter indexFilter = QueryFilter.getSliceFilter(indexKey, - new QueryPath(index.getIndexCfs().getColumnFamilyName()), + new QueryPath(index.getIndexCfs().name), lastSeenPrefix, endPrefix, false, http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java index 4be7988..cc7773c 100644 --- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java +++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java @@ -109,7 +109,7 @@ public class KeysSearcher extends SecondaryIndexSearcher { private ByteBuffer lastSeenKey = startKey; private Iterator<IColumn> indexColumns; - private final QueryPath path = new QueryPath(baseCfs.columnFamily); + private final QueryPath path = new QueryPath(baseCfs.name); private int columnsRead = Integer.MAX_VALUE; protected Row computeNext() @@ -132,7 +132,7 @@ public class KeysSearcher extends SecondaryIndexSearcher ((AbstractSimplePerColumnSecondaryIndex)index).expressionString(primary), index.getBaseCfs().metadata.getKeyValidator().getString(startKey)); QueryFilter indexFilter = QueryFilter.getSliceFilter(indexKey, - new QueryPath(index.getIndexCfs().getColumnFamilyName()), + new QueryPath(index.getIndexCfs().name), lastSeenKey, endKey, false, http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java index d7ae745..727a79e 100644 --- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java @@ -320,7 +320,7 @@ public class ColumnFamilyMetrics ColumnFamilyMetricNameFactory(ColumnFamilyStore cfs) { this.keyspaceName = cfs.table.name; - this.columnFamilyName = cfs.getColumnFamilyName(); + this.columnFamilyName = cfs.name; isIndex = cfs.isIndex(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/service/CacheService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java index 21f007c..7e3aca8 100644 --- a/src/java/org/apache/cassandra/service/CacheService.java +++ b/src/java/org/apache/cassandra/service/CacheService.java @@ -340,7 +340,7 @@ public class CacheService implements CacheServiceMBean public Pair<RowCacheKey, IRowCacheEntry> call() throws Exception { DecoratedKey key = cfs.partitioner.decorateKey(buffer); - ColumnFamily data = cfs.getTopLevelColumns(QueryFilter.getIdentityFilter(key, new QueryPath(cfs.columnFamily)), Integer.MIN_VALUE, true); + ColumnFamily data = cfs.getTopLevelColumns(QueryFilter.getIdentityFilter(key, new QueryPath(cfs.name)), Integer.MIN_VALUE, true); return Pair.create(new RowCacheKey(cfs.metadata.cfId, key), (IRowCacheEntry) data); } }); @@ -351,7 +351,7 @@ public class CacheService implements CacheServiceMBean for (ByteBuffer key : buffers) { DecoratedKey dk = cfs.partitioner.decorateKey(key); - ColumnFamily data = cfs.getTopLevelColumns(QueryFilter.getIdentityFilter(dk, new QueryPath(cfs.columnFamily)), Integer.MIN_VALUE, true); + ColumnFamily data = cfs.getTopLevelColumns(QueryFilter.getIdentityFilter(dk, new QueryPath(cfs.name)), Integer.MIN_VALUE, true); rowCache.put(new RowCacheKey(cfs.metadata.cfId, dk), data); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 3bba88e..01ac31a 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -2222,7 +2222,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe { for (ColumnFamilyStore cfStore : getValidColumnFamilies(tableName, columnFamilies)) { - logger.debug("Forcing flush on keyspace " + tableName + ", CF " + cfStore.getColumnFamilyName()); + logger.debug("Forcing flush on keyspace " + tableName + ", CF " + cfStore.name); cfStore.forceBlockingFlush(); } } @@ -2311,7 +2311,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe ArrayList<String> names = new ArrayList<String>(); for (ColumnFamilyStore cfStore : getValidColumnFamilies(tableName, columnFamilies)) { - names.add(cfStore.getColumnFamilyName()); + names.add(cfStore.name); } if (names.isEmpty()) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/src/java/org/apache/cassandra/utils/StatusLogger.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/StatusLogger.java b/src/java/org/apache/cassandra/utils/StatusLogger.java index 4cb7898..ba5e0ed 100644 --- a/src/java/org/apache/cassandra/utils/StatusLogger.java +++ b/src/java/org/apache/cassandra/utils/StatusLogger.java @@ -110,7 +110,7 @@ public class StatusLogger for (ColumnFamilyStore cfs : ColumnFamilyStore.all()) { logger.info(String.format("%-25s%20s", - cfs.table.name + "." + cfs.columnFamily, + cfs.table.name + "." + cfs.name, cfs.getMemtableColumnsCount() + "," + cfs.getMemtableDataSize())); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/test/long/org/apache/cassandra/db/MeteredFlusherTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java b/test/long/org/apache/cassandra/db/MeteredFlusherTest.java index e2a6973..e77ce69 100644 --- a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java +++ b/test/long/org/apache/cassandra/db/MeteredFlusherTest.java @@ -63,7 +63,7 @@ public class MeteredFlusherTest extends SchemaLoader int flushes = 0; for (ColumnFamilyStore cfs : ColumnFamilyStore.all()) { - if (cfs.getColumnFamilyName().startsWith("_CF")) + if (cfs.name.startsWith("_CF")) flushes += cfs.getMemtableSwitchCount(); } assert flushes > 0; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/test/unit/org/apache/cassandra/db/CleanupTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java b/test/unit/org/apache/cassandra/db/CleanupTest.java index 5872407..4de36ac 100644 --- a/test/unit/org/apache/cassandra/db/CleanupTest.java +++ b/test/unit/org/apache/cassandra/db/CleanupTest.java @@ -151,7 +151,7 @@ public class CleanupTest extends SchemaLoader // create a row and update the birthdate value, test that the index query fetches the new version RowMutation rm; rm = new RowMutation(TABLE1, ByteBufferUtil.bytes(key)); - rm.add(new QueryPath(cfs.getColumnFamilyName(), null, COLUMN), VALUE, System.currentTimeMillis()); + rm.add(new QueryPath(cfs.name, null, COLUMN), VALUE, System.currentTimeMillis()); rm.applyUnsafe(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index cd34a91..63d1500 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -748,7 +748,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader private static void putColsSuper(ColumnFamilyStore cfs, DecoratedKey key, ByteBuffer scfName, Column... cols) throws Throwable { RowMutation rm = new RowMutation(cfs.table.name, key.key); - ColumnFamily cf = ColumnFamily.create(cfs.table.name, cfs.getColumnFamilyName()); + ColumnFamily cf = ColumnFamily.create(cfs.table.name, cfs.name); SuperColumn sc = new SuperColumn(scfName, cfs.metadata.subcolumnComparator); for (Column col : cols) sc.addColumn(col); @@ -760,7 +760,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader private static void putColsStandard(ColumnFamilyStore cfs, DecoratedKey key, Column... cols) throws Throwable { RowMutation rm = new RowMutation(cfs.table.name, key.key); - ColumnFamily cf = ColumnFamily.create(cfs.table.name, cfs.getColumnFamilyName()); + ColumnFamily cf = ColumnFamily.create(cfs.table.name, cfs.name); for (Column col : cols) cf.addColumn(col); rm.add(cf); @@ -796,7 +796,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader // delete (from sstable and memtable) RowMutation rm = new RowMutation(table.name, key.key); - rm.delete(new QueryPath(cfs.columnFamily, null, null), 2); + rm.delete(new QueryPath(cfs.name, null, null), 2); rm.apply(); // verify delete http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java index 0fe9757..1f9798c 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -315,7 +315,7 @@ public class SSTableReaderTest extends SchemaLoader private void assertIndexQueryWorks(ColumnFamilyStore indexedCFS) throws IOException { - assert "Indexed1".equals(indexedCFS.getColumnFamilyName()); + assert "Indexed1".equals(indexedCFS.name); // make sure all sstables including 2ary indexes load from disk for (ColumnFamilyStore cfs : indexedCFS.concatWithIndexes()) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java index ef7a2ab..ad5f0a8 100644 --- a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java +++ b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java @@ -84,7 +84,7 @@ public abstract class AntiEntropyServiceTestAbstract extends SchemaLoader store = null; for (ColumnFamilyStore cfs : Table.open(tablename).getColumnFamilyStores()) { - if (cfs.columnFamily.equals(cfname)) + if (cfs.name.equals(cfname)) { store = cfs; break; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e14e195/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 2d96030..ffbeb65 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -71,7 +71,7 @@ public class StreamingTransferTest extends SchemaLoader private List<String> createAndTransfer(Table table, ColumnFamilyStore cfs, Mutator mutator) throws Exception { // write a temporary SSTable, and unregister it - logger.debug("Mutating " + cfs.columnFamily); + logger.debug("Mutating " + cfs.name); long timestamp = 1234; for (int i = 1; i <= 3; i++) mutator.mutate("key" + i, "col" + i, timestamp); @@ -82,7 +82,7 @@ public class StreamingTransferTest extends SchemaLoader cfs.clearUnsafe(); // transfer the first and last key - logger.debug("Transferring " + cfs.columnFamily); + logger.debug("Transferring " + cfs.name); transfer(table, sstable); // confirm that a single SSTable was transferred and registered @@ -96,7 +96,7 @@ public class StreamingTransferTest extends SchemaLoader { String key = "key" + offs[i]; String col = "col" + offs[i]; - assert cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk(key), new QueryPath(cfs.columnFamily))) != null; + assert cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk(key), new QueryPath(cfs.name))) != null; assert rows.get(i).key.key.equals(ByteBufferUtil.bytes(key)); assert rows.get(i).cf.getColumn(ByteBufferUtil.bytes(col)) != null; } @@ -108,7 +108,7 @@ public class StreamingTransferTest extends SchemaLoader for (int off : offs) keys.add("key" + off); - logger.debug("... everything looks good for " + cfs.columnFamily); + logger.debug("... everything looks good for " + cfs.name); return keys; } @@ -135,7 +135,7 @@ public class StreamingTransferTest extends SchemaLoader { long val = key.hashCode(); RowMutation rm = new RowMutation("Keyspace1", ByteBufferUtil.bytes(key)); - ColumnFamily cf = ColumnFamily.create(table.name, cfs.columnFamily); + ColumnFamily cf = ColumnFamily.create(table.name, cfs.name); cf.addColumn(column(col, "v", timestamp)); cf.addColumn(new Column(ByteBufferUtil.bytes("birthdate"), ByteBufferUtil.bytes(val), timestamp)); rm.add(cf); @@ -172,7 +172,7 @@ public class StreamingTransferTest extends SchemaLoader public void mutate(String key, String col, long timestamp) throws Exception { RowMutation rm = new RowMutation(table.name, ByteBufferUtil.bytes(key)); - addMutation(rm, cfs.columnFamily, col, 1, "val1", timestamp); + addMutation(rm, cfs.name, col, 1, "val1", timestamp); rm.apply(); } }); @@ -211,7 +211,7 @@ public class StreamingTransferTest extends SchemaLoader cleanedEntries.put(key, cfCleaned); cfs.addSSTable(SSTableUtils.prepare() .ks(table.name) - .cf(cfs.columnFamily) + .cf(cfs.name) .generation(0) .write(entries)); } @@ -221,7 +221,7 @@ public class StreamingTransferTest extends SchemaLoader cleanedEntries.keySet().retainAll(keys); SSTableReader cleaned = SSTableUtils.prepare() .ks(table.name) - .cf(cfs.columnFamily) + .cf(cfs.name) .generation(0) .write(cleanedEntries); SSTableReader streamed = cfs.getSSTables().iterator().next();
