cql: relax writetime/ttl selections of collections

writetime() or ttl() selections of non-frozen collections can work, as they are single cells. Relax the check to allow them, and only forbid non-frozen collections. Fixes #3825. Tests: cql_query_test (release). Message-Id: <20181008123920.27575-1-avi@scylladb.com>
scylladb · Oct 8, 2018 · 4b16867 · 4b16867
1 parent 56e36ee
commit 4b16867
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/cql3/selection/selectable.cc b/cql3/selection/selectable.cc
@@ -46,8 +46,8 @@ selectable::writetime_or_ttl::new_selector_factory(database& db, schema_ptr s, s
                               _is_writetime ? "writeTime" : "ttl",
                               def->name()));
     }
-    if (def->type->is_collection()) {
-        throw exceptions::invalid_request_exception(sprint("Cannot use selection function %s on collections",
+    if (def->type->is_multi_cell()) {
+        throw exceptions::invalid_request_exception(sprint("Cannot use selection function %s on non-frozen collections",
                                                         _is_writetime ? "writeTime" : "ttl"));
     }
 

diff --git a/tests/cql_query_test.cc b/tests/cql_query_test.cc
@@ -1119,7 +1119,7 @@ SEASTAR_TEST_CASE(test_functions) {
 static const api::timestamp_type the_timestamp = 123456789;
 SEASTAR_TEST_CASE(test_writetime_and_ttl) {
     return do_with_cql_env([] (cql_test_env& e) {
-        return e.execute_cql("create table cf (p1 varchar primary key, i int);").discard_result().then([&e] {
+        return e.execute_cql("create table cf (p1 varchar primary key, i int, fc frozen<set<int>>, c set<int>);").discard_result().then([&e] {
             auto q = sprint("insert into cf (p1, i) values ('key1', 1) using timestamp %d;", the_timestamp);
             return e.execute_cql(q).discard_result();
         }).then([&e] {
@@ -1129,6 +1129,19 @@ SEASTAR_TEST_CASE(test_writetime_and_ttl) {
                 .with_rows({{
                      {long_type->decompose(int64_t(the_timestamp))},
                  }});
+        }).then([&e] {
+            return async([&e] {
+                auto ts1 = the_timestamp + 1;
+                e.execute_cql(sprint("UPDATE cf USING TIMESTAMP %d SET fc = {1}, c = {2} WHERE p1 = 'key1'", ts1)).get();
+                auto msg1 = e.execute_cql("SELECT writetime(fc) FROM cf").get0();
+                assert_that(msg1).is_rows()
+                    .with_rows({{
+                         {long_type->decompose(int64_t(ts1))},
+                     }});
+                auto msg2f = futurize_apply([&] { return e.execute_cql("SELECT writetime(c) FROM cf"); });
+                msg2f.wait();
+                assert_that_failed(msg2f);
+            });
         });
     });
 }