Author: jbellis
Date: Tue Apr 12 21:08:08 2011
New Revision: 1091572
URL: http://svn.apache.org/viewvc?rev=1091572&view=rev
Log:
merge from 0.8
Modified:
cassandra/trunk/ (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/contrib/ (props changed)
cassandra/trunk/drivers/py/cql/cassandra/constants.py
cassandra/trunk/drivers/py/cql/cassandra/ttypes.py
cassandra/trunk/drivers/txpy/txcql/cassandra/Cassandra.py
cassandra/trunk/drivers/txpy/txcql/cassandra/constants.py
cassandra/trunk/drivers/txpy/txcql/cassandra/ttypes.py
cassandra/trunk/interface/cassandra.thrift
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
(props changed)
cassandra/trunk/src/avro/internode.genavro
cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Propchange: cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 21:08:08 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1090647,1091503,1091542
+/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542
/cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1091148,1091508,1091544
+/cassandra/branches/cassandra-0.8:1090935-1091111,1091113,1091148,1091508,1091544
/cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3:774578-796573
/incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1091572&r1=1091571&r2=1091572&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Tue Apr 12 21:08:08 2011
@@ -6,11 +6,10 @@
2124, 2302, 2277)
* avoid double RowMutation serialization on write path (CASSANDRA-1800)
* make NetworkTopologyStrategy the default (CASSANDRA-1960)
- * configurable internode encryption (CASSANDRA-1567)
+ * configurable internode encryption (CASSANDRA-1567, 2152)
* human readable column names in sstable2json output (CASSANDRA-1933)
* change default JMX port to 7199 (CASSANDRA-2027)
* backwards compatible internal messaging (CASSANDRA-1015)
- * check for null encryption in MessagingService (CASSANDRA-2152)
* atomic switch of memtables and sstables (CASSANDRA-2284)
* add pluggable SeedProvider (CASSANDRA-1669)
* Fix clustertool to not throw exception when calling get_endpoints
(CASSANDRA-2437)
@@ -21,6 +20,8 @@
* give snapshots the same name on each node (CASSANDRA-1791)
* multithreaded compaction (CASSANDRA-2191)
* compaction throttling (CASSANDRA-2156)
+ * add key type information and alias (CASSANDRA-2311, 2396)
+
0.7.5
* Avoid seeking when sstable2json exports the entire file (CASSANDRA-2318)
@@ -46,7 +47,9 @@
index (CASSANDRA-2376)
* fix race condition that could leave orphaned data files when
dropping CF or KS (CASSANDRA-2381)
+ * convert mmap assertion to if/throw so scrub can catch it (CASSANDRA-2417)
* Try harder to close files after compaction (CASSANDRA-2431)
+ * re-set bootstrapped flag after move finishes (CASSANDRA-2435)
0.7.4
Propchange: cassandra/trunk/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 21:08:08 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1090647,1091503,1091542
+/cassandra/branches/cassandra-0.7/contrib:1026516-1091087,1091503,1091542
/cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1091148,1091508,1091544
+/cassandra/branches/cassandra-0.8/contrib:1090935-1091111,1091113,1091148,1091508,1091544
/cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573
/incubator/cassandra/branches/cassandra-0.4/contrib:810145-810987,810994-834239,834349-834350
Modified: cassandra/trunk/drivers/py/cql/cassandra/constants.py
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/py/cql/cassandra/constants.py?rev=1091572&r1=1091571&r2=1091572&view=diff
==============================================================================
--- cassandra/trunk/drivers/py/cql/cassandra/constants.py (original)
+++ cassandra/trunk/drivers/py/cql/cassandra/constants.py Tue Apr 12 21:08:08
2011
@@ -7,4 +7,4 @@
from thrift.Thrift import *
from ttypes import *
-VERSION = "20.0.0"
+VERSION = "20.1.0"
Modified: cassandra/trunk/drivers/py/cql/cassandra/ttypes.py
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/py/cql/cassandra/ttypes.py?rev=1091572&r1=1091571&r2=1091572&view=diff
==============================================================================
--- cassandra/trunk/drivers/py/cql/cassandra/ttypes.py (original)
+++ cassandra/trunk/drivers/py/cql/cassandra/ttypes.py Tue Apr 12 21:08:08 2011
@@ -2324,6 +2324,7 @@ class CfDef:
- merge_shards_chance
- key_validation_class
- row_cache_provider
+ - key_alias
"""
thrift_spec = (
@@ -2355,9 +2356,10 @@ class CfDef:
(25, TType.DOUBLE, 'merge_shards_chance', None, None, ), # 25
(26, TType.STRING, 'key_validation_class', None, None, ), # 26
(27, TType.STRING, 'row_cache_provider', None,
"org.apache.cassandra.cache.ConcurrentLinkedHashCacheProvider", ), # 27
+ (28, TType.STRING, 'key_alias', None, None, ), # 28
)
- def __init__(self, keyspace=None, name=None, column_type=thrift_spec[3][4],
comparator_type=thrift_spec[5][4], subcomparator_type=None, comment=None,
row_cache_size=thrift_spec[9][4], key_cache_size=thrift_spec[11][4],
read_repair_chance=thrift_spec[12][4], column_metadata=None,
gc_grace_seconds=None, default_validation_class=None, id=None,
min_compaction_threshold=None, max_compaction_threshold=None,
row_cache_save_period_in_seconds=None, key_cache_save_period_in_seconds=None,
memtable_flush_after_mins=None, memtable_throughput_in_mb=None,
memtable_operations_in_millions=None, replicate_on_write=None,
merge_shards_chance=None, key_validation_class=None,
row_cache_provider=thrift_spec[27][4],):
+ def __init__(self, keyspace=None, name=None, column_type=thrift_spec[3][4],
comparator_type=thrift_spec[5][4], subcomparator_type=None, comment=None,
row_cache_size=thrift_spec[9][4], key_cache_size=thrift_spec[11][4],
read_repair_chance=thrift_spec[12][4], column_metadata=None,
gc_grace_seconds=None, default_validation_class=None, id=None,
min_compaction_threshold=None, max_compaction_threshold=None,
row_cache_save_period_in_seconds=None, key_cache_save_period_in_seconds=None,
memtable_flush_after_mins=None, memtable_throughput_in_mb=None,
memtable_operations_in_millions=None, replicate_on_write=None,
merge_shards_chance=None, key_validation_class=None,
row_cache_provider=thrift_spec[27][4], key_alias=None,):
self.keyspace = keyspace
self.name = name
self.column_type = column_type
@@ -2382,6 +2384,7 @@ class CfDef:
self.merge_shards_chance = merge_shards_chance
self.key_validation_class = key_validation_class
self.row_cache_provider = row_cache_provider
+ self.key_alias = key_alias
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and
isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is
not None and fastbinary is not None:
@@ -2518,6 +2521,11 @@ class CfDef:
self.row_cache_provider = iprot.readString();
else:
iprot.skip(ftype)
+ elif fid == 28:
+ if ftype == TType.STRING:
+ self.key_alias = iprot.readString();
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -2627,6 +2635,10 @@ class CfDef:
oprot.writeFieldBegin('row_cache_provider', TType.STRING, 27)
oprot.writeString(self.row_cache_provider)
oprot.writeFieldEnd()
+ if self.key_alias != None:
+ oprot.writeFieldBegin('key_alias', TType.STRING, 28)
+ oprot.writeString(self.key_alias)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
