Author: eevans
Date: Tue May 11 17:26:39 2010
New Revision: 943195
URL: http://svn.apache.org/viewvc?rev=943195&view=rev
Log:
actually allow Column.ttl to be optional
Patch by eevans
Modified:
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
cassandra/trunk/test/system/test_avro_server.py
Modified:
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=943195&r1=943194&r2=943195&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Tue
May 11 17:26:39 2010
@@ -257,7 +257,7 @@ public class CassandraServer implements
column.name.array()),
column.value.array(),
column.timestamp,
- column.ttl);
+ column.ttl == null ? 0 : column.ttl);
}
catch (MarshalException e)
{
Modified: cassandra/trunk/test/system/test_avro_server.py
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_avro_server.py?rev=943195&r1=943194&r2=943195&view=diff
==============================================================================
--- cassandra/trunk/test/system/test_avro_server.py (original)
+++ cassandra/trunk/test/system/test_avro_server.py Tue May 11 17:26:39 2010
@@ -47,7 +47,6 @@ class TestRpcOperations(AvroTester):
params['column']['name'] = 'c1'
params['column']['value'] = 'v1'
params['column']['timestamp'] = 0
- params['column']['ttl'] = 0
params['consistency_level'] = 'ONE'
self.client.request('insert', params)
@@ -76,7 +75,6 @@ class TestRpcOperations(AvroTester):
params['column']['name'] = i64(1)
params['column']['value'] = 'v1'
params['column']['timestamp'] = 0
- params['column']['ttl'] = 0
params['consistency_level'] = 'ONE'
self.client.request('insert', params)
