You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/04/04 19:06:50 UTC
[6/10] git commit: fix read_repair_chance to really default to 0.1 in
the cli and Thrift clients patch by jbellis;
reviewed by vijay for CASSANDRA-4114
fix read_repair_chance to really default to 0.1 in the cli and Thrift clients
patch by jbellis; reviewed by vijay for CASSANDRA-4114
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b77ef61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b77ef61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b77ef61
Branch: refs/heads/cassandra-1.1
Commit: 2b77ef61cc119fbaf76080f5d6e6083571e7b02c
Parents: f956569
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 4 12:05:48 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 4 12:06:15 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
interface/cassandra.thrift | 4 ++--
.../org/apache/cassandra/thrift/Cassandra.java | 4 ++++
.../org/apache/cassandra/thrift/CfDef.java | 6 ++----
.../org/apache/cassandra/thrift/Constants.java | 2 +-
.../org/apache/cassandra/config/CFMetaData.java | 3 ++-
6 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b77ef61/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4af75a3..9a428a5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.1-dev
+ * fix read_repair_chance to really default to 0.1 in the cli (CASSANDRA-4114)
* Adds caching and bloomFilterFpChange to CQL options (CASSANDRA-4042)
* Adds posibility to autoconfigure size of the KeyCache (CASSANDRA-4087)
* fix KEYS index from skipping results (CASSANDRA-3996)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b77ef61/interface/cassandra.thrift
----------------------------------------------------------------------
diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
index ecb04d6..8edf843 100644
--- a/interface/cassandra.thrift
+++ b/interface/cassandra.thrift
@@ -55,7 +55,7 @@ namespace rb CassandraThrift
# An effort should be made not to break forward-client-compatibility either
# (e.g. one should avoid removing obsolete fields from the IDL), but no
# guarantees in this respect are made by the Cassandra project.
-const string VERSION = "19.29.0"
+const string VERSION = "19.30.0"
#
@@ -408,7 +408,7 @@ struct CfDef {
5: optional string comparator_type="BytesType",
6: optional string subcomparator_type,
8: optional string comment,
- 12: optional double read_repair_chance=1.0,
+ 12: optional double read_repair_chance,
13: optional list<ColumnDef> column_metadata,
14: optional i32 gc_grace_seconds,
15: optional string default_validation_class,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b77ef61/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 5b79e18..58f5ac5 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
@@ -17733,6 +17733,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);
@@ -34146,6 +34148,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/2b77ef61/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 1028693..8b4f749 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
@@ -438,8 +438,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
this.comparator_type = "BytesType";
- this.read_repair_chance = 1;
-
this.caching = "keys_only";
this.dclocal_read_repair_chance = 0;
@@ -581,8 +579,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
this.subcomparator_type = null;
this.comment = null;
- this.read_repair_chance = 1;
-
+ setRead_repair_chanceIsSet(false);
+ this.read_repair_chance = 0.0;
this.column_metadata = null;
setGc_grace_secondsIsSet(false);
this.gc_grace_seconds = 0;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b77ef61/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
index ce2f9cd..270976b 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
@@ -44,6 +44,6 @@ import org.slf4j.LoggerFactory;
public class Constants {
- public static final String VERSION = "19.29.0";
+ public static final String VERSION = "19.30.0";
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b77ef61/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 b8b97bb..403ed2b 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -614,13 +614,14 @@ public final class CFMetaData
newCFMD.bloomFilterFpChance(cf_def.bloom_filter_fp_chance);
if (cf_def.isSetCaching())
newCFMD.caching(Caching.fromString(cf_def.caching));
+ if (cf_def.isSetRead_repair_chance())
+ newCFMD.readRepairChance(cf_def.read_repair_chance);
if (cf_def.isSetDclocal_read_repair_chance())
newCFMD.dcLocalReadRepairChance(cf_def.dclocal_read_repair_chance);
CompressionParameters cp = CompressionParameters.create(cf_def.compression_options);
return newCFMD.comment(cf_def.comment)
- .readRepairChance(cf_def.read_repair_chance)
.replicateOnWrite(cf_def.replicate_on_write)
.defaultValidator(TypeParser.parse(cf_def.default_validation_class))
.keyValidator(TypeParser.parse(cf_def.key_validation_class))