svn commit: r949301 - /cassandra/trunk/interface/cassandra.genavro

[eevans]

Author: eevans
Date: Fri May 28 21:27:51 2010
New Revision: 949301

URL: http://svn.apache.org/viewvc?rev=949301&view=rev
Log:
CASSANDRA-798 match genavro to json schema

Patch by eevans

Modified:
    cassandra/trunk/interface/cassandra.genavro

Modified: cassandra/trunk/interface/cassandra.genavro
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.genavro?rev=949301&r1=949300&r2=949301&view=diff
==============================================================================
--- cassandra/trunk/interface/cassandra.genavro (original)
+++ cassandra/trunk/interface/cassandra.genavro Fri May 28 21:27:51 2010
@@ -19,10 +19,14 @@ protocol Cassandra {
         union { bytes, null } super_column;
     }
 
+    record Clock {
+        long timestamp;
+    }
+
     record Column {
         bytes name;
         bytes value;
-        long timestamp;
+        Clock clock;
         union { int, null } ttl;
     }
 
@@ -50,7 +54,7 @@ protocol Cassandra {
     }
 
     record Deletion {
-        long timestamp;
+        Clock clock;
         union { bytes, null } super_column;
         union { SlicePredicate, null } predicate;
     }
@@ -64,6 +68,7 @@ protocol Cassandra {
         string keyspace;
         string name;
         union { string, null } column_type;
+        union { string, null } clock_type;
         union { string, null } comparator_type;
         union { string, null } subcomparator_type;
         union { string, null } comment;