Author: jbellis
Date: Mon Sep 13 19:22:43 2010
New Revision: 996651
URL: http://svn.apache.org/viewvc?rev=996651&view=rev
Log:
remove defaults from CfDef subcomparator_type, reconciler, and comment (while
keeping them optional).
patch by Jon Hermes; reviewed by Jeremy Hanna for CASSANDRA-1480
Modified:
cassandra/trunk/interface/cassandra.thrift
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Modified: cassandra/trunk/interface/cassandra.thrift
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.thrift?rev=996651&r1=996650&r2=996651&view=diff
==============================================================================
--- cassandra/trunk/interface/cassandra.thrift (original)
+++ cassandra/trunk/interface/cassandra.thrift Mon Sep 13 19:22:43 2010
@@ -46,7 +46,7 @@ namespace rb CassandraThrift
# for every edit that doesn't result in a change to major/minor.
#
# See the Semantic Versioning Specification (SemVer) http://semver.org.
-const string VERSION = "14.0.0"
+const string VERSION = "15.0.0"
#
@@ -344,9 +344,9 @@ struct CfDef {
3: optional string column_type="Standard",
4: optional string clock_type="Timestamp",
5: optional string comparator_type="BytesType",
- 6: optional string subcomparator_type="",
- 7: optional string reconciler="",
- 8: optional string comment="",
+ 6: optional string subcomparator_type,
+ 7: optional string reconciler,
+ 8: optional string comment,
9: optional double row_cache_size=0,
10: optional bool preload_row_cache=0,
11: optional double key_cache_size=200000,
Modified:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java?rev=996651&r1=996650&r2=996651&view=diff
==============================================================================
---
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
(original)
+++
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
Mon Sep 13 19:22:43 2010
@@ -242,12 +242,6 @@ public class CfDef implements TBase<CfDe
this.comparator_type = "BytesType";
- this.subcomparator_type = "";
-
- this.reconciler = "";
-
- this.comment = "";
-
this.row_cache_size = (double)0;
this.preload_row_cache = false;
Modified:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java?rev=996651&r1=996650&r2=996651&view=diff
==============================================================================
---
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
(original)
+++
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
Mon Sep 13 19:22:43 2010
@@ -42,6 +42,6 @@ import org.slf4j.LoggerFactory;
public class Constants {
- public static final String VERSION = "14.0.0";
+ public static final String VERSION = "15.0.0";
}
Modified:
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=996651&r1=996650&r2=996651&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Mon Sep 13 19:22:43 2010
@@ -944,7 +944,7 @@ public class CassandraServer implements
cfType,
clockType,
DatabaseDescriptor.getComparator(cf_def.comparator_type),
- cf_def.subcomparator_type.length() == 0 ? null :
DatabaseDescriptor.getComparator(cf_def.subcomparator_type),
+ cf_def.subcomparator_type == null ? null :
DatabaseDescriptor.getComparator(cf_def.subcomparator_type),
reconciler,
cf_def.comment,
cf_def.row_cache_size,
