query: Split send_timestamp_and_expiry into two separate options

It's cleaner that way. They don't need to come together.
nawenqiang · Feb 15, 2016 · 916a91c · 916a91c
1 parent 100b540
commit 916a91c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/cql3/selection/selection.cc b/cql3/selection/selection.cc
@@ -63,7 +63,8 @@ selection::selection(schema_ptr schema,
 query::partition_slice::option_set selection::get_query_options() {
     query::partition_slice::option_set opts;
 
-    opts.set_if<query::partition_slice::option::send_timestamp_and_expiry>(_collect_timestamps || _collect_TTLs);
+    opts.set_if<query::partition_slice::option::send_timestamp>(_collect_timestamps);
+    opts.set_if<query::partition_slice::option::send_expiry>(_collect_TTLs);
 
     opts.set_if<query::partition_slice::option::send_partition_key>(
         std::any_of(_columns.begin(), _columns.end(),

diff --git a/partition_slice_builder.cc b/partition_slice_builder.cc
@@ -30,7 +30,8 @@ partition_slice_builder::partition_slice_builder(const schema& schema)
 {
     _options.set<query::partition_slice::option::send_partition_key>();
     _options.set<query::partition_slice::option::send_clustering_key>();
-    _options.set<query::partition_slice::option::send_timestamp_and_expiry>();
+    _options.set<query::partition_slice::option::send_timestamp>();
+    _options.set<query::partition_slice::option::send_expiry>();
 }
 
 query::partition_slice

diff --git a/query-request.hh b/query-request.hh
@@ -99,11 +99,12 @@ private:
 // Schema-dependent.
 class partition_slice {
 public:
-    enum class option { send_clustering_key, send_partition_key, send_timestamp_and_expiry, reversed, distinct };
+    enum class option { send_clustering_key, send_partition_key, send_timestamp, send_expiry, reversed, distinct };
     using option_set = enum_set<super_enum<option,
         option::send_clustering_key,
         option::send_partition_key,
-        option::send_timestamp_and_expiry,
+        option::send_timestamp,
+        option::send_expiry,
         option::reversed,
         option::distinct>>;
     clustering_row_ranges _row_ranges;

diff --git a/query-result-reader.hh b/query-result-reader.hh
@@ -73,8 +73,10 @@ public:
             }
             api::timestamp_type timestamp = api::missing_timestamp;
             expiry_opt expiry_;
-            if (_slice.options.contains<partition_slice::option::send_timestamp_and_expiry>()) {
-                timestamp = _in.read <api::timestamp_type> ();
+            if (_slice.options.contains<partition_slice::option::send_timestamp>()) {
+                timestamp = _in.read<api::timestamp_type>();
+            }
+            if (_slice.options.contains<partition_slice::option::send_expiry>()) {
                 auto expiry_rep = _in.read<gc_clock::rep>();
                 if (expiry_rep != std::numeric_limits<gc_clock::rep>::max()) {
                     expiry_ = gc_clock::time_point(gc_clock::duration(expiry_rep));

diff --git a/query-result-writer.hh b/query-result-writer.hh
@@ -55,8 +55,10 @@ public:
         // FIXME: store this in a bitmap
         _w.write<int8_t>(true);
         assert(c.is_live());
-        if (_slice.options.contains<partition_slice::option::send_timestamp_and_expiry>()) {
+        if (_slice.options.contains<partition_slice::option::send_timestamp>()) {
             _w.write(c.timestamp());
+        }
+        if (_slice.options.contains<partition_slice::option::send_expiry>()) {
             if (c.is_live_and_has_ttl()) {
                 _w.write<gc_clock::rep>(c.expiry().time_since_epoch().count());
             } else {

diff --git a/query-result.hh b/query-result.hh
@@ -101,7 +101,7 @@ public:
 // <static-row>      ::= <row>
 // <row>             ::= <row-length> <cell>+
 // <cell>            ::= <atomic-cell> | <collection-cell>
-// <atomic-cell>     ::= <present-byte> [ <timestamp> <expiry> ] <value>
+// <atomic-cell>     ::= <present-byte> [ <timestamp> ] [ <expiry> ] <value>
 // <collection-cell> ::= <blob>
 //
 // <value>           ::= <blob>