Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 874a34174 -> 8a2a0c3d4
Clean up CFMetaData patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for CASSANDRA-6506 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69bfca06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69bfca06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69bfca06 Branch: refs/heads/cassandra-2.1 Commit: 69bfca06f2b048c43b0dc4c3423227946b7f6523 Parents: 874a341 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Mar 24 16:52:38 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Mar 24 16:52:38 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 2 +- .../org/apache/cassandra/config/CFMetaData.java | 94 +++++++------------- .../cassandra/cql/AlterTableStatement.java | 2 +- .../cassandra/cql/DropIndexStatement.java | 2 +- .../apache/cassandra/cql/QueryProcessor.java | 2 +- .../cql3/statements/AlterTableStatement.java | 2 +- .../cql3/statements/AlterTypeStatement.java | 2 +- .../cql3/statements/CreateIndexStatement.java | 2 +- .../cql3/statements/CreateTriggerStatement.java | 2 +- .../cql3/statements/DropIndexStatement.java | 2 +- .../cql3/statements/DropTriggerStatement.java | 2 +- .../apache/cassandra/config/CFMetaDataTest.java | 2 +- .../org/apache/cassandra/config/DefsTest.java | 8 +- .../cassandra/thrift/ThriftValidationTest.java | 2 +- .../cassandra/triggers/TriggersSchemaTest.java | 6 +- 15 files changed, 49 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/auth/Auth.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/Auth.java b/src/java/org/apache/cassandra/auth/Auth.java index 90b1215..237fc99 100644 --- a/src/java/org/apache/cassandra/auth/Auth.java +++ b/src/java/org/apache/cassandra/auth/Auth.java @@ -205,7 +205,7 @@ public class Auth CFStatement parsed = (CFStatement)QueryProcessor.parseStatement(cql); parsed.prepareKeyspace(AUTH_KS); CreateTableStatement statement = (CreateTableStatement) parsed.prepare().statement; - CFMetaData cfm = statement.getCFMetaData().clone(CFMetaData.generateLegacyCfId(AUTH_KS, name)); + CFMetaData cfm = statement.getCFMetaData().copy(CFMetaData.generateLegacyCfId(AUTH_KS, name)); assert cfm.cfName.equals(name); MigrationManager.announceNewColumnFamily(cfm); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/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 f38dd5e..9c8ceaf 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -20,26 +20,23 @@ package org.apache.cassandra.config; import java.io.DataInput; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.nio.ByteBuffer; import java.util.*; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; +import com.google.common.base.Strings; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterables; import com.google.common.collect.MapDifference; import com.google.common.collect.Maps; - -import org.apache.cassandra.cache.CachingOptions; -import org.apache.cassandra.db.composites.*; - import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.cql3.*; import org.apache.cassandra.cql3.statements.CFStatement; import org.apache.cassandra.cql3.statements.CreateTableStatement; @@ -47,6 +44,7 @@ import org.apache.cassandra.db.*; import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; import org.apache.cassandra.db.compaction.LeveledCompactionStrategy; import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy; +import org.apache.cassandra.db.composites.*; import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.exceptions.ConfigurationException; @@ -66,14 +64,11 @@ import org.apache.cassandra.utils.UUIDGen; import static org.apache.cassandra.utils.FBUtilities.*; +/** + * This class can be tricky to modify. Please read http://wiki.apache.org/cassandra/ConfigurationNotes for how to do so safely. + */ public final class CFMetaData { - // - // !! Important !! - // This class can be tricky to modify. Please read http://wiki.apache.org/cassandra/ConfigurationNotes - // for how to do so safely. - // - private static final Logger logger = LoggerFactory.getLogger(CFMetaData.class); public final static double DEFAULT_READ_REPAIR_CHANCE = 0.1; @@ -306,7 +301,7 @@ public final class CFMetaData { public enum RetryType { - NONE, CUSTOM, PERCENTILE, ALWAYS; + NONE, CUSTOM, PERCENTILE, ALWAYS } public final RetryType type; @@ -398,7 +393,7 @@ public final class CFMetaData private volatile CachingOptions caching = DEFAULT_CACHING_STRATEGY; private volatile int minIndexInterval = DEFAULT_MIN_INDEX_INTERVAL; private volatile int maxIndexInterval = DEFAULT_MAX_INDEX_INTERVAL; - private int memtableFlushPeriod = 0; + private volatile int memtableFlushPeriod = 0; private volatile int defaultTimeToLive = DEFAULT_DEFAULT_TIME_TO_LIVE; private volatile SpeculativeRetry speculativeRetry = DEFAULT_SPECULATIVE_RETRY; private volatile boolean populateIoCacheOnFlush = DEFAULT_POPULATE_IO_CACHE_ON_FLUSH; @@ -429,7 +424,7 @@ public final class CFMetaData public volatile CompressionParameters compressionParameters = new CompressionParameters(null); // attribute setters that return the modified CFMetaData instance - public CFMetaData comment(String prop) { comment = enforceCommentNotNull(prop); return this;} + public CFMetaData comment(String prop) { comment = Strings.nullToEmpty(prop); return this;} public CFMetaData readRepairChance(double prop) {readRepairChance = prop; return this;} public CFMetaData dcLocalReadRepairChance(double prop) {dcLocalReadRepairChance = prop; return this;} public CFMetaData gcGraceSeconds(int prop) {gcGraceSeconds = prop; return this;} @@ -464,17 +459,13 @@ public final class CFMetaData this(keyspace, name, type, comp, UUIDGen.getTimeUUID()); } - @VisibleForTesting - CFMetaData(String keyspace, String name, ColumnFamilyType type, CellNameType comp, UUID id) + private CFMetaData(String keyspace, String name, ColumnFamilyType type, CellNameType comp, UUID id) { - // (subcc may be null for non-supercolumns) - // (comp may also be null for custom indexes, which is kind of broken if you ask me) - + cfId = id; ksName = keyspace; cfName = name; cfType = type; comparator = comp; - cfId = id; } public static CFMetaData denseCFMetaData(String keyspace, String name, AbstractType<?> comp, AbstractType<?> subcc) @@ -527,11 +518,6 @@ public final class CFMetaData } } - private static String enforceCommentNotNull (CharSequence comment) - { - return (comment == null) ? "" : comment.toString(); - } - /** * Generates deterministic UUID from keyspace/columnfamily name pair. * This is used to generate the same UUID for C* version < 2.1 @@ -545,12 +531,12 @@ public final class CFMetaData private static CFMetaData newSystemMetadata(String keyspace, String cfName, String comment, CellNameType comparator) { - CFMetaData newCFMD = new CFMetaData(keyspace, cfName, ColumnFamilyType.Standard, comparator, generateLegacyCfId(keyspace, cfName)); - return newCFMD.comment(comment) - .readRepairChance(0) - .dcLocalReadRepairChance(0) - .gcGraceSeconds(0) - .memtableFlushPeriod(3600 * 1000); + return new CFMetaData(keyspace, cfName, ColumnFamilyType.Standard, comparator, generateLegacyCfId(keyspace, cfName)) + .comment(comment) + .readRepairChance(0) + .dcLocalReadRepairChance(0) + .gcGraceSeconds(0) + .memtableFlushPeriod(3600 * 1000); } /** @@ -593,7 +579,7 @@ public final class CFMetaData return this; } - public CFMetaData clone() + public CFMetaData copy() { return copyOpts(new CFMetaData(ksName, cfName, cfType, comparator, cfId), this); } @@ -604,7 +590,7 @@ public final class CFMetaData * @param newCfId the cfId for the cloned CFMetaData * @return the cloned CFMetaData instance with the new cfId */ - public CFMetaData clone(UUID newCfId) + public CFMetaData copy(UUID newCfId) { return copyOpts(new CFMetaData(ksName, cfName, cfType, comparator, newCfId), this); } @@ -932,11 +918,6 @@ public final class CFMetaData .toHashCode(); } - public AbstractType<?> getValueValidator(ColumnIdentifier column) - { - return getValueValidator(getColumnDefinition(column)); - } - public AbstractType<?> getValueValidator(CellName name) { return getValueValidator(getColumnDefinition(name)); @@ -1142,7 +1123,7 @@ public final class CFMetaData // compaction thresholds are checked by ThriftValidation. We shouldn't be doing // validation on the apply path; it's too late for that. - comment = enforceCommentNotNull(cfm.comment); + comment = Strings.nullToEmpty(cfm.comment); readRepairChance = cfm.readRepairChance; dcLocalReadRepairChance = cfm.dcLocalReadRepairChance; gcGraceSeconds = cfm.gcGraceSeconds; @@ -1216,8 +1197,7 @@ public final class CFMetaData if (options == null) return; - Method validateMethod = strategyClass.getMethod("validateOptions", Map.class); - Map<String, String> unknownOptions = (Map<String, String>) validateMethod.invoke(null, options); + Map<?,?> unknownOptions = (Map) strategyClass.getMethod("validateOptions", Map.class).invoke(null, options); if (!unknownOptions.isEmpty()) throw new ConfigurationException(String.format("Properties specified %s are not understood by %s", unknownOptions.keySet(), strategyClass.getSimpleName())); } @@ -1283,7 +1263,7 @@ public final class CFMetaData def.setComparator_type(comparator.toString()); } - def.setComment(enforceCommentNotNull(comment)); + def.setComment(Strings.nullToEmpty(comment)); def.setRead_repair_chance(readRepairChance); def.setDclocal_read_repair_chance(dcLocalReadRepairChance); def.setPopulate_io_cache_on_flush(populateIoCacheOnFlush); @@ -1503,13 +1483,11 @@ public final class CFMetaData private static Set<String> existingIndexNames(String cfToExclude) { - Set<String> indexNames = new HashSet<String>(); + Set<String> indexNames = new HashSet<>(); for (ColumnFamilyStore cfs : ColumnFamilyStore.all()) - { if (cfToExclude == null || !cfs.name.equals(cfToExclude)) for (ColumnDefinition cd : cfs.metadata.allColumns()) indexNames.add(cd.getIndexName()); - } return indexNames; } @@ -1715,17 +1693,11 @@ public final class CFMetaData CellNameType comparator = CellNames.fromAbstractType(fullRawComparator, isDense(fullRawComparator, columnDefs)); // if we are upgrading, we use id generated from names initially - UUID cfId; - if (result.has("cf_id")) - cfId = result.getUUID("cf_id"); - else - cfId = generateLegacyCfId(ksName, cfName); + UUID cfId = result.has("cf_id") + ? result.getUUID("cf_id") + : generateLegacyCfId(ksName, cfName); - CFMetaData cfm = new CFMetaData(ksName, - cfName, - cfType, - comparator, - cfId); + CFMetaData cfm = new CFMetaData(ksName, cfName, cfType, comparator, cfId); cfm.readRepairChance(result.getDouble("read_repair_chance")); cfm.dcLocalReadRepairChance(result.getDouble("local_read_repair_chance")); @@ -1774,7 +1746,7 @@ public final class CFMetaData cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("column_aliases"))), cfm.comparator.asAbstractType(), ColumnDefinition.Kind.CLUSTERING_COLUMN); if (result.has("value_alias")) - cfm.addColumnMetadataFromAliases(Collections.<ByteBuffer>singletonList(result.getBytes("value_alias")), cfm.defaultValidator, ColumnDefinition.Kind.COMPACT_VALUE); + cfm.addColumnMetadataFromAliases(Collections.singletonList(result.getBytes("value_alias")), cfm.defaultValidator, ColumnDefinition.Kind.COMPACT_VALUE); if (result.has("dropped_columns")) cfm.droppedColumns(convertDroppedColumns(result.getMap("dropped_columns", UTF8Type.instance, LongType.instance))); @@ -1841,7 +1813,7 @@ public final class CFMetaData if (rawAliases == null) return null; - List<String> aliases = new ArrayList<String>(rawAliases.size()); + List<String> aliases = new ArrayList<>(rawAliases.size()); for (ColumnDefinition rawAlias : rawAliases) aliases.add(rawAlias.name.toString()); return json(aliases); @@ -1849,7 +1821,7 @@ public final class CFMetaData private static List<ByteBuffer> aliasesFromStrings(List<String> aliases) { - List<ByteBuffer> rawAliases = new ArrayList<ByteBuffer>(aliases.size()); + List<ByteBuffer> rawAliases = new ArrayList<>(aliases.size()); for (String alias : aliases) rawAliases.add(UTF8Type.instance.decompose(alias)); return rawAliases; @@ -2198,12 +2170,6 @@ public final class CFMetaData return !staticColumns.isEmpty(); } - public void validateColumns(Iterable<Cell> columns) - { - for (Cell cell : columns) - cell.validateFields(this); - } - @Override public String toString() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/cql/AlterTableStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/AlterTableStatement.java b/src/java/org/apache/cassandra/cql/AlterTableStatement.java index 034f660..7af65a1 100644 --- a/src/java/org/apache/cassandra/cql/AlterTableStatement.java +++ b/src/java/org/apache/cassandra/cql/AlterTableStatement.java @@ -67,7 +67,7 @@ public class AlterTableStatement public CFMetaData getCFMetaData(String keyspace) throws ConfigurationException, InvalidRequestException, SyntaxException { CFMetaData meta = Schema.instance.getCFMetaData(keyspace, columnFamily); - CFMetaData cfm = meta.clone(); + CFMetaData cfm = meta.copy(); ByteBuffer columnName = this.oType == OperationType.OPTS ? null : meta.comparator.subtype(0).fromStringCQL2(this.columnName); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/cql/DropIndexStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/DropIndexStatement.java b/src/java/org/apache/cassandra/cql/DropIndexStatement.java index bc9bbbc..1a24b7e 100644 --- a/src/java/org/apache/cassandra/cql/DropIndexStatement.java +++ b/src/java/org/apache/cassandra/cql/DropIndexStatement.java @@ -49,7 +49,7 @@ public class DropIndexStatement { ColumnDefinition column = findIndexedColumn(cfm); assert column != null; - CFMetaData cloned = cfm.clone(); + CFMetaData cloned = cfm.copy(); ColumnDefinition toChange = cloned.getColumnDefinition(column.name); assert toChange.getIndexName() != null && toChange.getIndexName().equals(indexName); toChange.setIndexName(null); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java index 3d5c3f1..458f131 100644 --- a/src/java/org/apache/cassandra/cql/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java @@ -681,7 +681,7 @@ public class QueryProcessor boolean columnExists = false; ByteBuffer columnName = createIdx.getColumnName().getByteBuffer(); // mutating oldCfm directly would be bad, but mutating a copy is fine. - CFMetaData cfm = oldCfm.clone(); + CFMetaData cfm = oldCfm.copy(); for (ColumnDefinition cd : cfm.regularColumns()) { if (cd.name.bytes.equals(columnName)) http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java index 51b2865..27acb3c 100644 --- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java @@ -77,7 +77,7 @@ public class AlterTableStatement extends SchemaAlteringStatement public void announceMigration() throws RequestValidationException { CFMetaData meta = validateColumnFamily(keyspace(), columnFamily()); - CFMetaData cfm = meta.clone(); + CFMetaData cfm = meta.copy(); CQL3Type validator = this.validator == null ? null : this.validator.prepare(keyspace()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java index 4ce9283..f8731ce 100644 --- a/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java @@ -115,7 +115,7 @@ public abstract class AlterTypeStatement extends SchemaAlteringStatement { for (CFMetaData cfm : ksm2.cfMetaData().values()) { - CFMetaData copy = cfm.clone(); + CFMetaData copy = cfm.copy(); boolean modified = false; for (ColumnDefinition def : copy.allColumns()) modified |= updateDefinition(copy, def, toUpdate.keyspace, toUpdate.name, updated); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java index 49a669f..ea1f933 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java @@ -120,7 +120,7 @@ public class CreateIndexStatement extends SchemaAlteringStatement public void announceMigration() throws RequestValidationException { logger.debug("Updating column {} definition for index {}", target.column, indexName); - CFMetaData cfm = Schema.instance.getCFMetaData(keyspace(), columnFamily()).clone(); + CFMetaData cfm = Schema.instance.getCFMetaData(keyspace(), columnFamily()).copy(); ColumnDefinition cd = cfm.getColumnDefinition(target.column); if (cd.getIndexType() != null && ifNotExists) http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.java index 329b7bc..7b4543f 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.java @@ -67,7 +67,7 @@ public class CreateTriggerStatement extends SchemaAlteringStatement public void announceMigration() throws ConfigurationException { - CFMetaData cfm = Schema.instance.getCFMetaData(keyspace(), columnFamily()).clone(); + CFMetaData cfm = Schema.instance.getCFMetaData(keyspace(), columnFamily()).copy(); cfm.addTriggerDefinition(TriggerDefinition.create(triggerName, triggerClass)); logger.info("Adding trigger with name {} and class {}", triggerName, triggerClass); MigrationManager.announceColumnFamilyUpdate(cfm, false); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java index c62ad47..aa17d51 100644 --- a/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java @@ -74,7 +74,7 @@ public class DropIndexStatement extends SchemaAlteringStatement { ColumnDefinition column = findIndexedColumn(cfm); assert column != null; - CFMetaData cloned = cfm.clone(); + CFMetaData cloned = cfm.copy(); ColumnDefinition toChange = cloned.getColumnDefinition(column.name); assert toChange.getIndexName() != null && toChange.getIndexName().equals(indexName); toChange.setIndexName(null); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/src/java/org/apache/cassandra/cql3/statements/DropTriggerStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/DropTriggerStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropTriggerStatement.java index ce17047..c9b33a1 100644 --- a/src/java/org/apache/cassandra/cql3/statements/DropTriggerStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/DropTriggerStatement.java @@ -55,7 +55,7 @@ public class DropTriggerStatement extends SchemaAlteringStatement public void announceMigration() throws ConfigurationException { - CFMetaData cfm = Schema.instance.getCFMetaData(keyspace(), columnFamily()).clone(); + CFMetaData cfm = Schema.instance.getCFMetaData(keyspace(), columnFamily()).copy(); if (!cfm.removeTrigger(triggerName)) throw new ConfigurationException(String.format("Trigger %s was not found", triggerName)); logger.info("Dropping trigger with name {}", triggerName); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/test/unit/org/apache/cassandra/config/CFMetaDataTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/CFMetaDataTest.java b/test/unit/org/apache/cassandra/config/CFMetaDataTest.java index d0ff179..47f4f20 100644 --- a/test/unit/org/apache/cassandra/config/CFMetaDataTest.java +++ b/test/unit/org/apache/cassandra/config/CFMetaDataTest.java @@ -109,7 +109,7 @@ public class CFMetaDataTest extends SchemaLoader checkInverses(cfm); // Testing with compression to catch #3558 - CFMetaData withCompression = cfm.clone(); + CFMetaData withCompression = cfm.copy(); withCompression.compressionParameters(new CompressionParameters(SnappyCompressor.instance, 32768, new HashMap<String, String>())); checkInverses(withCompression); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/test/unit/org/apache/cassandra/config/DefsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/DefsTest.java b/test/unit/org/apache/cassandra/config/DefsTest.java index 1251ff7..2e1876f 100644 --- a/test/unit/org/apache/cassandra/config/DefsTest.java +++ b/test/unit/org/apache/cassandra/config/DefsTest.java @@ -70,7 +70,7 @@ public class DefsTest extends SchemaLoader // we'll be adding this one later. make sure it's not already there. assert cfm.getColumnDefinition(ByteBuffer.wrap(new byte[] { 5 })) == null; - CFMetaData cfNew = cfm.clone(); + CFMetaData cfNew = cfm.copy(); // add one. ColumnDefinition addIndexDef = ColumnDefinition.regularDef(cfm, ByteBuffer.wrap(new byte[] { 5 }), BytesType.instance, null) @@ -411,7 +411,7 @@ public class DefsTest extends SchemaLoader assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName) != null; // updating certain fields should fail. - CFMetaData newCfm = cf.clone(); + CFMetaData newCfm = cf.copy(); newCfm.defaultValidator(BytesType.instance); newCfm.minCompactionThreshold(5); newCfm.maxCompactionThreshold(31); @@ -444,7 +444,7 @@ public class DefsTest extends SchemaLoader assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getDefaultValidator() == UTF8Type.instance; // Change cfId - newCfm = new CFMetaData(cf.ksName, cf.cfName, cf.cfType, cf.comparator, UUID.randomUUID()); + newCfm = new CFMetaData(cf.ksName, cf.cfName, cf.cfType, cf.comparator); CFMetaData.copyOpts(newCfm, cf); try { @@ -511,7 +511,7 @@ public class DefsTest extends SchemaLoader Descriptor desc = indexedCfs.getSSTables().iterator().next().descriptor; // drop the index - CFMetaData meta = cfs.metadata.clone(); + CFMetaData meta = cfs.metadata.copy(); ColumnDefinition cdOld = meta.regularColumns().iterator().next(); ColumnDefinition cdNew = ColumnDefinition.regularDef(meta, cdOld.name.bytes, cdOld.type, null); meta.addOrReplaceColumnDefinition(cdNew); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java index 35d851e..05ac588 100644 --- a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java +++ b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java @@ -49,7 +49,7 @@ public class ThriftValidationTest extends SchemaLoader public void testColumnNameEqualToKeyAlias() { CFMetaData metaData = Schema.instance.getCFMetaData("Keyspace1", "Standard1"); - CFMetaData newMetadata = metaData.clone(); + CFMetaData newMetadata = metaData.copy(); boolean gotException = false; http://git-wip-us.apache.org/repos/asf/cassandra/blob/69bfca06/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java b/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java index f9d71ee..c6a1ac5 100644 --- a/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java +++ b/test/unit/org/apache/cassandra/triggers/TriggersSchemaTest.java @@ -92,7 +92,7 @@ public class TriggersSchemaTest extends SchemaLoader Collections.singletonList(cfm1)); MigrationManager.announceNewKeyspace(ksm); - CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName).clone(); + CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName).copy(); TriggerDefinition td = TriggerDefinition.create(triggerName, triggerClass); cfm2.addTriggerDefinition(td); MigrationManager.announceColumnFamilyUpdate(cfm2, false); @@ -116,11 +116,11 @@ public class TriggersSchemaTest extends SchemaLoader Collections.singletonList(cfm1)); MigrationManager.announceNewKeyspace(ksm); - CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName).clone(); + CFMetaData cfm2 = Schema.instance.getCFMetaData(ksName, cfName).copy(); cfm2.removeTrigger(triggerName); MigrationManager.announceColumnFamilyUpdate(cfm2, false); - CFMetaData cfm3 = Schema.instance.getCFMetaData(ksName, cfName).clone(); + CFMetaData cfm3 = Schema.instance.getCFMetaData(ksName, cfName).copy(); assertTrue(cfm3.getTriggers().isEmpty()); } }
