Remove deprecated merge_shard_chance patch by slebresne; reviewed by jbellis for CASSANDRA-3940
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5030f78a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5030f78a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5030f78a Branch: refs/heads/trunk Commit: 5030f78a5aa9bfa52915812dceb78a717db1ee86 Parents: 5191780 Author: Sylvain Lebresne <[email protected]> Authored: Wed Feb 22 16:30:54 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Feb 22 16:32:07 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + interface/cassandra.thrift | 1 - .../org/apache/cassandra/thrift/Cassandra.java | 6 +- .../org/apache/cassandra/thrift/CfDef.java | 96 +-------------- .../org/apache/cassandra/config/CFMetaData.java | 23 +---- .../cassandra/cql/CreateColumnFamilyStatement.java | 1 - .../statements/CreateColumnFamilyStatement.java | 1 - test/unit/org/apache/cassandra/SchemaLoader.java | 6 +- test/unit/org/apache/cassandra/db/DefsTest.java | 4 +- 9 files changed, 10 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030f78a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ae921d1..7811b1f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ * Update ORDER BY syntax for CQL3 (CASSANDRA-3925) * Fix BulkRecordWriter to not throw NPE if reducer gets no map data from Hadoop (CASSANDRA-3944) * Fix bug with counters in super columns (CASSANDRA-3821) + * Remove deprecated merge_shard_chance (CASSANDRA-3940) Merged from 1.0: * remove the wait on hint future during write (CASSANDRA-3870) * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030f78a/interface/cassandra.thrift ---------------------------------------------------------------------- diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift index a2275b6..f21845b 100644 --- a/interface/cassandra.thrift +++ b/interface/cassandra.thrift @@ -407,7 +407,6 @@ struct CfDef { 17: optional i32 min_compaction_threshold, 18: optional i32 max_compaction_threshold, 24: optional bool replicate_on_write, - 25: optional double merge_shards_chance, 26: optional string key_validation_class, 28: optional binary key_alias, 29: optional string compaction_strategy, http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030f78a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java index 3cfe58c..5b79e18 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java @@ -8526,8 +8526,6 @@ public class Cassandra { private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bit_vector = new BitSet(1); read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -17735,8 +17733,6 @@ public class Cassandra { private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bit_vector = new BitSet(1); read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -26540,6 +26536,8 @@ public class Cassandra { private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bit_vector = new BitSet(1); read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030f78a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java index 0fe3a7d..72d12cb 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java @@ -59,7 +59,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav private static final org.apache.thrift.protocol.TField MIN_COMPACTION_THRESHOLD_FIELD_DESC = new org.apache.thrift.protocol.TField("min_compaction_threshold", org.apache.thrift.protocol.TType.I32, (short)17); private static final org.apache.thrift.protocol.TField MAX_COMPACTION_THRESHOLD_FIELD_DESC = new org.apache.thrift.protocol.TField("max_compaction_threshold", org.apache.thrift.protocol.TType.I32, (short)18); private static final org.apache.thrift.protocol.TField REPLICATE_ON_WRITE_FIELD_DESC = new org.apache.thrift.protocol.TField("replicate_on_write", org.apache.thrift.protocol.TType.BOOL, (short)24); - private static final org.apache.thrift.protocol.TField MERGE_SHARDS_CHANCE_FIELD_DESC = new org.apache.thrift.protocol.TField("merge_shards_chance", org.apache.thrift.protocol.TType.DOUBLE, (short)25); private static final org.apache.thrift.protocol.TField KEY_VALIDATION_CLASS_FIELD_DESC = new org.apache.thrift.protocol.TField("key_validation_class", org.apache.thrift.protocol.TType.STRING, (short)26); private static final org.apache.thrift.protocol.TField KEY_ALIAS_FIELD_DESC = new org.apache.thrift.protocol.TField("key_alias", org.apache.thrift.protocol.TType.STRING, (short)28); private static final org.apache.thrift.protocol.TField COMPACTION_STRATEGY_FIELD_DESC = new org.apache.thrift.protocol.TField("compaction_strategy", org.apache.thrift.protocol.TType.STRING, (short)29); @@ -85,7 +84,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav public int min_compaction_threshold; // required public int max_compaction_threshold; // required public boolean replicate_on_write; // required - public double merge_shards_chance; // required public String key_validation_class; // required public ByteBuffer key_alias; // required public String compaction_strategy; // required @@ -113,7 +111,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav MIN_COMPACTION_THRESHOLD((short)17, "min_compaction_threshold"), MAX_COMPACTION_THRESHOLD((short)18, "max_compaction_threshold"), REPLICATE_ON_WRITE((short)24, "replicate_on_write"), - MERGE_SHARDS_CHANCE((short)25, "merge_shards_chance"), KEY_VALIDATION_CLASS((short)26, "key_validation_class"), KEY_ALIAS((short)28, "key_alias"), COMPACTION_STRATEGY((short)29, "compaction_strategy"), @@ -166,8 +163,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav return MAX_COMPACTION_THRESHOLD; case 24: // REPLICATE_ON_WRITE return REPLICATE_ON_WRITE; - case 25: // MERGE_SHARDS_CHANCE - return MERGE_SHARDS_CHANCE; case 26: // KEY_VALIDATION_CLASS return KEY_VALIDATION_CLASS; case 28: // KEY_ALIAS @@ -234,10 +229,9 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav private static final int __MIN_COMPACTION_THRESHOLD_ISSET_ID = 3; private static final int __MAX_COMPACTION_THRESHOLD_ISSET_ID = 4; private static final int __REPLICATE_ON_WRITE_ISSET_ID = 5; - private static final int __MERGE_SHARDS_CHANCE_ISSET_ID = 6; - private static final int __BLOOM_FILTER_FP_CHANCE_ISSET_ID = 7; - private static final int __DCLOCAL_READ_REPAIR_CHANCE_ISSET_ID = 8; - private BitSet __isset_bit_vector = new BitSet(9); + private static final int __BLOOM_FILTER_FP_CHANCE_ISSET_ID = 6; + private static final int __DCLOCAL_READ_REPAIR_CHANCE_ISSET_ID = 7; + private BitSet __isset_bit_vector = new BitSet(8); public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -271,8 +265,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.REPLICATE_ON_WRITE, new org.apache.thrift.meta_data.FieldMetaData("replicate_on_write", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.MERGE_SHARDS_CHANCE, new org.apache.thrift.meta_data.FieldMetaData("merge_shards_chance", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); tmpMap.put(_Fields.KEY_VALIDATION_CLASS, new org.apache.thrift.meta_data.FieldMetaData("key_validation_class", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.KEY_ALIAS, new org.apache.thrift.meta_data.FieldMetaData("key_alias", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -364,7 +356,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav this.min_compaction_threshold = other.min_compaction_threshold; this.max_compaction_threshold = other.max_compaction_threshold; this.replicate_on_write = other.replicate_on_write; - this.merge_shards_chance = other.merge_shards_chance; if (other.isSetKey_validation_class()) { this.key_validation_class = other.key_validation_class; } @@ -453,8 +444,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav this.max_compaction_threshold = 0; setReplicate_on_writeIsSet(false); this.replicate_on_write = false; - setMerge_shards_chanceIsSet(false); - this.merge_shards_chance = 0.0; this.key_validation_class = null; this.key_alias = null; this.compaction_strategy = null; @@ -815,29 +804,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav __isset_bit_vector.set(__REPLICATE_ON_WRITE_ISSET_ID, value); } - public double getMerge_shards_chance() { - return this.merge_shards_chance; - } - - public CfDef setMerge_shards_chance(double merge_shards_chance) { - this.merge_shards_chance = merge_shards_chance; - setMerge_shards_chanceIsSet(true); - return this; - } - - public void unsetMerge_shards_chance() { - __isset_bit_vector.clear(__MERGE_SHARDS_CHANCE_ISSET_ID); - } - - /** Returns true if field merge_shards_chance is set (has been assigned a value) and false otherwise */ - public boolean isSetMerge_shards_chance() { - return __isset_bit_vector.get(__MERGE_SHARDS_CHANCE_ISSET_ID); - } - - public void setMerge_shards_chanceIsSet(boolean value) { - __isset_bit_vector.set(__MERGE_SHARDS_CHANCE_ISSET_ID, value); - } - public String getKey_validation_class() { return this.key_validation_class; } @@ -1247,14 +1213,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav } break; - case MERGE_SHARDS_CHANCE: - if (value == null) { - unsetMerge_shards_chance(); - } else { - setMerge_shards_chance((Double)value); - } - break; - case KEY_VALIDATION_CLASS: if (value == null) { unsetKey_validation_class(); @@ -1382,9 +1340,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav case REPLICATE_ON_WRITE: return Boolean.valueOf(isReplicate_on_write()); - case MERGE_SHARDS_CHANCE: - return Double.valueOf(getMerge_shards_chance()); - case KEY_VALIDATION_CLASS: return getKey_validation_class(); @@ -1454,8 +1409,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav return isSetMax_compaction_threshold(); case REPLICATE_ON_WRITE: return isSetReplicate_on_write(); - case MERGE_SHARDS_CHANCE: - return isSetMerge_shards_chance(); case KEY_VALIDATION_CLASS: return isSetKey_validation_class(); case KEY_ALIAS: @@ -1619,15 +1572,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav return false; } - boolean this_present_merge_shards_chance = true && this.isSetMerge_shards_chance(); - boolean that_present_merge_shards_chance = true && that.isSetMerge_shards_chance(); - if (this_present_merge_shards_chance || that_present_merge_shards_chance) { - if (!(this_present_merge_shards_chance && that_present_merge_shards_chance)) - return false; - if (this.merge_shards_chance != that.merge_shards_chance) - return false; - } - boolean this_present_key_validation_class = true && this.isSetKey_validation_class(); boolean that_present_key_validation_class = true && that.isSetKey_validation_class(); if (this_present_key_validation_class || that_present_key_validation_class) { @@ -1795,11 +1739,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav if (present_replicate_on_write) builder.append(replicate_on_write); - boolean present_merge_shards_chance = true && (isSetMerge_shards_chance()); - builder.append(present_merge_shards_chance); - if (present_merge_shards_chance) - builder.append(merge_shards_chance); - boolean present_key_validation_class = true && (isSetKey_validation_class()); builder.append(present_key_validation_class); if (present_key_validation_class) @@ -2001,16 +1940,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMerge_shards_chance()).compareTo(typedOther.isSetMerge_shards_chance()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetMerge_shards_chance()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.merge_shards_chance, typedOther.merge_shards_chance); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetKey_validation_class()).compareTo(typedOther.isSetKey_validation_class()); if (lastComparison != 0) { return lastComparison; @@ -2243,14 +2172,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; - case 25: // MERGE_SHARDS_CHANCE - if (field.type == org.apache.thrift.protocol.TType.DOUBLE) { - this.merge_shards_chance = iprot.readDouble(); - setMerge_shards_chanceIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - break; case 26: // KEY_VALIDATION_CLASS if (field.type == org.apache.thrift.protocol.TType.STRING) { this.key_validation_class = iprot.readString(); @@ -2461,11 +2382,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav oprot.writeBool(this.replicate_on_write); oprot.writeFieldEnd(); } - if (isSetMerge_shards_chance()) { - oprot.writeFieldBegin(MERGE_SHARDS_CHANCE_FIELD_DESC); - oprot.writeDouble(this.merge_shards_chance); - oprot.writeFieldEnd(); - } if (this.key_validation_class != null) { if (isSetKey_validation_class()) { oprot.writeFieldBegin(KEY_VALIDATION_CLASS_FIELD_DESC); @@ -2675,12 +2591,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav sb.append(this.replicate_on_write); first = false; } - if (isSetMerge_shards_chance()) { - if (!first) sb.append(", "); - sb.append("merge_shards_chance:"); - sb.append(this.merge_shards_chance); - first = false; - } if (isSetKey_validation_class()) { if (!first) sb.append(", "); sb.append("key_validation_class:"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030f78a/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 96ed181..1c2d1ec 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -68,7 +68,6 @@ public final class CFMetaData public final static int DEFAULT_GC_GRACE_SECONDS = 864000; public final static int DEFAULT_MIN_COMPACTION_THRESHOLD = 4; public final static int DEFAULT_MAX_COMPACTION_THRESHOLD = 32; - public final static double DEFAULT_MERGE_SHARDS_CHANCE = 0.1; public final static String DEFAULT_COMPACTION_STRATEGY_CLASS = "SizeTieredCompactionStrategy"; public final static ByteBuffer DEFAULT_KEY_NAME = ByteBufferUtil.bytes("KEY"); @@ -156,9 +155,6 @@ public final class CFMetaData private AbstractType<?> keyValidator; // default BytesType (no-op), use comparator types private int minCompactionThreshold; // default 4 private int maxCompactionThreshold; // default 32 - // mergeShardsChance is now obsolete, but left here so as to not break - // thrift compatibility - private double mergeShardsChance; // default 0.1, chance [0.0, 1.0] of merging old shards during replication private ByteBuffer keyAlias; // default NULL private List<ByteBuffer> columnAliases = new ArrayList<ByteBuffer>(); private ByteBuffer valueAlias; // default NULL @@ -185,7 +181,6 @@ public final class CFMetaData public CFMetaData keyValidator(AbstractType<?> prop) {keyValidator = prop; updateCfDef(); return this;} public CFMetaData minCompactionThreshold(int prop) {minCompactionThreshold = prop; return this;} public CFMetaData maxCompactionThreshold(int prop) {maxCompactionThreshold = prop; return this;} - public CFMetaData mergeShardsChance(double prop) {mergeShardsChance = prop; return this;} public CFMetaData keyAlias(ByteBuffer prop) {keyAlias = prop; updateCfDef(); return this;} public CFMetaData columnAliases(List<ByteBuffer> prop) {columnAliases = prop; updateCfDef(); return this;} public CFMetaData valueAlias(ByteBuffer prop) {valueAlias = prop; updateCfDef(); return this;} @@ -237,7 +232,6 @@ public final class CFMetaData gcGraceSeconds = DEFAULT_GC_GRACE_SECONDS; minCompactionThreshold = DEFAULT_MIN_COMPACTION_THRESHOLD; maxCompactionThreshold = DEFAULT_MAX_COMPACTION_THRESHOLD; - mergeShardsChance = DEFAULT_MERGE_SHARDS_CHANCE; // Defaults strange or simple enough to not need a DEFAULT_T for defaultValidator = BytesType.instance; @@ -269,8 +263,7 @@ public final class CFMetaData return newCFMD.comment(comment) .readRepairChance(0) .dclocalReadRepairChance(0) - .gcGraceSeconds(0) - .mergeShardsChance(0.0); + .gcGraceSeconds(0); } public static CFMetaData newIndexMetadata(CFMetaData parent, ColumnDefinition info, AbstractType<?> columnComparator) @@ -379,7 +372,6 @@ public final class CFMetaData // Isn't AVRO supposed to handle stuff like this? if (cf.min_compaction_threshold != null) { newCFMD.minCompactionThreshold(cf.min_compaction_threshold); } if (cf.max_compaction_threshold != null) { newCFMD.maxCompactionThreshold(cf.max_compaction_threshold); } - if (cf.merge_shards_chance != null) { newCFMD.mergeShardsChance(cf.merge_shards_chance); } if (cf.key_alias != null) { newCFMD.keyAlias(cf.key_alias); } if (cf.column_aliases != null) { newCFMD.columnAliases(fixAvroRetardation(cf.column_aliases)); } if (cf.value_alias != null) { newCFMD.valueAlias(cf.value_alias); } @@ -461,11 +453,6 @@ public final class CFMetaData return dcLocalReadRepairChance; } - public double getMergeShardsChance() - { - return mergeShardsChance; - } - public boolean getReplicateOnWrite() { return replicateOnWrite; @@ -570,7 +557,6 @@ public final class CFMetaData .append(maxCompactionThreshold, rhs.maxCompactionThreshold) .append(cfId.intValue(), rhs.cfId.intValue()) .append(column_metadata, rhs.column_metadata) - .append(mergeShardsChance, rhs.mergeShardsChance) .append(keyAlias, rhs.keyAlias) .append(columnAliases, rhs.columnAliases) .append(valueAlias, rhs.valueAlias) @@ -601,7 +587,6 @@ public final class CFMetaData .append(maxCompactionThreshold) .append(cfId) .append(column_metadata) - .append(mergeShardsChance) .append(keyAlias) .append(columnAliases) .append(valueAlias) @@ -636,8 +621,6 @@ public final class CFMetaData cf_def.setMin_compaction_threshold(CFMetaData.DEFAULT_MIN_COMPACTION_THRESHOLD); if (!cf_def.isSetMax_compaction_threshold()) cf_def.setMax_compaction_threshold(CFMetaData.DEFAULT_MAX_COMPACTION_THRESHOLD); - if (!cf_def.isSetMerge_shards_chance()) - cf_def.setMerge_shards_chance(CFMetaData.DEFAULT_MERGE_SHARDS_CHANCE); if (null == cf_def.compaction_strategy) cf_def.compaction_strategy = DEFAULT_COMPACTION_STRATEGY_CLASS; if (null == cf_def.compaction_strategy_options) @@ -673,7 +656,6 @@ public final class CFMetaData if (cf_def.isSetGc_grace_seconds()) { newCFMD.gcGraceSeconds(cf_def.gc_grace_seconds); } if (cf_def.isSetMin_compaction_threshold()) { newCFMD.minCompactionThreshold(cf_def.min_compaction_threshold); } if (cf_def.isSetMax_compaction_threshold()) { newCFMD.maxCompactionThreshold(cf_def.max_compaction_threshold); } - if (cf_def.isSetMerge_shards_chance()) { newCFMD.mergeShardsChance(cf_def.merge_shards_chance); } if (cf_def.isSetKey_alias()) { newCFMD.keyAlias(cf_def.key_alias); } if (cf_def.isSetColumn_aliases() && cf_def.column_aliases != null) { newCFMD.columnAliases(cf_def.column_aliases); } if (cf_def.isSetValue_alias()) { newCFMD.valueAlias(cf_def.value_alias); } @@ -776,7 +758,6 @@ public final class CFMetaData keyValidator = TypeParser.parse(cf_def.key_validation_class); minCompactionThreshold = cf_def.min_compaction_threshold; maxCompactionThreshold = cf_def.max_compaction_threshold; - mergeShardsChance = cf_def.merge_shards_chance; keyAlias = cf_def.key_alias; columnAliases = cf_def.column_aliases; valueAlias = cf_def.value_alias; @@ -907,7 +888,6 @@ public final class CFMetaData def.setKey_validation_class(keyValidator.toString()); def.setMin_compaction_threshold(minCompactionThreshold); def.setMax_compaction_threshold(maxCompactionThreshold); - def.setMerge_shards_chance(mergeShardsChance); def.setKey_alias(keyAlias); List<org.apache.cassandra.thrift.ColumnDef> column_meta = new ArrayList<org.apache.cassandra.thrift.ColumnDef>(column_metadata.size()); for (ColumnDefinition cd : column_metadata.values()) @@ -1258,7 +1238,6 @@ public final class CFMetaData .append("keyValidator", keyValidator) .append("minCompactionThreshold", minCompactionThreshold) .append("maxCompactionThreshold", maxCompactionThreshold) - .append("mergeShardsChance", mergeShardsChance) .append("keyAlias", keyAlias) .append("columnAliases", columnAliases) .append("valueAlias", keyAlias) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030f78a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java index 062cd90..328a70b 100644 --- a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java +++ b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java @@ -183,7 +183,6 @@ public class CreateColumnFamilyStatement .defaultValidator(cfProps.getValidator()) .minCompactionThreshold(getPropertyInt(CFPropDefs.KW_MINCOMPACTIONTHRESHOLD, CFMetaData.DEFAULT_MIN_COMPACTION_THRESHOLD)) .maxCompactionThreshold(getPropertyInt(CFPropDefs.KW_MAXCOMPACTIONTHRESHOLD, CFMetaData.DEFAULT_MAX_COMPACTION_THRESHOLD)) - .mergeShardsChance(0.0) .columnMetadata(getColumns(comparator)) .keyValidator(TypeParser.parse(CFPropDefs.comparators.get(getKeyType()))) .keyAlias(keyAlias) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030f78a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java index 767437e..873c134 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java @@ -113,7 +113,6 @@ public class CreateColumnFamilyStatement extends SchemaAlteringStatement .defaultValidator(defaultValidator) .minCompactionThreshold(properties.getInt(CFPropDefs.KW_MINCOMPACTIONTHRESHOLD, CFMetaData.DEFAULT_MIN_COMPACTION_THRESHOLD)) .maxCompactionThreshold(properties.getInt(CFPropDefs.KW_MAXCOMPACTIONTHRESHOLD, CFMetaData.DEFAULT_MAX_COMPACTION_THRESHOLD)) - .mergeShardsChance(0.0) .columnMetadata(getColumns()) .keyValidator(keyValidator) .keyAlias(keyAlias) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030f78a/test/unit/org/apache/cassandra/SchemaLoader.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index 70e95c4..697d466 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -150,15 +150,13 @@ public class SchemaLoader st, bytes, null) - .defaultValidator(CounterColumnType.instance) - .mergeShardsChance(1.0), + .defaultValidator(CounterColumnType.instance), new CFMetaData(ks1, "SuperCounter1", su, bytes, bytes) - .defaultValidator(CounterColumnType.instance) - .mergeShardsChance(1.0), + .defaultValidator(CounterColumnType.instance), superCFMD(ks1, "SuperDirectGC", BytesType.instance).gcGraceSeconds(0), jdbcCFMD(ks1, "JdbcInteger", IntegerType.instance).columnMetadata(integerColumn), jdbcCFMD(ks1, "JdbcUtf8", UTF8Type.instance).columnMetadata(utf8Column), http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030f78a/test/unit/org/apache/cassandra/db/DefsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/DefsTest.java b/test/unit/org/apache/cassandra/db/DefsTest.java index 01ab532..bd3dfa1 100644 --- a/test/unit/org/apache/cassandra/db/DefsTest.java +++ b/test/unit/org/apache/cassandra/db/DefsTest.java @@ -84,7 +84,6 @@ public class DefsTest extends CleanupHelper .defaultValidator(null) .minCompactionThreshold(500) .maxCompactionThreshold(500) - .mergeShardsChance(0.0) .columnMetadata(indexes); // we'll be adding this one later. make sure it's not already there. @@ -601,8 +600,7 @@ public class DefsTest extends CleanupHelper { CFMetaData newCFMD = new CFMetaData(ks, cf, ColumnFamilyType.Standard, UTF8Type.instance, null); newCFMD.comment(comment) - .readRepairChance(0.0) - .mergeShardsChance(0.0); + .readRepairChance(0.0); return newCFMD; }
