From 18e7ea58d45e368395cd27c1437ed2be62ffc244 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@cloudius-systems.com>
Date: Sun, 29 Mar 2015 14:57:14 +0300
Subject: [PATCH] db: add collection-typed fields to system keyspace

---
 db/system_keyspace.cc | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/db/system_keyspace.cc b/db/system_keyspace.cc
index be5236efc3..cc3fe4d009 100644
--- a/db/system_keyspace.cc
+++ b/db/system_keyspace.cc
@@ -145,9 +145,8 @@ schema_ptr built_indexes() {
                 {"release_version", utf8_type},
                 {"schema_version", uuid_type},
                 {"thrift_version", utf8_type},
-                // FIXME: Cassandra also had these columns:
-                //    "tokens set<varchar>,"
-                //    "truncated_at map<uuid, blob>,"
+                {"tokens", set_type_impl::get_instance(utf8_type, false)},
+                {"truncated_at", map_type_impl::get_instance(uuid_type, bytes_type, false)},
         },
         // static columns
         {},
@@ -174,8 +173,7 @@ schema_ptr built_indexes() {
                 {"release_version", utf8_type},
                 {"rpc_address", inet_addr_type},
                 {"schema_version", utf8_type},
-                // FIXME: Cassandra also had these columns:
-                //    "tokens set<varchar>,"
+                {"tokens", set_type_impl::get_instance(utf8_type, false)},
         },
         // static columns
         {},
@@ -194,9 +192,9 @@ schema_ptr built_indexes() {
         // clustering key
         {},
         // regular columns
-        // FIXME: Cassandra also had this column:
-        // hints_dropped map<uuid, int>,
-        {},
+        {
+            {"hints_dropped", map_type_impl::get_instance(uuid_type, int32_type, false)},
+        },
         // static columns
         {},
         // regular column name type
@@ -234,8 +232,7 @@ schema_ptr built_indexes() {
         // regular columns
         {
             {"columnfamily_name", utf8_type},
-            // FIXME: Cassandra also had an additional column here:
-            // "inputs set<int>,"
+            {"inputs", set_type_impl::get_instance(int32_type, false)},
             {"keyspace_name", utf8_type},
         },
         // static columns
@@ -261,8 +258,7 @@ schema_ptr built_indexes() {
             {"columnfamily_name", utf8_type},
             {"compacted_at", timestamp_type},
             {"keyspace_name", utf8_type},
-            // FIXME: Cassandra also had an additional column here:
-            // rows_merged map<int, bigint>
+            {"rows_merged", map_type_impl::get_instance(int32_type, long_type, false)},
         },
         // static columns
         {},
@@ -289,8 +285,8 @@ schema_ptr built_indexes() {
         // regular columns
         {
             // FIXME: Cassandra also had two additional columns here:
-            // "rate_120m double,"
-            // "rate_15m double,"
+            {"rate_120m", double_type},
+            {"rate_15m", double_type},
         },
         // static columns
         {},