sstable: fix use-after-free of temporary ioclass copy

Commit 6a3872b355 fixed some use-after-free
bugs but introduced a new one because of a typo:

Instead of capturing a reference to the long-living io-class object, as
all the code does, one place in the code accidentally captured a *copy*
of this object. This copy had a very temporary life, and when a reference
to that *copy* was passed to sstable reading code which assumed that it
lives at least as long as the read call, a use-after-free resulted.

Fixes #1072

Signed-off-by: Nadav Har'El <nyh@scylladb.com>
Message-Id: <1458595629-9314-1-git-send-email-nyh@scylladb.com>
(cherry picked from commit 2eb0627665)

.github/ISSUE_TEMPLATE.md

@@ -1,9 +0,0 @@
-## Installation details
-Scylla version (or git commit hash):
-Cluster size:
-OS (RHEL/CentOS/Ubuntu/AWS AMI):
-
-## Hardware details (for performance issues)
-Platform (physical/VM/cloud instance type/docker):
-Hardware: sockets= cores= hyperthreading= memory=
-Disks: (SSD/HDD, count)

.gitignore

@@ -8,4 +8,3 @@ cscope.*
 dist/ami/files/*.rpm
 dist/ami/variables.json
 dist/ami/scylla_deploy.sh
-*.pyc

SCYLLA-VERSION-GEN

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=1.1.4
+VERSION=0.18.2
 
 if test -f version
 then

api/api-doc/storage_service.json

@@ -836,22 +836,6 @@
                      "type":"string",
                      "paramType":"query"
                   },
-                  {
-                     "name":"startToken",
-                     "description":"Token on which to begin repair",
-                     "required":false,
-                     "allowMultiple":false,
-                     "type":"string",
-                     "paramType":"query"
-                  },
-                  {
-                     "name":"endToken",
-                     "description":"Token on which to end repair",
-                     "required":false,
-                     "allowMultiple":false,
-                     "type":"string",
-                     "paramType":"query"
-                  },
                   {
                      "name":"columnFamilies",
                      "description":"Which column families to repair in the given keyspace. Multiple columns families can be named separated by commas. If this option is missing, all column families in the keyspace are repaired.",

api/api.cc

@@ -61,10 +61,10 @@ future<> set_server_init(http_context& ctx) {
                 new content_replace("html")));
         r.add(GET, url("/ui").remainder("path"), new httpd::directory_handler(ctx.api_dir,
                 new content_replace("html")));
-        rb->set_api_doc(r);
         rb->register_function(r, "system",
                 "The system related API");
         set_system(ctx, r);
+        rb->set_api_doc(r);
     });
 }
 

api/cache_service.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/cache_service.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/collectd.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/collectd.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/column_family.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*
@@ -40,7 +40,7 @@ const utils::UUID& get_uuid(const sstring& name, const database& db) {
     if (pos == sstring::npos) {
         pos  = name.find(":");
         if (pos == sstring::npos) {
-            throw bad_param_exception("Column family name should be in keyspace:column_family format");
+            throw bad_param_exception("Column family name should be in keyspace::column_family format");
         }
         end = pos + 1;
     } else {
@@ -173,35 +173,6 @@ static ratio_holder mean_row_size(column_family& cf) {
     return res;
 }
 
-template <typename T>
-class sum_ratio {
-    uint64_t _n = 0;
-    T _total = 0;
-public:
-    future<> operator()(T value) {
-        if (value > 0) {
-            _total += value;
-            _n++;
-        }
-        return make_ready_future<>();
-    }
-    // Returns average value of all registered ratios.
-    T get() && {
-        return _n ? (_total / _n) : T(0);
-    }
-};
-
-static double get_compression_ratio(column_family& cf) {
-    sum_ratio<double> result;
-    for (auto i : *cf.get_sstables()) {
-        auto compression_ratio = i.second->get_compression_ratio();
-        if (compression_ratio != sstables::metadata_collector::NO_COMPRESSION_RATIO) {
-            result(compression_ratio);
-        }
-    }
-    return std::move(result).get();
-}
-
 void set_column_family(http_context& ctx, routes& r) {
     cf::get_column_family_name.set(r, [&ctx] (const_req req){
         vector<sstring> res;
@@ -748,15 +719,11 @@ void set_column_family(http_context& ctx, routes& r) {
         return std::vector<sstring>();
     });
 
-    cf::get_compression_ratio.set(r, [&ctx](std::unique_ptr<request> req) {
-        auto uuid = get_uuid(req->param["name"], ctx.db.local());
-
-        return ctx.db.map_reduce(sum_ratio<double>(), [uuid](database& db) {
-            column_family& cf = db.find_column_family(uuid);
-            return make_ready_future<double>(get_compression_ratio(cf));
-        }).then([] (const double& result) {
-            return make_ready_future<json::json_return_type>(result);
-        });
+    cf::get_compression_ratio.set(r, [](const_req) {
+        // FIXME
+        // Currently there are no compression information
+        // so we return 0 as the ratio
+        return 0;
     });
 
     cf::get_read_latency_estimated_histogram.set(r, [&ctx](std::unique_ptr<request> req) {

api/column_family.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/commitlog.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/commitlog.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/compaction_manager.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/compaction_manager.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/endpoint_snitch.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/endpoint_snitch.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/failure_detector.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/failure_detector.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/gossiper.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/gossiper.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/hinted_handoff.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/hinted_handoff.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/lsa.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/lsa.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/messaging_service.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/messaging_service.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/storage_proxy.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*
@@ -214,16 +214,16 @@ void set_storage_proxy(http_context& ctx, routes& r) {
     });
 
     sp::get_schema_versions.set(r, [](std::unique_ptr<request> req)  {
-        return service::get_local_storage_service().describe_schema_versions().then([] (auto result) {
-            std::vector<sp::mapper_list> res;
-            for (auto e : result) {
-                sp::mapper_list entry;
-                entry.key = std::move(e.first);
-                entry.value = std::move(e.second);
-                res.emplace_back(std::move(entry));
-            }
-            return make_ready_future<json::json_return_type>(std::move(res));
-        });
+        //TBD
+        // FIXME
+        // describe_schema_versions is not implemented yet
+        // this is a work around
+        std::vector<sp::mapper_list> res;
+        sp::mapper_list entry;
+        entry.key = boost::lexical_cast<std::string>(utils::fb_utilities::get_broadcast_address());
+        entry.value.push(service::get_local_storage_service().get_schema_version());
+        res.push_back(entry);
+        return make_ready_future<json::json_return_type>(res);
     });
 
     sp::get_cas_read_timeouts.set(r, [](std::unique_ptr<request> req) {

api/storage_proxy.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/storage_service.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*
@@ -280,12 +280,10 @@ void set_storage_service(http_context& ctx, routes& r) {
         return ctx.db.invoke_on_all([keyspace, column_families] (database& db) {
             std::vector<column_family*> column_families_vec;
             auto& cm = db.get_compaction_manager();
-            for (auto cf : column_families) {
-                column_families_vec.push_back(&db.find_column_family(keyspace, cf));
+            for (auto entry : column_families) {
+                column_family* cf = &db.find_column_family(keyspace, entry);
+                cm.submit_cleanup_job(cf);
             }
-            return parallel_for_each(column_families_vec, [&cm] (column_family* cf) {
-                return cm.perform_cleanup(cf);
-            });
         }).then([]{
             return make_ready_future<json::json_return_type>(0);
         });
@@ -328,8 +326,7 @@ void set_storage_service(http_context& ctx, routes& r) {
 
     ss::repair_async.set(r, [&ctx](std::unique_ptr<request> req) {
         static std::vector<sstring> options = {"primaryRange", "parallelism", "incremental",
-                "jobThreads", "ranges", "columnFamilies", "dataCenters", "hosts", "trace",
-                "startToken", "endToken" };
+                "jobThreads", "ranges", "columnFamilies", "dataCenters", "hosts", "trace"};
         std::unordered_map<sstring, sstring> options_map;
         for (auto o : options) {
             auto s = req->get_query_param(o);
@@ -382,21 +379,21 @@ void set_storage_service(http_context& ctx, routes& r) {
 
     ss::remove_node.set(r, [](std::unique_ptr<request> req) {
         auto host_id = req->get_query_param("host_id");
-        return service::get_local_storage_service().removenode(host_id).then([] {
+        return service::get_local_storage_service().remove_node(host_id).then([] {
             return make_ready_future<json::json_return_type>(json_void());
         });
     });
 
     ss::get_removal_status.set(r, [](std::unique_ptr<request> req) {
-        return service::get_local_storage_service().get_removal_status().then([] (auto status) {
-            return make_ready_future<json::json_return_type>(status);
-        });
+        //TBD
+        unimplemented();
+        return make_ready_future<json::json_return_type>("");
     });
 
     ss::force_remove_completion.set(r, [](std::unique_ptr<request> req) {
-        return service::get_local_storage_service().force_remove_completion().then([] {
-            return make_ready_future<json::json_return_type>(json_void());
-        });
+        //TBD
+        unimplemented();
+        return make_ready_future<json::json_return_type>(json_void());
     });
 
     ss::set_logging_level.set(r, [](std::unique_ptr<request> req) {
@@ -588,8 +585,6 @@ void set_storage_service(http_context& ctx, routes& r) {
         auto val_str = req->get_query_param("value");
         bool value = (val_str == "True") || (val_str == "true") || (val_str == "1");
         return service::get_local_storage_service().db().invoke_on_all([value] (database& db) {
-            db.set_enable_incremental_backups(value);
-
             // Change both KS and CF, so they are in sync
             for (auto& pair: db.get_keyspaces()) {
                 auto& ks = pair.second;

api/storage_service.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/stream_manager.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*
@@ -32,16 +32,11 @@ namespace hs = httpd::stream_manager_json;
 
 static void set_summaries(const std::vector<streaming::stream_summary>& from,
         json::json_list<hs::stream_summary>& to) {
-    if (!from.empty()) {
+    for (auto sum : from) {
         hs::stream_summary res;
-        res.cf_id = boost::lexical_cast<std::string>(from.front().cf_id);
-        // For each stream_session, we pretend we are sending/receiving one
-        // file, to make it compatible with nodetool.
-        res.files = 1;
-        // We can not estimate total number of bytes the stream_session will
-        // send or recvieve since we don't know the size of the frozen_mutation
-        // until we read it.
-        res.total_size = 0;
+        res.cf_id = boost::lexical_cast<std::string>(sum.cf_id);
+        res.files = sum.files;
+        res.total_size = sum.total_size;
         to.push(res);
     }
 }
@@ -90,22 +85,18 @@ static hs::stream_state get_state(
 void set_stream_manager(http_context& ctx, routes& r) {
     hs::get_current_streams.set(r,
             [] (std::unique_ptr<request> req) {
-                return streaming::get_stream_manager().invoke_on_all([] (auto& sm) {
-                    return sm.update_all_progress_info();
-                }).then([] {
-                    return streaming::get_stream_manager().map_reduce0([](streaming::stream_manager& stream) {
-                        std::vector<hs::stream_state> res;
-                        for (auto i : stream.get_initiated_streams()) {
-                            res.push_back(get_state(*i.second.get()));
-                        }
-                        for (auto i : stream.get_receiving_streams()) {
-                            res.push_back(get_state(*i.second.get()));
-                        }
-                        return res;
-                    }, std::vector<hs::stream_state>(),concat<hs::stream_state>).
-                    then([](const std::vector<hs::stream_state>& res) {
-                        return make_ready_future<json::json_return_type>(res);
-                    });
+                return streaming::get_stream_manager().map_reduce0([](streaming::stream_manager& stream) {
+                    std::vector<hs::stream_state> res;
+                    for (auto i : stream.get_initiated_streams()) {
+                        res.push_back(get_state(*i.second.get()));
+                    }
+                    for (auto i : stream.get_receiving_streams()) {
+                        res.push_back(get_state(*i.second.get()));
+                    }
+                    return res;
+                }, std::vector<hs::stream_state>(),concat<hs::stream_state>).
+                then([](const std::vector<hs::stream_state>& res) {
+                    return make_ready_future<json::json_return_type>(res);
                 });
             });
 
@@ -120,9 +111,17 @@ void set_stream_manager(http_context& ctx, routes& r) {
     hs::get_total_incoming_bytes.set(r, [](std::unique_ptr<request> req) {
         gms::inet_address peer(req->param["peer"]);
         return streaming::get_stream_manager().map_reduce0([peer](streaming::stream_manager& sm) {
-            return sm.get_progress_on_all_shards(peer).then([] (auto sbytes) {
-                return sbytes.bytes_received;
-            });
+            int64_t res = 0;
+            for (auto sr : sm.get_all_streams()) {
+                if (sr) {
+                    for (auto session : sr->get_coordinator()->get_all_stream_sessions()) {
+                        if (session->peer == peer) {
+                            res += session->get_bytes_received();
+                        }
+                    }
+                }
+            }
+            return res;
         }, 0, std::plus<int64_t>()).then([](int64_t res) {
             return make_ready_future<json::json_return_type>(res);
         });
@@ -130,9 +129,15 @@ void set_stream_manager(http_context& ctx, routes& r) {
 
     hs::get_all_total_incoming_bytes.set(r, [](std::unique_ptr<request> req) {
         return streaming::get_stream_manager().map_reduce0([](streaming::stream_manager& sm) {
-            return sm.get_progress_on_all_shards().then([] (auto sbytes) {
-                return sbytes.bytes_received;
-            });
+            int64_t res = 0;
+            for (auto sr : sm.get_all_streams()) {
+                if (sr) {
+                    for (auto session : sr->get_coordinator()->get_all_stream_sessions()) {
+                        res += session->get_bytes_received();
+                    }
+                }
+            }
+            return res;
         }, 0, std::plus<int64_t>()).then([](int64_t res) {
             return make_ready_future<json::json_return_type>(res);
         });
@@ -140,10 +145,18 @@ void set_stream_manager(http_context& ctx, routes& r) {
 
     hs::get_total_outgoing_bytes.set(r, [](std::unique_ptr<request> req) {
         gms::inet_address peer(req->param["peer"]);
-        return streaming::get_stream_manager().map_reduce0([peer] (streaming::stream_manager& sm) {
-            return sm.get_progress_on_all_shards(peer).then([] (auto sbytes) {
-                return sbytes.bytes_sent;
-            });
+        return streaming::get_stream_manager().map_reduce0([peer](streaming::stream_manager& sm) {
+            int64_t res = 0;
+            for (auto sr : sm.get_all_streams()) {
+                if (sr) {
+                    for (auto session : sr->get_coordinator()->get_all_stream_sessions()) {
+                        if (session->peer == peer) {
+                            res += session->get_bytes_sent();
+                        }
+                    }
+                }
+            }
+            return res;
         }, 0, std::plus<int64_t>()).then([](int64_t res) {
             return make_ready_future<json::json_return_type>(res);
         });
@@ -151,9 +164,15 @@ void set_stream_manager(http_context& ctx, routes& r) {
 
     hs::get_all_total_outgoing_bytes.set(r, [](std::unique_ptr<request> req) {
         return streaming::get_stream_manager().map_reduce0([](streaming::stream_manager& sm) {
-            return sm.get_progress_on_all_shards().then([] (auto sbytes) {
-                return sbytes.bytes_sent;
-            });
+            int64_t res = 0;
+            for (auto sr : sm.get_all_streams()) {
+                if (sr) {
+                    for (auto session : sr->get_coordinator()->get_all_stream_sessions()) {
+                        res += session->get_bytes_sent();
+                    }
+                }
+            }
+            return res;
         }, 0, std::plus<int64_t>()).then([](int64_t res) {
             return make_ready_future<json::json_return_type>(res);
         });

api/stream_manager.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/system.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

api/system.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

atomic_cell.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright (C) 2015 Cloudius Systems, Ltd.
  */
 
 /*
@@ -54,9 +54,9 @@ class atomic_cell_or_collection;
  */
 class atomic_cell_type final {
 private:
+    static constexpr int8_t DEAD_FLAGS = 0;
     static constexpr int8_t LIVE_FLAG = 0x01;
     static constexpr int8_t EXPIRY_FLAG = 0x02; // When present, expiry field is present. Set only for live cells
-    static constexpr int8_t REVERT_FLAG = 0x04; // transient flag used to efficiently implement ReversiblyMergeable for atomic cells.
     static constexpr unsigned flags_size = 1;
     static constexpr unsigned timestamp_offset = flags_size;
     static constexpr unsigned timestamp_size = 8;
@@ -67,21 +67,14 @@ private:
     static constexpr unsigned ttl_offset = expiry_offset + expiry_size;
     static constexpr unsigned ttl_size = 4;
 private:
-    static bool is_revert_set(bytes_view cell) {
-        return cell[0] & REVERT_FLAG;
-    }
-    template<typename BytesContainer>
-    static void set_revert(BytesContainer& cell, bool revert) {
-        cell[0] = (cell[0] & ~REVERT_FLAG) | (revert * REVERT_FLAG);
-    }
     static bool is_live(const bytes_view& cell) {
-        return cell[0] & LIVE_FLAG;
+        return cell[0] != DEAD_FLAGS;
     }
     static bool is_live_and_has_ttl(const bytes_view& cell) {
         return cell[0] & EXPIRY_FLAG;
     }
     static bool is_dead(const bytes_view& cell) {
-        return !is_live(cell);
+        return cell[0] == DEAD_FLAGS;
     }
     // Can be called on live and dead cells
     static api::timestamp_type timestamp(const bytes_view& cell) {
@@ -113,7 +106,7 @@ private:
     }
     static managed_bytes make_dead(api::timestamp_type timestamp, gc_clock::time_point deletion_time) {
         managed_bytes b(managed_bytes::initialized_later(), flags_size + timestamp_size + deletion_time_size);
-        b[0] = 0;
+        b[0] = DEAD_FLAGS;
         set_field(b, timestamp_offset, timestamp);
         set_field(b, deletion_time_offset, deletion_time.time_since_epoch().count());
         return b;
@@ -147,11 +140,8 @@ protected:
     ByteContainer _data;
 protected:
     atomic_cell_base(ByteContainer&& data) : _data(std::forward<ByteContainer>(data)) { }
-    friend class atomic_cell_or_collection;
+    atomic_cell_base(const ByteContainer& data) : _data(data) { }
 public:
-    bool is_revert_set() const {
-        return atomic_cell_type::is_revert_set(_data);
-    }
     bool is_live() const {
         return atomic_cell_type::is_live(_data);
     }
@@ -197,13 +187,10 @@ public:
     bytes_view serialize() const {
         return _data;
     }
-    void set_revert(bool revert) {
-        atomic_cell_type::set_revert(_data, revert);
-    }
 };
 
 class atomic_cell_view final : public atomic_cell_base<bytes_view> {
-    atomic_cell_view(bytes_view data) : atomic_cell_base(std::move(data)) {}
+    atomic_cell_view(bytes_view data) : atomic_cell_base(data) {}
 public:
     static atomic_cell_view from_bytes(bytes_view data) { return atomic_cell_view(data); }
 
@@ -211,11 +198,6 @@ public:
     friend std::ostream& operator<<(std::ostream& os, const atomic_cell_view& acv);
 };
 
-class atomic_cell_ref final : public atomic_cell_base<managed_bytes&> {
-public:
-    atomic_cell_ref(managed_bytes& buf) : atomic_cell_base(buf) {}
-};
-
 class atomic_cell final : public atomic_cell_base<managed_bytes> {
     atomic_cell(managed_bytes b) : atomic_cell_base(std::move(b)) {}
 public:

atomic_cell_hash.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright (C) 2015 Cloudius Systems, Ltd.
  */
 
 /*
@@ -27,18 +27,16 @@
 #include "atomic_cell.hh"
 #include "hashing.hh"
 
-template<>
-struct appending_hash<collection_mutation_view> {
-    template<typename Hasher>
-    void operator()(Hasher& h, collection_mutation_view cell) const {
-        auto m_view = collection_type_impl::deserialize_mutation_form(cell);
-        ::feed_hash(h, m_view.tomb);
-        for (auto&& key_and_value : m_view.cells) {
-            ::feed_hash(h, key_and_value.first);
-            ::feed_hash(h, key_and_value.second);
-        }
+template<typename Hasher>
+void feed_hash(collection_mutation_view cell, Hasher& h, const data_type& type) {
+    auto&& ctype = static_pointer_cast<const collection_type_impl>(type);
+    auto m_view = ctype->deserialize_mutation_form(cell);
+    ::feed_hash(h, m_view.tomb);
+    for (auto&& key_and_value : m_view.cells) {
+        ::feed_hash(h, key_and_value.first);
+        ::feed_hash(h, key_and_value.second);
     }
-};
+}
 
 template<>
 struct appending_hash<atomic_cell_view> {
@@ -57,19 +55,3 @@ struct appending_hash<atomic_cell_view> {
         }
     }
 };
-
-template<>
-struct appending_hash<atomic_cell> {
-    template<typename Hasher>
-    void operator()(Hasher& h, const atomic_cell& cell) const {
-        feed_hash(h, static_cast<atomic_cell_view>(cell));
-    }
-};
-
-template<>
-struct appending_hash<collection_mutation> {
-    template<typename Hasher>
-    void operator()(Hasher& h, const collection_mutation& cm) const {
-        feed_hash(h, static_cast<collection_mutation_view>(cm));
-    }
-};

atomic_cell_or_collection.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright (C) 2015 Cloudius Systems, Ltd.
  */
 
 /*
@@ -27,10 +27,11 @@
 
 // A variant type that can hold either an atomic_cell, or a serialized collection.
 // Which type is stored is determined by the schema.
-// Has an "empty" state.
-// Objects moved-from are left in an empty state.
 class atomic_cell_or_collection final {
     managed_bytes _data;
+
+    template<typename T>
+    friend class db::serializer;
 private:
     atomic_cell_or_collection(managed_bytes&& data) : _data(std::move(data)) {}
 public:
@@ -38,7 +39,6 @@ public:
     atomic_cell_or_collection(atomic_cell ac) : _data(std::move(ac._data)) {}
     static atomic_cell_or_collection from_atomic_cell(atomic_cell data) { return { std::move(data._data) }; }
     atomic_cell_view as_atomic_cell() const { return atomic_cell_view::from_bytes(_data); }
-    atomic_cell_ref as_atomic_cell_ref() { return { _data }; }
     atomic_cell_or_collection(collection_mutation cm) : _data(std::move(cm.data)) {}
     explicit operator bool() const {
         return !_data.empty();
@@ -63,5 +63,11 @@ public:
             ::feed_hash(as_collection_mutation(), h, def.type);
         }
     }
+    void linearize() {
+        _data.linearize();
+    }
+    void unlinearize() {
+        _data.scatter();
+    }
     friend std::ostream& operator<<(std::ostream&, const atomic_cell_or_collection&);
 };

auth/auth.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -40,19 +40,14 @@
  */
 #include <seastar/core/sleep.hh>
 
-#include <seastar/core/distributed.hh>
-
 #include "auth.hh"
 #include "authenticator.hh"
-#include "authorizer.hh"
 #include "database.hh"
 #include "cql3/query_processor.hh"
 #include "cql3/statements/cf_statement.hh"
 #include "cql3/statements/create_table_statement.hh"
 #include "db/config.hh"
 #include "service/migration_manager.hh"
-#include "utils/loading_cache.hh"
-#include "utils/hash.hh"
 
 const sstring auth::auth::DEFAULT_SUPERUSER_NAME("cassandra");
 const sstring auth::auth::AUTH_KS("system_auth");
@@ -81,10 +76,13 @@ class auth_migration_listener : public service::migration_listener {
     void on_update_aggregate(const sstring& ks_name, const sstring& aggregate_name) override {}
 
     void on_drop_keyspace(const sstring& ks_name) override {
-        auth::authorizer::get().revoke_all(auth::data_resource(ks_name));
+        // TODO:
+        //DatabaseDescriptor.getAuthorizer().revokeAll(DataResource.keyspace(ksName));
+
     }
     void on_drop_column_family(const sstring& ks_name, const sstring& cf_name) override {
-        auth::authorizer::get().revoke_all(auth::data_resource(ks_name, cf_name));
+        // TODO:
+        //DatabaseDescriptor.getAuthorizer().revokeAll(DataResource.columnFamily(ksName, cfName));
     }
     void on_drop_user_type(const sstring& ks_name, const sstring& type_name) override {}
     void on_drop_function(const sstring& ks_name, const sstring& function_name) override {}
@@ -93,64 +91,6 @@ class auth_migration_listener : public service::migration_listener {
 
 static auth_migration_listener auth_migration;
 
-namespace std {
-template <>
-struct hash<auth::data_resource> {
-    size_t operator()(const auth::data_resource & v) const {
-        return v.hash_value();
-    }
-};
-
-template <>
-struct hash<auth::authenticated_user> {
-    size_t operator()(const auth::authenticated_user & v) const {
-        return utils::tuple_hash()(v.name(), v.is_anonymous());
-    }
-};
-}
-
-class auth::auth::permissions_cache {
-public:
-    typedef utils::loading_cache<std::pair<authenticated_user, data_resource>, permission_set, utils::tuple_hash> cache_type;
-    typedef typename cache_type::key_type key_type;
-
-    permissions_cache()
-                    : permissions_cache(
-                                    cql3::get_local_query_processor().db().local().get_config()) {
-    }
-
-    permissions_cache(const db::config& cfg)
-                    : _cache(cfg.permissions_cache_max_entries(), expiry(cfg),
-                                    std::chrono::milliseconds(
-                                                    cfg.permissions_validity_in_ms()),
-                                    [](const key_type& k) {
-                                        logger.debug("Refreshing permissions for {}", k.first.name());
-                                        return authorizer::get().authorize(::make_shared<authenticated_user>(k.first), k.second);
-                                    }) {
-    }
-
-    static std::chrono::milliseconds expiry(const db::config& cfg) {
-        auto exp = cfg.permissions_update_interval_in_ms();
-        if (exp == 0 || exp == std::numeric_limits<uint32_t>::max()) {
-            exp = cfg.permissions_validity_in_ms();
-        }
-        return std::chrono::milliseconds(exp);
-    }
-
-    future<> stop() {
-        return make_ready_future<>();
-    }
-
-    future<permission_set> get(::shared_ptr<authenticated_user> user, data_resource resource) {
-        return _cache.get(key_type(*user, std::move(resource)));
-    }
-
-private:
-    cache_type _cache;
-};
-
-static distributed<auth::auth::permissions_cache> perm_cache;
-
 /**
  * Poor mans job schedule. For maximum 2 jobs. Sic.
  * Still does nothing more clever than waiting 10 seconds
@@ -163,41 +103,35 @@ static distributed<auth::auth::permissions_cache> perm_cache;
  * Should be abstracted to some sort of global server function
  * probably.
  */
-struct waiter {
-    promise<> done;
-    timer<> tmr;
-    waiter() : tmr([this] {done.set_value();})
-    {
-        tmr.arm(auth::auth::SUPERUSER_SETUP_DELAY);
-    }
-    ~waiter() {
-        if (tmr.armed()) {
-            tmr.cancel();
-            done.set_exception(std::runtime_error("shutting down"));
-        }
-        logger.trace("Deleting scheduled task");
-    }
-    void kill() {
-    }
-};
-
-typedef std::unique_ptr<waiter> waiter_ptr;
-
-static std::vector<waiter_ptr> & thread_waiters() {
-    static thread_local std::vector<waiter_ptr> the_waiters;
-    return the_waiters;
-}
-
 void auth::auth::schedule_when_up(scheduled_func f) {
-    logger.trace("Adding scheduled task");
+    struct waiter {
+        promise<> done;
+        timer<> tmr;
+        waiter() : tmr([this] {done.set_value();})
+        {
+            tmr.arm(SUPERUSER_SETUP_DELAY);
+        }
+        ~waiter() {
+            if (tmr.armed()) {
+                tmr.cancel();
+                done.set_exception(std::runtime_error("shutting down"));
+            }
+            logger.trace("Deleting scheduled task");
+        }
+        void kill() {
+        }
+    };
 
-    auto & waiters = thread_waiters();
+    typedef std::unique_ptr<waiter> waiter_ptr;
+
+    static thread_local std::vector<waiter_ptr> waiters;
+
+    logger.trace("Adding scheduled task");
 
     waiters.emplace_back(std::make_unique<waiter>());
     auto* w = waiters.back().get();
 
     w->done.get_future().finally([w] {
-        auto & waiters = thread_waiters();
         auto i = std::find_if(waiters.begin(), waiters.end(), [w](const waiter_ptr& p) {
                             return p.get() == w;
                         });
@@ -212,6 +146,7 @@ void auth::auth::schedule_when_up(scheduled_func f) {
     });
 }
 
+
 bool auth::auth::is_class_type(const sstring& type, const sstring& classname) {
     if (type == classname) {
         return true;
@@ -223,22 +158,14 @@ bool auth::auth::is_class_type(const sstring& type, const sstring& classname) {
 future<> auth::auth::setup() {
     auto& db = cql3::get_local_query_processor().db().local();
     auto& cfg = db.get_config();
+    auto type = cfg.authenticator();
 
-    future<> f = perm_cache.start();
-
-    if (is_class_type(cfg.authenticator(),
-                    authenticator::ALLOW_ALL_AUTHENTICATOR_NAME)
-                    && is_class_type(cfg.authorizer(),
-                                    authorizer::ALLOW_ALL_AUTHORIZER_NAME)
-                                    ) {
-        // just create the objects
-        return f.then([&cfg] {
-            return authenticator::setup(cfg.authenticator());
-        }).then([&cfg] {
-            return authorizer::setup(cfg.authorizer());
-        });
+    if (is_class_type(type, authenticator::ALLOW_ALL_AUTHENTICATOR_NAME)) {
+        return authenticator::setup(type).discard_result(); // just create the object
     }
 
+    future<> f = make_ready_future();
+
     if (!db.has_keyspace(AUTH_KS)) {
         std::map<sstring, sstring> opts;
         opts["replication_factor"] = "1";
@@ -250,10 +177,10 @@ future<> auth::auth::setup() {
         return setup_table(USERS_CF, sprint("CREATE TABLE %s.%s (%s text, %s boolean, PRIMARY KEY(%s)) WITH gc_grace_seconds=%d",
                                         AUTH_KS, USERS_CF, USER_NAME, SUPER, USER_NAME,
                                         90 * 24 * 60 * 60)); // 3 months.
-    }).then([&cfg] {
-        return authenticator::setup(cfg.authenticator());
-    }).then([&cfg] {
-        return authorizer::setup(cfg.authorizer());
+    }).then([type] {
+        return authenticator::setup(type).discard_result();
+    }).then([] {
+        // TODO authorizer
     }).then([] {
         service::get_local_migration_manager().register_listener(&auth_migration); // again, only one shard...
         // instead of once-timer, just schedule this later
@@ -278,21 +205,6 @@ future<> auth::auth::setup() {
     });
 }
 
-future<> auth::auth::shutdown() {
-    // just make sure we don't have pending tasks.
-    // this is mostly relevant for test cases where
-    // db-env-shutdown != process shutdown
-    return smp::invoke_on_all([] {
-        thread_waiters().clear();
-    }).then([] {
-        return perm_cache.stop();
-    });
-}
-
-future<auth::permission_set> auth::auth::get_permissions(::shared_ptr<authenticated_user> user, data_resource resource) {
-    return perm_cache.local().get(std::move(user), std::move(resource));
-}
-
 static db::consistency_level consistency_for_user(const sstring& username) {
     if (username == auth::auth::DEFAULT_SUPERUSER_NAME) {
         return db::consistency_level::QUORUM;
@@ -354,12 +266,9 @@ future<> auth::auth::setup_table(const sstring& name, const sstring& cql) {
     ::shared_ptr<cql3::statements::create_table_statement> statement =
                     static_pointer_cast<cql3::statements::create_table_statement>(
                                     parsed->prepare(db)->statement);
-    auto schema = statement->get_cf_meta_data();
-    auto uuid = generate_legacy_id(schema->ks_name(), schema->cf_name());
-
-    schema_builder b(schema);
-    b.set_uuid(uuid);
-    return service::get_local_migration_manager().announce_new_column_family(b.build(), false);
+    // Origin sets "Legacy Cf Id" for the new table. We have no need to be
+    // pre-2.1 compatible (afaik), so lets skip a whole lotta hoolaballo
+    return statement->announce_migration(qp.proxy(), false).then([statement](bool) {});
 }
 
 future<bool> auth::auth::has_existing_users(const sstring& cfname, const sstring& def_user_name, const sstring& name_column) {

auth/auth.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -44,21 +44,13 @@
 #include <chrono>
 #include <seastar/core/sstring.hh>
 #include <seastar/core/future.hh>
-#include <seastar/core/shared_ptr.hh>
-
 
 #include "exceptions/exceptions.hh"
-#include "permission.hh"
-#include "data_resource.hh"
 
 namespace auth {
 
-class authenticated_user;
-
 class auth {
 public:
-    class permissions_cache;
-
     static const sstring DEFAULT_SUPERUSER_NAME;
     static const sstring AUTH_KS;
     static const sstring USERS_CF;
@@ -66,7 +58,12 @@ public:
 
     static bool is_class_type(const sstring& type, const sstring& classname);
 
-    static future<permission_set> get_permissions(::shared_ptr<authenticated_user>, data_resource);
+#if 0
+    public static Set<Permission> getPermissions(AuthenticatedUser user, IResource resource)
+    {
+        return permissionsCache.getPermissions(user, resource);
+    }
+#endif
 
     /**
      * Checks if the username is stored in AUTH_KS.USERS_CF.
@@ -105,7 +102,6 @@ public:
      * Sets up Authenticator and Authorizer.
      */
     static future<> setup();
-    static future<> shutdown();
 
     /**
      * Set up table from given CREATE TABLE statement under system_auth keyspace, if not already done so.

auth/authenticated_user.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -41,7 +41,6 @@
 
 
 #include "authenticated_user.hh"
-#include "auth.hh"
 
 const sstring auth::authenticated_user::ANONYMOUS_USERNAME("anonymous");
 
@@ -53,20 +52,10 @@ auth::authenticated_user::authenticated_user(sstring name)
                 : _name(name), _anon(false)
 {}
 
-auth::authenticated_user::authenticated_user(authenticated_user&&) = default;
-auth::authenticated_user::authenticated_user(const authenticated_user&) = default;
-
 const sstring& auth::authenticated_user::name() const {
     return _anon ? ANONYMOUS_USERNAME : _name;
 }
 
-future<bool> auth::authenticated_user::is_super() const {
-    if (is_anonymous()) {
-        return make_ready_future<bool>(false);
-    }
-    return auth::auth::is_super_user(_name);
-}
-
 bool auth::authenticated_user::operator==(const authenticated_user& v) const {
     return _anon ? v._anon : _name == v._name;
 }

auth/authenticated_user.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -42,7 +42,6 @@
 #pragma once
 
 #include <seastar/core/sstring.hh>
-#include <seastar/core/future.hh>
 
 namespace auth {
 
@@ -52,8 +51,6 @@ public:
 
     authenticated_user();
     authenticated_user(sstring name);
-    authenticated_user(authenticated_user&&);
-    authenticated_user(const authenticated_user&);
 
     const sstring& name() const;
 
@@ -63,7 +60,7 @@ public:
      * Im most cased, though not necessarily, a superuser will have Permission.ALL on every resource
      * (depends on IAuthorizer implementation).
      */
-    future<bool> is_super() const;
+    bool is_super() const;
 
     /**
      * If IAuthenticator doesn't require authentication, this method may return true.

auth/authenticator.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -49,22 +49,6 @@ const sstring auth::authenticator::USERNAME_KEY("username");
 const sstring auth::authenticator::PASSWORD_KEY("password");
 const sstring auth::authenticator::ALLOW_ALL_AUTHENTICATOR_NAME("org.apache.cassandra.auth.AllowAllAuthenticator");
 
-auth::authenticator::option auth::authenticator::string_to_option(const sstring& name) {
-    if (strcasecmp(name.c_str(), "password") == 0) {
-        return option::PASSWORD;
-    }
-    throw std::invalid_argument(name);
-}
-
-sstring auth::authenticator::option_to_string(option opt) {
-    switch (opt) {
-    case option::PASSWORD:
-        return "PASSWORD";
-    default:
-        throw std::invalid_argument(sprint("Unknown option {}", opt));
-    }
-}
-
 /**
  * Authenticator is assumed to be a fully state-less immutable object (note all the const).
  * We thus store a single instance globally, since it should be safe/ok.
@@ -100,9 +84,8 @@ auth::authenticator::setup(const sstring& type) throw (exceptions::configuration
             future<> drop(sstring username) throw(exceptions::request_validation_exception, exceptions::request_execution_exception) override {
                 return make_ready_future();
             }
-            const resource_ids& protected_resources() const override {
-                static const resource_ids ids;
-                return ids;
+            resource_ids protected_resources() const override {
+                return resource_ids();
             }
             ::shared_ptr<sasl_challenge> new_sasl_challenge() const override {
                 throw std::runtime_error("Should not reach");

auth/authenticator.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -79,13 +79,15 @@ public:
         PASSWORD
     };
 
-    static option string_to_option(const sstring&);
-    static sstring option_to_string(option);
-
     using option_set = enum_set<super_enum<option, option::PASSWORD>>;
     using option_map = std::unordered_map<option, boost::any, enum_hash<option>>;
     using credentials_map = std::unordered_map<sstring, sstring>;
 
+    /**
+     * Resource id mappings, i.e. keyspace and/or column families.
+     */
+    using resource_ids = std::set<data_resource>;
+
     /**
      * Setup is called once upon system startup to initialize the IAuthenticator.
      *
@@ -172,7 +174,7 @@ public:
      * @return Keyspaces, column families that will be unmodifiable by users; other resources.
      * @see resource_ids
      */
-    virtual const resource_ids& protected_resources() const = 0;
+    virtual resource_ids protected_resources() const = 0;
 
     class sasl_challenge {
     public:
@@ -192,9 +194,5 @@ public:
     virtual ::shared_ptr<sasl_challenge> new_sasl_challenge() const = 0;
 };
 
-inline std::ostream& operator<<(std::ostream& os, authenticator::option opt) {
-    return os << authenticator::option_to_string(opt);
-}
-
 }
 

auth/authorizer.cc

@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Copyright (C) 2016 ScyllaDB
- *
- * Modified by ScyllaDB
- */
-
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "authorizer.hh"
-#include "authenticated_user.hh"
-#include "default_authorizer.hh"
-#include "auth.hh"
-#include "db/config.hh"
-
-const sstring auth::authorizer::ALLOW_ALL_AUTHORIZER_NAME("org.apache.cassandra.auth.AllowAllAuthorizer");
-
-/**
- * Authenticator is assumed to be a fully state-less immutable object (note all the const).
- * We thus store a single instance globally, since it should be safe/ok.
- */
-static std::unique_ptr<auth::authorizer> global_authorizer;
-
-future<>
-auth::authorizer::setup(const sstring& type) {
-    if (auth::auth::is_class_type(type, ALLOW_ALL_AUTHORIZER_NAME)) {
-        class allow_all_authorizer : public authorizer {
-        public:
-            future<permission_set> authorize(::shared_ptr<authenticated_user>, data_resource) const override {
-                return make_ready_future<permission_set>(permissions::ALL);
-            }
-            future<> grant(::shared_ptr<authenticated_user>, permission_set, data_resource, sstring) override {
-                throw exceptions::invalid_request_exception("GRANT operation is not supported by AllowAllAuthorizer");
-            }
-            future<> revoke(::shared_ptr<authenticated_user>, permission_set, data_resource, sstring) override {
-                throw exceptions::invalid_request_exception("REVOKE operation is not supported by AllowAllAuthorizer");
-            }
-            future<std::vector<permission_details>> list(::shared_ptr<authenticated_user> performer, permission_set, optional<data_resource>, optional<sstring>) const override {
-                throw exceptions::invalid_request_exception("LIST PERMISSIONS operation is not supported by AllowAllAuthorizer");
-            }
-            future<> revoke_all(sstring dropped_user) override {
-                return make_ready_future();
-            }
-            future<> revoke_all(data_resource) override {
-                return make_ready_future();
-            }
-            const resource_ids& protected_resources() override {
-                static const resource_ids ids;
-                return ids;
-            }
-            future<> validate_configuration() const override {
-                return make_ready_future();
-            }
-        };
-
-        global_authorizer = std::make_unique<allow_all_authorizer>();
-    } else if (auth::auth::is_class_type(type, default_authorizer::DEFAULT_AUTHORIZER_NAME)) {
-        auto da = std::make_unique<default_authorizer>();
-        auto f = da->init();
-        return f.then([da = std::move(da)]() mutable {
-            global_authorizer = std::move(da);
-        });
-    } else {
-        throw exceptions::configuration_exception("Invalid authorizer type: " + type);
-    }
-    return make_ready_future();
-}
-
-auth::authorizer& auth::authorizer::get() {
-    assert(global_authorizer);
-    return *global_authorizer;
-}

auth/authorizer.hh

@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Copyright (C) 2016 ScyllaDB
- *
- * Modified by ScyllaDB
- */
-
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <vector>
-#include <tuple>
-
-#include <experimental/optional>
-#include <seastar/core/future.hh>
-#include <seastar/core/shared_ptr.hh>
-
-#include "permission.hh"
-#include "data_resource.hh"
-
-namespace auth {
-
-class authenticated_user;
-
-struct permission_details {
-    sstring user;
-    data_resource resource;
-    permission_set permissions;
-
-    bool operator<(const permission_details& v) const {
-        return std::tie(user, resource, permissions) < std::tie(v.user, v.resource, v.permissions);
-    }
-};
-
-using std::experimental::optional;
-
-class authorizer {
-public:
-    static const sstring ALLOW_ALL_AUTHORIZER_NAME;
-
-    virtual ~authorizer() {}
-
-    /**
-     * The primary Authorizer method. Returns a set of permissions of a user on a resource.
-     *
-     * @param user Authenticated user requesting authorization.
-     * @param resource Resource for which the authorization is being requested. @see DataResource.
-     * @return Set of permissions of the user on the resource. Should never return empty. Use permission.NONE instead.
-     */
-    virtual future<permission_set> authorize(::shared_ptr<authenticated_user>, data_resource) const = 0;
-
-    /**
-     * Grants a set of permissions on a resource to a user.
-     * The opposite of revoke().
-     *
-     * @param performer User who grants the permissions.
-     * @param permissions Set of permissions to grant.
-     * @param to Grantee of the permissions.
-     * @param resource Resource on which to grant the permissions.
-     *
-     * @throws RequestValidationException
-     * @throws RequestExecutionException
-     */
-    virtual future<> grant(::shared_ptr<authenticated_user> performer, permission_set, data_resource, sstring to) = 0;
-
-    /**
-     * Revokes a set of permissions on a resource from a user.
-     * The opposite of grant().
-     *
-     * @param performer User who revokes the permissions.
-     * @param permissions Set of permissions to revoke.
-     * @param from Revokee of the permissions.
-     * @param resource Resource on which to revoke the permissions.
-     *
-     * @throws RequestValidationException
-     * @throws RequestExecutionException
-     */
-    virtual future<> revoke(::shared_ptr<authenticated_user> performer, permission_set, data_resource, sstring from) = 0;
-
-    /**
-     * Returns a list of permissions on a resource of a user.
-     *
-     * @param performer User who wants to see the permissions.
-     * @param permissions Set of Permission values the user is interested in. The result should only include the matching ones.
-     * @param resource The resource on which permissions are requested. Can be null, in which case permissions on all resources
-     *                 should be returned.
-     * @param of The user whose permissions are requested. Can be null, in which case permissions of every user should be returned.
-     *
-     * @return All of the matching permission that the requesting user is authorized to know about.
-     *
-     * @throws RequestValidationException
-     * @throws RequestExecutionException
-     */
-    virtual future<std::vector<permission_details>> list(::shared_ptr<authenticated_user> performer, permission_set, optional<data_resource>, optional<sstring>) const = 0;
-
-    /**
-     * This method is called before deleting a user with DROP USER query so that a new user with the same
-     * name wouldn't inherit permissions of the deleted user in the future.
-     *
-     * @param droppedUser The user to revoke all permissions from.
-     */
-    virtual future<> revoke_all(sstring dropped_user) = 0;
-
-    /**
-     * This method is called after a resource is removed (i.e. keyspace or a table is dropped).
-     *
-     * @param droppedResource The resource to revoke all permissions on.
-     */
-    virtual future<> revoke_all(data_resource) = 0;
-
-    /**
-     * Set of resources that should be made inaccessible to users and only accessible internally.
-     *
-     * @return Keyspaces, column families that will be unmodifiable by users; other resources.
-     */
-    virtual const resource_ids& protected_resources() = 0;
-
-    /**
-     * Validates configuration of IAuthorizer implementation (if configurable).
-     *
-     * @throws ConfigurationException when there is a configuration error.
-     */
-    virtual future<> validate_configuration() const = 0;
-
-    /**
-     * Setup is called once upon system startup to initialize the IAuthorizer.
-     *
-     * For example, use this method to create any required keyspaces/column families.
-     */
-    static future<> setup(const sstring& type);
-
-    /**
-     * Returns the system authorizer. Must have called setup before calling this.
-     */
-    static authorizer& get();
-};
-
-}

auth/data_resource.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -158,15 +158,7 @@ bool auth::data_resource::exists() const {
 }
 
 sstring auth::data_resource::to_string() const {
-    switch (get_level()) {
-        case level::ROOT:
-            return "<all keyspaces>";
-        case level::KEYSPACE:
-            return sprint("<keyspace %s>", _ks);
-        case level::COLUMN_FAMILY:
-        default:
-            return sprint("<table %s.%s>", _ks, _cf);
-    }
+    return name();
 }
 
 bool auth::data_resource::operator==(const data_resource& v) const {
@@ -178,6 +170,6 @@ bool auth::data_resource::operator<(const data_resource& v) const {
 }
 
 std::ostream& auth::operator<<(std::ostream& os, const data_resource& r) {
-    return os << r.to_string();
+    return os << r.name();
 }
 

auth/data_resource.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -41,9 +41,7 @@
 
 #pragma once
 
-#include "utils/hash.hh"
 #include <iosfwd>
-#include <set>
 #include <seastar/core/sstring.hh>
 
 namespace auth {
@@ -138,17 +136,8 @@ public:
 
     bool operator==(const data_resource&) const;
     bool operator<(const data_resource&) const;
-
-    size_t hash_value() const {
-        return utils::tuple_hash()(_ks, _cf);
-    }
 };
 
-/**
- * Resource id mappings, i.e. keyspace and/or column families.
- */
-using resource_ids = std::set<data_resource>;
-
 std::ostream& operator<<(std::ostream&, const data_resource&);
 
 }

auth/default_authorizer.cc

@@ -1,240 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Copyright (C) 2016 ScyllaDB
- *
- * Modified by ScyllaDB
- */
-
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <unistd.h>
-#include <crypt.h>
-#include <random>
-#include <chrono>
-
-#include <seastar/core/reactor.hh>
-
-#include "auth.hh"
-#include "default_authorizer.hh"
-#include "authenticated_user.hh"
-#include "permission.hh"
-#include "cql3/query_processor.hh"
-#include "exceptions/exceptions.hh"
-#include "log.hh"
-
-const sstring auth::default_authorizer::DEFAULT_AUTHORIZER_NAME(
-                "org.apache.cassandra.auth.CassandraAuthorizer");
-
-static const sstring USER_NAME = "username";
-static const sstring RESOURCE_NAME = "resource";
-static const sstring PERMISSIONS_NAME = "permissions";
-static const sstring PERMISSIONS_CF = "permissions";
-
-static logging::logger logger("default_authorizer");
-
-auth::default_authorizer::default_authorizer() {
-}
-auth::default_authorizer::~default_authorizer() {
-}
-
-future<> auth::default_authorizer::init() {
-    sstring create_table = sprint("CREATE TABLE %s.%s ("
-                    "%s text,"
-                    "%s text,"
-                    "%s set<text>,"
-                    "PRIMARY KEY(%s, %s)"
-                    ") WITH gc_grace_seconds=%d", auth::auth::AUTH_KS,
-                    PERMISSIONS_CF, USER_NAME, RESOURCE_NAME, PERMISSIONS_NAME,
-                    USER_NAME, RESOURCE_NAME, 90 * 24 * 60 * 60); // 3 months.
-
-    return auth::setup_table(PERMISSIONS_CF, create_table);
-}
-
-
-future<auth::permission_set> auth::default_authorizer::authorize(
-                ::shared_ptr<authenticated_user> user, data_resource resource) const {
-    return user->is_super().then([this, user, resource = std::move(resource)](bool is_super) {
-        if (is_super) {
-            return make_ready_future<permission_set>(permissions::ALL);
-        }
-
-        /**
-         * TOOD: could create actual data type for permission (translating string<->perm),
-         * but this seems overkill right now. We still must store strings so...
-         */
-        auto& qp = cql3::get_local_query_processor();
-        auto query = sprint("SELECT %s FROM %s.%s WHERE %s = ? AND %s = ?"
-                        , PERMISSIONS_NAME, auth::AUTH_KS, PERMISSIONS_CF, USER_NAME, RESOURCE_NAME);
-        return qp.process(query, db::consistency_level::LOCAL_ONE, {user->name(), resource.name() })
-                        .then_wrapped([=](future<::shared_ptr<cql3::untyped_result_set>> f) {
-            try {
-                auto res = f.get0();
-
-                if (res->empty() || !res->one().has(PERMISSIONS_NAME)) {
-                    return make_ready_future<permission_set>(permissions::NONE);
-                }
-                return make_ready_future<permission_set>(permissions::from_strings(res->one().get_set<sstring>(PERMISSIONS_NAME)));
-            } catch (exceptions::request_execution_exception& e) {
-                logger.warn("CassandraAuthorizer failed to authorize {} for {}", user->name(), resource);
-                return make_ready_future<permission_set>(permissions::NONE);
-            }
-        });
-    });
-}
-
-#include <boost/range.hpp>
-
-future<> auth::default_authorizer::modify(
-                ::shared_ptr<authenticated_user> performer, permission_set set,
-                data_resource resource, sstring user, sstring op) {
-    // TODO: why does this not check super user?
-    auto& qp = cql3::get_local_query_processor();
-    auto query = sprint("UPDATE %s.%s SET %s = %s %s ? WHERE %s = ? AND %s = ?",
-                    auth::AUTH_KS, PERMISSIONS_CF, PERMISSIONS_NAME,
-                    PERMISSIONS_NAME, op, USER_NAME, RESOURCE_NAME);
-    return qp.process(query, db::consistency_level::ONE, {
-                    permissions::to_strings(set), user, resource.name() }).discard_result();
-}
-
-
-future<> auth::default_authorizer::grant(
-                ::shared_ptr<authenticated_user> performer, permission_set set,
-                data_resource resource, sstring to) {
-    return modify(std::move(performer), std::move(set), std::move(resource), std::move(to), "+");
-}
-
-future<> auth::default_authorizer::revoke(
-                ::shared_ptr<authenticated_user> performer, permission_set set,
-                data_resource resource, sstring from) {
-    return modify(std::move(performer), std::move(set), std::move(resource), std::move(from), "-");
-}
-
-future<std::vector<auth::permission_details>> auth::default_authorizer::list(
-                ::shared_ptr<authenticated_user> performer, permission_set set,
-                optional<data_resource> resource, optional<sstring> user) const {
-    return performer->is_super().then([this, performer, set = std::move(set), resource = std::move(resource), user = std::move(user)](bool is_super) {
-        if (!is_super && (!user || performer->name() != *user)) {
-            throw exceptions::unauthorized_exception(sprint("You are not authorized to view %s's permissions", user ? *user : "everyone"));
-        }
-
-        auto query = sprint("SELECT %s, %s, %s FROM %s.%s", USER_NAME, RESOURCE_NAME, PERMISSIONS_NAME, auth::AUTH_KS, PERMISSIONS_CF);
-        auto& qp = cql3::get_local_query_processor();
-
-        // Oh, look, it is a case where it does not pay off to have
-        // parameters to process in an initializer list.
-        future<::shared_ptr<cql3::untyped_result_set>> f = make_ready_future<::shared_ptr<cql3::untyped_result_set>>();
-
-        if (resource && user) {
-            query += sprint(" WHERE %s = ? AND %s = ?", USER_NAME, RESOURCE_NAME);
-            f = qp.process(query, db::consistency_level::ONE, {*user, resource->name()});
-        } else if (resource) {
-            query += sprint(" WHERE %s = ? ALLOW FILTERING", RESOURCE_NAME);
-            f = qp.process(query, db::consistency_level::ONE, {resource->name()});
-        } else if (user) {
-            query += sprint(" WHERE %s = ?", USER_NAME);
-            f = qp.process(query, db::consistency_level::ONE, {*user});
-        } else {
-            f = qp.process(query, db::consistency_level::ONE, {});
-        }
-
-        return f.then([set](::shared_ptr<cql3::untyped_result_set> res) {
-            std::vector<permission_details> result;
-
-            for (auto& row : *res) {
-                if (row.has(PERMISSIONS_NAME)) {
-                    auto username = row.get_as<sstring>(USER_NAME);
-                    auto resource = data_resource::from_name(row.get_as<sstring>(RESOURCE_NAME));
-                    auto ps = permissions::from_strings(row.get_set<sstring>(PERMISSIONS_NAME));
-                    ps = permission_set::from_mask(ps.mask() & set.mask());
-
-                    result.emplace_back(permission_details {username, resource, ps});
-                }
-            }
-            return make_ready_future<std::vector<permission_details>>(std::move(result));
-        });
-    });
-}
-
-future<> auth::default_authorizer::revoke_all(sstring dropped_user) {
-    auto& qp = cql3::get_local_query_processor();
-    auto query = sprint("DELETE FROM %s.%s WHERE %s = ?", auth::AUTH_KS,
-                    PERMISSIONS_CF, USER_NAME);
-    return qp.process(query, db::consistency_level::ONE, { dropped_user }).discard_result().handle_exception(
-                    [dropped_user](auto ep) {
-                        try {
-                            std::rethrow_exception(ep);
-                        } catch (exceptions::request_execution_exception& e) {
-                            logger.warn("CassandraAuthorizer failed to revoke all permissions of {}: {}", dropped_user, e);
-                        }
-                    });
-}
-
-future<> auth::default_authorizer::revoke_all(data_resource resource) {
-    auto& qp = cql3::get_local_query_processor();
-    auto query = sprint("SELECT %s FROM %s.%s WHERE %s = ? ALLOW FILTERING",
-                    USER_NAME, auth::AUTH_KS, PERMISSIONS_CF, RESOURCE_NAME);
-    return qp.process(query, db::consistency_level::LOCAL_ONE, { resource.name() })
-                    .then_wrapped([resource, &qp](future<::shared_ptr<cql3::untyped_result_set>> f) {
-        try {
-            auto res = f.get0();
-            return parallel_for_each(res->begin(), res->end(), [&qp, res, resource](const cql3::untyped_result_set::row& r) {
-                auto query = sprint("DELETE FROM %s.%s WHERE %s = ? AND %s = ?"
-                                , auth::AUTH_KS, PERMISSIONS_CF, USER_NAME, RESOURCE_NAME);
-                return qp.process(query, db::consistency_level::LOCAL_ONE, { r.get_as<sstring>(USER_NAME), resource.name() })
-                                .discard_result().handle_exception([resource](auto ep) {
-                    try {
-                        std::rethrow_exception(ep);
-                    } catch (exceptions::request_execution_exception& e) {
-                        logger.warn("CassandraAuthorizer failed to revoke all permissions on {}: {}", resource, e);
-                    }
-
-                });
-            });
-        } catch (exceptions::request_execution_exception& e) {
-            logger.warn("CassandraAuthorizer failed to revoke all permissions on {}: {}", resource, e);
-            return make_ready_future();
-        }
-    });
-}
-
-
-const auth::resource_ids& auth::default_authorizer::protected_resources() {
-    static const resource_ids ids({ data_resource(auth::AUTH_KS, PERMISSIONS_CF) });
-    return ids;
-}
-
-future<> auth::default_authorizer::validate_configuration() const {
-    return make_ready_future();
-}

auth/default_authorizer.hh

@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Copyright (C) 2016 ScyllaDB
- *
- * Modified by ScyllaDB
- */
-
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "authorizer.hh"
-
-namespace auth {
-
-class default_authorizer : public authorizer {
-public:
-    static const sstring DEFAULT_AUTHORIZER_NAME;
-
-    default_authorizer();
-    ~default_authorizer();
-
-    future<> init();
-
-    future<permission_set> authorize(::shared_ptr<authenticated_user>, data_resource) const override;
-
-    future<> grant(::shared_ptr<authenticated_user>, permission_set, data_resource, sstring) override;
-
-    future<> revoke(::shared_ptr<authenticated_user>, permission_set, data_resource, sstring) override;
-
-    future<std::vector<permission_details>> list(::shared_ptr<authenticated_user>, permission_set, optional<data_resource>, optional<sstring>) const override;
-
-    future<> revoke_all(sstring) override;
-
-    future<> revoke_all(data_resource) override;
-
-    const resource_ids& protected_resources() override;
-
-    future<> validate_configuration() const override;
-
-private:
-    future<> modify(::shared_ptr<authenticated_user>, permission_set, data_resource, sstring, sstring);
-};
-
-} /* namespace auth */
-

auth/password_authenticator.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -281,9 +281,8 @@ future<> auth::password_authenticator::drop(sstring username)
     }
 }
 
-const auth::resource_ids& auth::password_authenticator::protected_resources() const {
-    static const resource_ids ids({ data_resource(auth::AUTH_KS, CREDENTIALS_CF) });
-    return ids;
+auth::authenticator::resource_ids auth::password_authenticator::protected_resources() const {
+    return { data_resource(auth::AUTH_KS, CREDENTIALS_CF) };
 }
 
 ::shared_ptr<auth::authenticator::sasl_challenge> auth::password_authenticator::new_sasl_challenge() const {

auth/password_authenticator.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -62,7 +62,7 @@ public:
     future<> create(sstring username, const option_map& options) throw(exceptions::request_validation_exception, exceptions::request_execution_exception) override;
     future<> alter(sstring username, const option_map& options) throw(exceptions::request_validation_exception, exceptions::request_execution_exception) override;
     future<> drop(sstring username) throw(exceptions::request_validation_exception, exceptions::request_execution_exception) override;
-    const resource_ids& protected_resources() const override;
+    resource_ids protected_resources() const override;
     ::shared_ptr<sasl_challenge> new_sasl_challenge() const override;
 
 

auth/permission.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -39,63 +39,11 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <unordered_map>
 #include "permission.hh"
 
-const auth::permission_set auth::permissions::ALL_DATA =
-                auth::permission_set::of<auth::permission::CREATE,
-                                auth::permission::ALTER, auth::permission::DROP,
-                                auth::permission::SELECT,
-                                auth::permission::MODIFY,
-                                auth::permission::AUTHORIZE>();
-const auth::permission_set auth::permissions::ALL = auth::permissions::ALL_DATA;
-const auth::permission_set auth::permissions::NONE;
-const auth::permission_set auth::permissions::ALTERATIONS =
-                auth::permission_set::of<auth::permission::CREATE,
-                                auth::permission::ALTER, auth::permission::DROP>();
-
-static const std::unordered_map<sstring, auth::permission> permission_names({
-    { "READ", auth::permission::READ },
-    { "WRITE", auth::permission::WRITE  },
-    { "CREATE", auth::permission::CREATE },
-    { "ALTER", auth::permission::ALTER },
-    { "DROP", auth::permission::DROP },
-    { "SELECT", auth::permission::SELECT  },
-    { "MODIFY", auth::permission::MODIFY   },
-    { "AUTHORIZE", auth::permission::AUTHORIZE },
-});
-
-const sstring& auth::permissions::to_string(permission p) {
-    for (auto& v : permission_names) {
-        if (v.second == p) {
-            return v.first;
-        }
-    }
-    throw std::out_of_range("unknown permission");
-}
-
-auth::permission auth::permissions::from_string(const sstring& s) {
-    return permission_names.at(s);
-}
-
-std::unordered_set<sstring> auth::permissions::to_strings(const permission_set& set) {
-    std::unordered_set<sstring> res;
-    for (auto& v : permission_names) {
-        if (set.contains(v.second)) {
-            res.emplace(v.first);
-        }
-    }
-    return res;
-}
-
-auth::permission_set auth::permissions::from_strings(const std::unordered_set<sstring>& set) {
-    permission_set res = auth::permissions::NONE;
-    for (auto& s : set) {
-        res.set(from_string(s));
-    }
-    return res;
-}
-
-bool auth::operator<(const permission_set& p1, const permission_set& p2) {
-    return p1.mask() < p2.mask();
-}
+const auth::permission_set auth::ALL_DATA = auth::permission_set::of
+                < auth::permission::CREATE, auth::permission::ALTER,
+                auth::permission::DROP, auth::permission::SELECT,
+                auth::permission::MODIFY, auth::permission::AUTHORIZE>();
+const auth::permission_set auth::ALL = auth::ALL_DATA;
+const auth::permission_set auth::NONE;

auth/permission.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2016 ScyllaDB
+ * Copyright 2016 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -41,9 +41,6 @@
 
 #pragma once
 
-#include <unordered_set>
-#include <seastar/core/sstring.hh>
-
 #include "enum_set.hh"
 
 namespace auth {
@@ -77,22 +74,8 @@ typedef enum_set<super_enum<permission,
                 permission::MODIFY,
                 permission::AUTHORIZE>> permission_set;
 
-bool operator<(const permission_set&, const permission_set&);
-
-namespace permissions {
-
 extern const permission_set ALL_DATA;
 extern const permission_set ALL;
 extern const permission_set NONE;
-extern const permission_set ALTERATIONS;
-
-const sstring& to_string(permission);
-permission from_string(const sstring&);
-
-std::unordered_set<sstring> to_strings(const permission_set&);
-permission_set from_strings(const std::unordered_set<sstring>&);
-
-
-}
 
 }

bytes.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 ScyllaDB
+ * Copyright (C) 2014 Cloudius Systems, Ltd.
  */
 
 /*

bytes.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright (C) 2015 Cloudius Systems, Ltd.
  */
 
 /*

bytes_ostream.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*
@@ -21,12 +21,11 @@
 
 #pragma once
 
-#include <boost/range/iterator_range.hpp>
-
-#include "bytes.hh"
+#include "types.hh"
+#include "net/byteorder.hh"
 #include "core/unaligned.hh"
 #include "hashing.hh"
-#include "seastar/core/simple-stream.hh"
+
 /**
  * Utility for writing data into a buffer when its final size is not known up front.
  *
@@ -172,12 +171,16 @@ public:
     template <typename T>
     struct place_holder {
         value_type* ptr;
-        // makes the place_holder looks like a stream
-        seastar::simple_output_stream get_stream() {
-            return seastar::simple_output_stream{reinterpret_cast<char*>(ptr)};
-        }
     };
 
+    // Writes given values in big-endian format
+    template <typename T>
+    inline
+    std::enable_if_t<std::is_fundamental<T>::value, void>
+    write(T val) {
+        *reinterpret_cast<unaligned<T>*>(alloc(sizeof(T))) = net::hton(val);
+    }
+
     // Returns a place holder for a value to be written later.
     template <typename T>
     inline
@@ -215,6 +218,19 @@ public:
         write(bytes_view(reinterpret_cast<const signed char*>(ptr), size));
     }
 
+    // Writes given sequence of bytes with a preceding length component encoded in big-endian format
+    inline void write_blob(bytes_view v) {
+        assert((size_type)v.size() == v.size());
+        write<size_type>(v.size());
+        write(v);
+    }
+
+    // Writes given value into the place holder in big-endian format
+    template <typename T>
+    inline void set(place_holder<T> ph, T val) {
+        *reinterpret_cast<unaligned<T>*>(ph.ptr) = net::hton(val);
+    }
+
     bool is_linearized() const {
         return !_begin || !_begin->next;
     }

caching_options.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright (C) 2015 Cloudius Systems, Ltd.
  */
 
 /*

canonical_mutation.cc

@@ -24,66 +24,80 @@
 #include "mutation_partition_serializer.hh"
 #include "converting_mutation_partition_applier.hh"
 #include "hashing_partition_visitor.hh"
-#include "utils/UUID.hh"
-#include "serializer.hh"
-#include "idl/uuid.dist.hh"
-#include "idl/keys.dist.hh"
-#include "idl/mutation.dist.hh"
-#include "serializer_impl.hh"
-#include "serialization_visitors.hh"
-#include "idl/uuid.dist.impl.hh"
-#include "idl/keys.dist.impl.hh"
-#include "idl/mutation.dist.impl.hh"
+
+template class db::serializer<canonical_mutation>;
+
+//
+// Representation layout:
+//
+// <canonical_mutation> ::= <column_family_id> <table_schema_version> <partition_key> <column-mapping> <partition>
+//
+// For <partition> see mutation_partition_serializer.cc
+// For <column-mapping> see db::serializer<column_mapping>
+//
 
 canonical_mutation::canonical_mutation(bytes data)
         : _data(std::move(data))
 { }
 
 canonical_mutation::canonical_mutation(const mutation& m)
-{
-    mutation_partition_serializer part_ser(*m.schema(), m.partition());
-
-    bytes_ostream out;
-    ser::writer_of_canonical_mutation wr(out);
-    std::move(wr).write_table_id(m.schema()->id())
-                 .write_schema_version(m.schema()->version())
-                 .write_key(m.key())
-                 .write_mapping(m.schema()->get_column_mapping())
-                 .partition([&] (auto wr) {
-                     part_ser.write(std::move(wr));
-                 }).end_canonical_mutation();
-    _data = to_bytes(out.linearize());
-}
+    : _data([&m] {
+        bytes_ostream out;
+        db::serializer<utils::UUID>(m.column_family_id()).write(out);
+        db::serializer<table_schema_version>(m.schema()->version()).write(out);
+        db::serializer<partition_key_view>(m.key()).write(out);
+        db::serializer<column_mapping>(m.schema()->get_column_mapping()).write(out);
+        mutation_partition_serializer ser(*m.schema(), m.partition());
+        ser.write(out);
+        return to_bytes(out.linearize());
+    }())
+{ }
 
 utils::UUID canonical_mutation::column_family_id() const {
-    auto in = ser::as_input_stream(_data);
-    auto mv = ser::deserialize(in, boost::type<ser::canonical_mutation_view>());
-    return mv.table_id();
+    data_input in(_data);
+    return db::serializer<utils::UUID>::read(in);
 }
 
 mutation canonical_mutation::to_mutation(schema_ptr s) const {
-    auto in = ser::as_input_stream(_data);
-    auto mv = ser::deserialize(in, boost::type<ser::canonical_mutation_view>());
+    data_input in(_data);
 
-    auto cf_id = mv.table_id();
+    auto cf_id = db::serializer<utils::UUID>::read(in);
     if (s->id() != cf_id) {
         throw std::runtime_error(sprint("Attempted to deserialize canonical_mutation of table %s with schema of table %s (%s.%s)",
                                         cf_id, s->id(), s->ks_name(), s->cf_name()));
     }
 
-    auto version = mv.schema_version();
-    auto pk = mv.key();
+    auto version = db::serializer<table_schema_version>::read(in);
+    auto pk = partition_key(db::serializer<partition_key_view>::read(in));
 
     mutation m(std::move(pk), std::move(s));
 
     if (version == m.schema()->version()) {
-        auto partition_view = mutation_partition_view::from_view(mv.partition());
+        db::serializer<column_mapping>::skip(in);
+        auto partition_view = mutation_partition_serializer::read_as_view(in);
         m.partition().apply(*m.schema(), partition_view, *m.schema());
     } else {
-        column_mapping cm = mv.mapping();
+        column_mapping cm = db::serializer<column_mapping>::read(in);
         converting_mutation_partition_applier v(cm, *m.schema(), m.partition());
-        auto partition_view = mutation_partition_view::from_view(mv.partition());
+        auto partition_view = mutation_partition_serializer::read_as_view(in);
         partition_view.accept(cm, v);
     }
     return m;
 }
+
+template<>
+db::serializer<canonical_mutation>::serializer(const canonical_mutation& v)
+        : _item(v)
+        , _size(db::serializer<bytes>(v._data).size())
+{ }
+
+template<>
+void
+db::serializer<canonical_mutation>::write(output& out, const canonical_mutation& v) {
+    db::serializer<bytes>(v._data).write(out);
+}
+
+template<>
+canonical_mutation db::serializer<canonical_mutation>::read(input& in) {
+    return canonical_mutation(db::serializer<bytes>::read(in));
+}

canonical_mutation.hh

@@ -24,6 +24,7 @@
 #include "bytes.hh"
 #include "schema.hh"
 #include "database_fwd.hh"
+#include "db/serializer.hh"
 #include "mutation_partition_visitor.hh"
 #include "mutation_partition_serializer.hh"
 
@@ -32,8 +33,8 @@
 // Safe to pass serialized across nodes.
 class canonical_mutation {
     bytes _data;
+    canonical_mutation(bytes);
 public:
-    explicit canonical_mutation(bytes);
     explicit canonical_mutation(const mutation&);
 
     canonical_mutation(canonical_mutation&&) = default;
@@ -50,6 +51,15 @@ public:
 
     utils::UUID column_family_id() const;
 
-    const bytes& representation() const { return _data; }
-
+    friend class db::serializer<canonical_mutation>;
 };
+
+namespace db {
+
+template<> serializer<canonical_mutation>::serializer(const canonical_mutation&);
+template<> void serializer<canonical_mutation>::write(output&, const canonical_mutation&);
+template<> canonical_mutation serializer<canonical_mutation>::read(input&);
+
+extern template class serializer<canonical_mutation>;
+
+}

cartesian_product.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
  */
 

checked-file-impl.hh

@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2016 ScyllaDB
- */
-
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "seastar/core/file.hh"
-#include "disk-error-handler.hh"
-
-class checked_file_impl : public file_impl {
-public:
-
-    checked_file_impl(disk_error_signal_type& s, file f)
-            : _signal(s) , _file(f) {}
-
-    virtual future<size_t> write_dma(uint64_t pos, const void* buffer, size_t len, const io_priority_class& pc) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->write_dma(pos, buffer, len, pc);
-        });
-    }
-
-    virtual future<size_t> write_dma(uint64_t pos, std::vector<iovec> iov, const io_priority_class& pc) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->write_dma(pos, iov, pc);
-        });
-    }
-
-    virtual future<size_t> read_dma(uint64_t pos, void* buffer, size_t len, const io_priority_class& pc) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->read_dma(pos, buffer, len, pc);
-        });
-    }
-
-    virtual future<size_t> read_dma(uint64_t pos, std::vector<iovec> iov, const io_priority_class& pc) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->read_dma(pos, iov, pc);
-        });
-    }
-
-    virtual future<> flush(void) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->flush();
-        });
-    }
-
-    virtual future<struct stat> stat(void) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->stat();
-        });
-    }
-
-    virtual future<> truncate(uint64_t length) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->truncate(length);
-        });
-    }
-
-    virtual future<> discard(uint64_t offset, uint64_t length) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->discard(offset, length);
-        });
-    }
-
-    virtual future<> allocate(uint64_t position, uint64_t length) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->allocate(position, length);
-        });
-    }
-
-    virtual future<uint64_t> size(void) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->size();
-        });
-    }
-
-    virtual future<> close() override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->close();
-        });
-    }
-
-    virtual subscription<directory_entry> list_directory(std::function<future<> (directory_entry de)> next) override {
-        return do_io_check(_signal, [&] {
-            return get_file_impl(_file)->list_directory(next);
-        });
-    }
-
-private:
-    disk_error_signal_type &_signal;
-    file _file;
-};
-
-inline file make_checked_file(disk_error_signal_type& signal, file& f)
-{
-    return file(::make_shared<checked_file_impl>(signal, f));
-}
-
-future<file>
-inline open_checked_file_dma(disk_error_signal_type& signal,
-                             sstring name, open_flags flags,
-                             file_open_options options)
-{
-    return do_io_check(signal, [&] {
-        return open_file_dma(name, flags, options).then([&] (file f) {
-            return make_ready_future<file>(make_checked_file(signal, f));
-        });
-    });
-}
-
-future<file>
-inline open_checked_file_dma(disk_error_signal_type& signal,
-                             sstring name, open_flags flags)
-{
-    return do_io_check(signal, [&] {
-        return open_file_dma(name, flags).then([&] (file f) {
-            return make_ready_future<file>(make_checked_file(signal, f));
-        });
-    });
-}
-
-future<file>
-inline open_checked_directory(disk_error_signal_type& signal,
-                              sstring name)
-{
-    return do_io_check(signal, [&] {
-        return engine().open_directory(name).then([&] (file f) {
-            return make_ready_future<file>(make_checked_file(signal, f));
-        });
-    });
-}

combine.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright (C) 2015 Cloudius Systems, Ltd.
  */
 
 /*

compaction_strategy.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

compound.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright (C) 2015 Cloudius Systems, Ltd.
  */
 
 /*
@@ -43,7 +43,6 @@ public:
     static constexpr bool is_prefixable = AllowPrefixes == allow_prefixes::yes;
     using prefix_type = compound_type<allow_prefixes::yes>;
     using value_type = std::vector<bytes>;
-    using size_type = uint16_t;
 
     compound_type(std::vector<data_type> types)
         : _types(std::move(types))
@@ -67,7 +66,7 @@ public:
     prefix_type as_prefix() {
         return prefix_type(_types);
     }
-private:
+
     /*
      * Format:
      *   <len(value1)><value1><len(value2)><value2>...<len(value_n)><value_n>
@@ -76,8 +75,8 @@ private:
     template<typename RangeOfSerializedComponents>
     static void serialize_value(RangeOfSerializedComponents&& values, bytes::iterator& out) {
         for (auto&& val : values) {
-            assert(val.size() <= std::numeric_limits<size_type>::max());
-            write<size_type>(out, size_type(val.size()));
+            assert(val.size() <= std::numeric_limits<uint16_t>::max());
+            write<uint16_t>(out, uint16_t(val.size()));
             out = std::copy(val.begin(), val.end(), out);
         }
     }
@@ -85,21 +84,17 @@ private:
     static size_t serialized_size(RangeOfSerializedComponents&& values) {
         size_t len = 0;
         for (auto&& val : values) {
-            len += sizeof(size_type) + val.size();
+            assert(val.size() <= std::numeric_limits<uint16_t>::max());
+            len += sizeof(uint16_t) + val.size();
         }
         return len;
     }
-public:
     bytes serialize_single(bytes&& v) {
         return serialize_value({std::move(v)});
     }
     template<typename RangeOfSerializedComponents>
     static bytes serialize_value(RangeOfSerializedComponents&& values) {
-        auto size = serialized_size(values);
-        if (size > std::numeric_limits<size_type>::max()) {
-            throw std::runtime_error(sprint("Key size too large: %d > %d", size, std::numeric_limits<size_type>::max()));
-        }
-        bytes b(bytes::initialized_later(), size);
+        bytes b(bytes::initialized_later(), serialized_size(values));
         auto i = b.begin();
         serialize_value(values, i);
         return b;
@@ -136,13 +131,13 @@ public:
         value_type _current;
     private:
         void read_current() {
-            size_type len;
+            uint16_t len;
             {
                 if (_v.empty()) {
                     _v = bytes_view(nullptr, 0);
                     return;
                 }
-                len = read_simple<size_type>(_v);
+                len = read_simple<uint16_t>(_v);
                 if (_v.size() < len) {
                     throw marshal_exception();
                 }

compound_compat.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

compress.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright (C) 2015 Cloudius Systems, Ltd.
  */
 
 /*

conf/scylla.yaml

@@ -106,19 +106,6 @@ write_request_timeout_in_ms: 2000
 # most users should never need to adjust this.
 # phi_convict_threshold: 8
 
-# IEndpointSnitch.  The snitch has two functions:
-# - it teaches Scylla enough about your network topology to route
-#   requests efficiently
-# - it allows Scylla to spread replicas around your cluster to avoid
-#   correlated failures. It does this by grouping machines into
-#   "datacenters" and "racks."  Scylla will do its best not to have
-#   more than one replica on the same "rack" (which may not actually
-#   be a physical location)
-#
-# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER,
-# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS
-# ARE PLACED.
-#
 # Out of the box, Scylla provides
 #  - SimpleSnitch:
 #    Treats Strategy order as proximity. This can improve cache
@@ -192,24 +179,6 @@ api_address: 127.0.0.1
 # Caution should be taken on increasing the size of this threshold as it can lead to node instability.
 batch_size_warn_threshold_in_kb: 5
 
-# Authentication backend, identifying users
-# Out of the box, Scylla provides org.apache.cassandra.auth.{AllowAllAuthenticator,
-# PasswordAuthenticator}.
-#
-# - AllowAllAuthenticator performs no checks - set it to disable authentication.
-# - PasswordAuthenticator relies on username/password pairs to authenticate
-#   users. It keeps usernames and hashed passwords in system_auth.credentials table.
-#   Please increase system_auth keyspace replication factor if you use this authenticator.
-# authenticator: AllowAllAuthenticator
-
-# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions
-# Out of the box, Scylla provides org.apache.cassandra.auth.{AllowAllAuthorizer,
-# CassandraAuthorizer}.
-#
-# - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
-# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please
-#   increase system_auth keyspace replication factor if you use this authorizer.
-# authorizer: AllowAllAuthorizer
 
 ###################################################
 ## Not currently supported, reserved for future use
@@ -247,6 +216,25 @@ batch_size_warn_threshold_in_kb: 5
 # reduced proportionally to the number of nodes in the cluster.
 # batchlog_replay_throttle_in_kb: 1024
 
+# Authentication backend, identifying users
+# Out of the box, Scylla provides org.apache.cassandra.auth.{AllowAllAuthenticator,
+# PasswordAuthenticator}.
+#
+# - AllowAllAuthenticator performs no checks - set it to disable authentication.
+# - PasswordAuthenticator relies on username/password pairs to authenticate
+#   users. It keeps usernames and hashed passwords in system_auth.credentials table.
+#   Please increase system_auth keyspace replication factor if you use this authenticator.
+# authenticator: AllowAllAuthenticator
+
+# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions
+# Out of the box, Scylla provides org.apache.cassandra.auth.{AllowAllAuthorizer,
+# CassandraAuthorizer}.
+#
+# - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
+# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please
+#   increase system_auth keyspace replication factor if you use this authorizer.
+# authorizer: AllowAllAuthorizer
+
 # Validity period for permissions cache (fetching permissions can be an
 # expensive operation depending on the authorizer, CassandraAuthorizer is
 # one example). Defaults to 2000, set to 0 to disable.
@@ -692,6 +680,58 @@ commitlog_total_space_in_mb: -1
 # Default value is 0, which never timeout streams.
 # streaming_socket_timeout_in_ms: 0
 
+
+# endpoint_snitch -- Set this to a class that implements
+# IEndpointSnitch.  The snitch has two functions:
+# - it teaches Scylla enough about your network topology to route
+#   requests efficiently
+# - it allows Scylla to spread replicas around your cluster to avoid
+#   correlated failures. It does this by grouping machines into
+#   "datacenters" and "racks."  Scylla will do its best not to have
+#   more than one replica on the same "rack" (which may not actually
+#   be a physical location)
+#
+# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER,
+# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS
+# ARE PLACED.
+#
+# Out of the box, Scylla provides
+#  - SimpleSnitch:
+#    Treats Strategy order as proximity. This can improve cache
+#    locality when disabling read repair.  Only appropriate for
+#    single-datacenter deployments.
+#  - GossipingPropertyFileSnitch
+#    This should be your go-to snitch for production use.  The rack
+#    and datacenter for the local node are defined in
+#    cassandra-rackdc.properties and propagated to other nodes via
+#    gossip.  If cassandra-topology.properties exists, it is used as a
+#    fallback, allowing migration from the PropertyFileSnitch.
+#  - PropertyFileSnitch:
+#    Proximity is determined by rack and data center, which are
+#    explicitly configured in cassandra-topology.properties.
+#  - Ec2Snitch:
+#    Appropriate for EC2 deployments in a single Region. Loads Region
+#    and Availability Zone information from the EC2 API. The Region is
+#    treated as the datacenter, and the Availability Zone as the rack.
+#    Only private IPs are used, so this will not work across multiple
+#    Regions.
+#  - Ec2MultiRegionSnitch:
+#    Uses public IPs as broadcast_address to allow cross-region
+#    connectivity.  (Thus, you should set seed addresses to the public
+#    IP as well.) You will need to open the storage_port or
+#    ssl_storage_port on the public IP firewall.  (For intra-Region
+#    traffic, Scylla will switch to the private IP after
+#    establishing a connection.)
+#  - RackInferringSnitch:
+#    Proximity is determined by rack and data center, which are
+#    assumed to correspond to the 3rd and 2nd octet of each node's IP
+#    address, respectively.  Unless this happens to match your
+#    deployment conventions, this is best used as an example of
+#    writing a custom Snitch class and is provided in that spirit.
+#
+# You can use a custom Snitch by setting this to the full class name
+# of the snitch, which will be assumed to be on your classpath.
+
 # controls how often to perform the more expensive part of host score
 # calculation
 # dynamic_snitch_update_interval_in_ms: 100 

configure.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 #
-# Copyright (C) 2015 ScyllaDB
+# Copyright 2015 Cloudius Systems
 #
 
 #
@@ -162,7 +162,6 @@ modes = {
 
 scylla_tests = [
     'tests/mutation_test',
-    'tests/schema_registry_test',
     'tests/canonical_mutation_test',
     'tests/range_test',
     'tests/types_test',
@@ -193,6 +192,7 @@ scylla_tests = [
     'tests/commitlog_test',
     'tests/cartesian_product_test',
     'tests/hash_test',
+    'tests/serializer_test',
     'tests/map_difference_test',
     'tests/message',
     'tests/gossip',
@@ -215,7 +215,6 @@ scylla_tests = [
     'tests/flush_queue_test',
     'tests/dynamic_bitset_test',
     'tests/auth_test',
-    'tests/idl_test',
 ]
 
 apps = [
@@ -224,11 +223,7 @@ apps = [
 
 tests = scylla_tests
 
-other = [
-    'iotune',
-    ]
-
-all_artifacts = apps + tests + other
+all_artifacts = apps + tests
 
 arg_parser = argparse.ArgumentParser('Configure scylla')
 arg_parser.add_argument('--static', dest = 'static', action = 'store_const', default = '',
@@ -256,8 +251,6 @@ arg_parser.add_argument('--debuginfo', action = 'store', dest = 'debuginfo', typ
                         help = 'Enable(1)/disable(0)compiler debug information generation')
 arg_parser.add_argument('--static-stdc++', dest = 'staticcxx', action = 'store_true',
 			help = 'Link libgcc and libstdc++ statically')
-arg_parser.add_argument('--static-thrift', dest = 'staticthrift', action = 'store_true',
-			help = 'Link libthrift statically')
 arg_parser.add_argument('--tests-debuginfo', action = 'store', dest = 'tests_debuginfo', type = int, default = 0,
                         help = 'Enable(1)/disable(0)compiler debug information generation for tests')
 arg_parser.add_argument('--python', action = 'store', dest = 'python', default = 'python3',
@@ -267,6 +260,7 @@ add_tristate(arg_parser, name = 'xen', dest = 'xen', help = 'Xen support')
 args = arg_parser.parse_args()
 
 defines = []
+scylla_libs = '-llz4 -lsnappy -lz -lboost_thread -lcryptopp -lrt -lyaml-cpp -lboost_date_time'
 
 extra_cxxflags = {}
 
@@ -300,7 +294,6 @@ scylla_core = (['database.cc',
                  'sstables/partition.cc',
                  'sstables/filter.cc',
                  'sstables/compaction.cc',
-                 'sstables/compaction_strategy.cc',
                  'sstables/compaction_manager.cc',
                  'log.cc',
                  'transport/event.cc',
@@ -319,14 +312,10 @@ scylla_core = (['database.cc',
                  'cql3/functions/functions.cc',
                  'cql3/statements/cf_prop_defs.cc',
                  'cql3/statements/cf_statement.cc',
-                 'cql3/statements/authentication_statement.cc',
                  'cql3/statements/create_keyspace_statement.cc',
                  'cql3/statements/create_table_statement.cc',
-                 'cql3/statements/create_type_statement.cc',
-                 'cql3/statements/create_user_statement.cc',
                  'cql3/statements/drop_keyspace_statement.cc',
                  'cql3/statements/drop_table_statement.cc',
-                 'cql3/statements/drop_type_statement.cc',
                  'cql3/statements/schema_altering_statement.cc',
                  'cql3/statements/ks_prop_defs.cc',
                  'cql3/statements/modification_statement.cc',
@@ -342,18 +331,8 @@ scylla_core = (['database.cc',
                  'cql3/statements/create_index_statement.cc',
                  'cql3/statements/truncate_statement.cc',
                  'cql3/statements/alter_table_statement.cc',
-                 'cql3/statements/alter_user_statement.cc',
-                 'cql3/statements/drop_user_statement.cc',
-                 'cql3/statements/list_users_statement.cc',
-                 'cql3/statements/authorization_statement.cc',
-                 'cql3/statements/permission_altering_statement.cc',
-                 'cql3/statements/list_permissions_statement.cc',
-                 'cql3/statements/grant_statement.cc',
-                 'cql3/statements/revoke_statement.cc',
-                 'cql3/statements/alter_type_statement.cc',
                  'cql3/update_parameters.cc',
                  'cql3/ut_name.cc',
-                 'cql3/user_options.cc',
                  'thrift/handler.cc',
                  'thrift/server.cc',
                  'thrift/thrift_validation.cc',
@@ -389,7 +368,7 @@ scylla_core = (['database.cc',
                  'db/schema_tables.cc',
                  'db/commitlog/commitlog.cc',
                  'db/commitlog/commitlog_replayer.cc',
-                 'db/commitlog/commitlog_entry.cc',
+                 'db/serializer.cc',
                  'db/config.cc',
                  'db/index/secondary_index.cc',
                  'db/marshal/type_parser.cc',
@@ -403,8 +382,6 @@ scylla_core = (['database.cc',
                  'utils/rate_limiter.cc',
                  'utils/file_lock.cc',
                  'utils/dynamic_bitset.cc',
-                 'utils/managed_bytes.cc',
-                 'utils/exceptions.cc',
                  'gms/version_generator.cc',
                  'gms/versioned_value.cc',
                  'gms/gossiper.cc',
@@ -426,7 +403,6 @@ scylla_core = (['database.cc',
                  'locator/simple_strategy.cc',
                  'locator/local_strategy.cc',
                  'locator/network_topology_strategy.cc',
-                 'locator/everywhere_replication_strategy.cc',
                  'locator/token_metadata.cc',
                  'locator/locator.cc',
                  'locator/snitch_base.cc',
@@ -465,8 +441,6 @@ scylla_core = (['database.cc',
                  'auth/auth.cc',
                  'auth/authenticated_user.cc',
                  'auth/authenticator.cc',
-                 'auth/authorizer.cc',
-                 'auth/default_authorizer.cc',
                  'auth/data_resource.cc',
                  'auth/password_authenticator.cc',
                  'auth/permission.cc',
@@ -523,12 +497,6 @@ idls = ['idl/gossip_digest.idl.hh',
         'idl/paging_state.idl.hh',
         'idl/frozen_schema.idl.hh',
         'idl/partition_checksum.idl.hh',
-        'idl/replay_position.idl.hh',
-        'idl/truncation_record.idl.hh',
-        'idl/mutation.idl.hh',
-        'idl/query.idl.hh',
-        'idl/idl_test.idl.hh',
-        'idl/commitlog.idl.hh',
         ]
 
 scylla_tests_dependencies = scylla_core + api + idls + [
@@ -572,7 +540,6 @@ tests_not_using_seastar_test_framework = set([
     'tests/perf/perf_sstable',
     'tests/managed_vector_test',
     'tests/dynamic_bitset_test',
-    'tests/idl_test',
 ])
 
 for t in tests_not_using_seastar_test_framework:
@@ -682,8 +649,6 @@ if args.dpdk:
     seastar_flags += ['--enable-dpdk']
 elif args.dpdk_target:
     seastar_flags += ['--dpdk-target', args.dpdk_target]
-if args.staticcxx:
-    seastar_flags += ['--static-stdc++']
 
 seastar_cflags = args.user_cflags + " -march=nehalem"
 seastar_flags += ['--compiler', args.cxx, '--cflags=%s' % (seastar_cflags)]
@@ -717,7 +682,7 @@ for mode in build_modes:
 seastar_deps = 'practically_anything_can_change_so_lets_run_it_every_time_and_restat.'
 
 args.user_cflags += " " + pkg_config("--cflags", "jsoncpp")
-libs = "-lyaml-cpp -llz4 -lz -lsnappy " + pkg_config("--libs", "jsoncpp") + ' -lboost_filesystem' + ' -lcrypt' + ' -lboost_date_time'
+libs = "-lyaml-cpp -llz4 -lz -lsnappy " + pkg_config("--libs", "jsoncpp") + ' -lboost_filesystem' + ' -lcrypt'
 for pkg in pkgs:
     args.user_cflags += ' ' + pkg_config('--cflags', pkg)
     libs += ' ' + pkg_config('--libs', pkg)
@@ -725,10 +690,6 @@ user_cflags = args.user_cflags
 user_ldflags = args.user_ldflags
 if args.staticcxx:
     user_ldflags += " -static-libgcc -static-libstdc++"
-if args.staticthrift:
-    thrift_libs = "-Wl,-Bstatic -lthrift -Wl,-Bdynamic"
-else:
-    thrift_libs = "-lthrift"
 
 outdir = 'build'
 buildfile = 'build.ninja'
@@ -757,15 +718,12 @@ with open(buildfile, 'w') as f:
             command = seastar/json/json2code.py -f $in -o $out
             description = SWAGGER $out
         rule serializer
-            command = {python} ./idl-compiler.py --ns ser -f $in -o $out
+            command = ./idl-compiler.py --ns ser -f $in -o $out
             description = IDL compiler $out
         rule ninja
             command = {ninja} -C $subdir $target
             restat = 1
             description = NINJA $out
-        rule copy
-            command = cp $in $out
-            description = COPY $out
         ''').format(**globals()))
     for mode in build_modes:
         modeval = modes[mode]
@@ -802,8 +760,6 @@ with open(buildfile, 'w') as f:
         thrifts = set()
         antlr3_grammars = set()
         for binary in build_artifacts:
-            if binary in other:
-                continue
             srcs = deps[binary]
             objs = ['$builddir/' + mode + '/' + src.replace('.cc', '.o')
                     for src in srcs
@@ -839,14 +795,14 @@ with open(buildfile, 'w') as f:
                     f.write('build $builddir/{}/{}: {}.{} {} {}\n'.format(mode, binary, tests_link_rule, mode, str.join(' ', objs),
                                                                                      'seastar/build/{}/libseastar.a'.format(mode)))
                     if has_thrift:
-                        f.write('   libs =  {} -lboost_system $libs\n'.format(thrift_libs))
+                        f.write('   libs =  -lthrift -lboost_system $libs\n')
                     f.write('build $builddir/{}/{}_g: link.{} {} {}\n'.format(mode, binary, mode, str.join(' ', objs),
                                                                               'seastar/build/{}/libseastar.a'.format(mode)))
                 else:
                     f.write('build $builddir/{}/{}: link.{} {} {}\n'.format(mode, binary, mode, str.join(' ', objs),
                                                                             'seastar/build/{}/libseastar.a'.format(mode)))
                 if has_thrift:
-                    f.write('   libs =  {} -lboost_system $libs\n'.format(thrift_libs))
+                    f.write('   libs =  -lthrift -lboost_system $libs\n')
             for src in srcs:
                 if src.endswith('.cc'):
                     obj = '$builddir/' + mode + '/' + src.replace('.cc', '.o')
@@ -869,8 +825,7 @@ with open(buildfile, 'w') as f:
         for obj in compiles:
             src = compiles[obj]
             gen_headers = list(ragels.keys())
-            gen_headers += ['seastar/build/{}/gen/http/request_parser.hh'.format(mode)]
-            gen_headers += ['seastar/build/{}/gen/http/http_response_parser.hh'.format(mode)]
+            gen_headers += ['seastar/build/{}/http/request_parser.hh'.format(mode)]
             for th in thrifts:
                 gen_headers += th.headers('$builddir/{}/gen'.format(mode))
             for g in antlr3_grammars:
@@ -901,14 +856,10 @@ with open(buildfile, 'w') as f:
                                                                    grammar.source.rsplit('.', 1)[0]))
             for cc in grammar.sources('$builddir/{}/gen'.format(mode)):
                 obj = cc.replace('.cpp', '.o')
-                f.write('build {}: cxx.{} {} || {}\n'.format(obj, mode, cc, ' '.join(serializers)))
-        f.write('build seastar/build/{mode}/libseastar.a seastar/build/{mode}/apps/iotune/iotune seastar/build/{mode}/gen/http/request_parser.hh seastar/build/{mode}/gen/http/http_response_parser.hh: ninja {seastar_deps}\n'
-                .format(**locals()))
+                f.write('build {}: cxx.{} {}\n'.format(obj, mode, cc))
+        f.write('build seastar/build/{}/libseastar.a: ninja {}\n'.format(mode, seastar_deps))
         f.write('  subdir = seastar\n')
-        f.write('  target = build/{mode}/libseastar.a build/{mode}/apps/iotune/iotune build/{mode}/gen/http/request_parser.hh build/{mode}/gen/http/http_response_parser.hh\n'.format(**locals()))
-        f.write(textwrap.dedent('''\
-            build build/{mode}/iotune: copy seastar/build/{mode}/apps/iotune/iotune
-            ''').format(**locals()))
+        f.write('  target = build/{}/libseastar.a\n'.format(mode))
     f.write('build {}: phony\n'.format(seastar_deps))
     f.write(textwrap.dedent('''\
         rule configure
@@ -919,6 +870,10 @@ with open(buildfile, 'w') as f:
             command = find -name '*.[chS]' -o -name "*.cc" -o -name "*.hh" | cscope -bq -i-
             description = CSCOPE
         build cscope: cscope
+        rule request_parser_hh
+           command = {ninja} -C seastar build/release/gen/http/request_parser.hh build/debug/gen/http/request_parser.hh
+           description = GEN seastar/http/request_parser.hh
+        build seastar/build/release/http/request_parser.hh seastar/build/debug/http/request_parser.hh: request_parser_hh
         rule clean
             command = rm -rf build
             description = CLEAN

converting_mutation_partition_applier.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright (C) 2015 Cloudius Systems, Ltd.
  */
 
 /*
@@ -75,7 +75,7 @@ public:
     }
 
     virtual void accept_static_cell(column_id id, atomic_cell_view cell) override {
-        const column_mapping_entry& col = _visited_column_mapping.static_column_at(id);
+        const column_mapping::column& col = _visited_column_mapping.static_column_at(id);
         const column_definition* def = _p_schema.get_column_definition(col.name());
         if (def) {
             accept_cell(_p._static_row, column_kind::static_column, *def, col.type(), cell);
@@ -83,7 +83,7 @@ public:
     }
 
     virtual void accept_static_cell(column_id id, collection_mutation_view collection) override {
-        const column_mapping_entry& col = _visited_column_mapping.static_column_at(id);
+        const column_mapping::column& col = _visited_column_mapping.static_column_at(id);
         const column_definition* def = _p_schema.get_column_definition(col.name());
         if (def) {
             accept_cell(_p._static_row, column_kind::static_column, *def, col.type(), collection);
@@ -102,7 +102,7 @@ public:
     }
 
     virtual void accept_row_cell(column_id id, atomic_cell_view cell) override {
-        const column_mapping_entry& col = _visited_column_mapping.regular_column_at(id);
+        const column_mapping::column& col = _visited_column_mapping.regular_column_at(id);
         const column_definition* def = _p_schema.get_column_definition(col.name());
         if (def) {
             accept_cell(_current_row->cells(), column_kind::regular_column, *def, col.type(), cell);
@@ -110,7 +110,7 @@ public:
     }
 
     virtual void accept_row_cell(column_id id, collection_mutation_view collection) override {
-        const column_mapping_entry& col = _visited_column_mapping.regular_column_at(id);
+        const column_mapping::column& col = _visited_column_mapping.regular_column_at(id);
         const column_definition* def = _p_schema.get_column_definition(col.name());
         if (def) {
             accept_cell(_current_row->cells(), column_kind::regular_column, *def, col.type(), collection);

cql3/Cql.g

@@ -26,7 +26,6 @@ options {
 @parser::namespace{cql3_parser}
 
 @lexer::includes {
-#include "cql3/error_collector.hh"
 #include "cql3/error_listener.hh"
 }
 
@@ -37,9 +36,6 @@ options {
 #include "cql3/statements/drop_keyspace_statement.hh"
 #include "cql3/statements/create_index_statement.hh"
 #include "cql3/statements/create_table_statement.hh"
-#include "cql3/statements/create_type_statement.hh"
-#include "cql3/statements/drop_type_statement.hh"
-#include "cql3/statements/alter_type_statement.hh"
 #include "cql3/statements/property_definitions.hh"
 #include "cql3/statements/drop_table_statement.hh"
 #include "cql3/statements/truncate_statement.hh"
@@ -49,13 +45,6 @@ options {
 #include "cql3/statements/index_prop_defs.hh"
 #include "cql3/statements/use_statement.hh"
 #include "cql3/statements/batch_statement.hh"
-#include "cql3/statements/create_user_statement.hh"
-#include "cql3/statements/alter_user_statement.hh"
-#include "cql3/statements/drop_user_statement.hh"
-#include "cql3/statements/list_users_statement.hh"
-#include "cql3/statements/grant_statement.hh"
-#include "cql3/statements/revoke_statement.hh"
-#include "cql3/statements/list_permissions_statement.hh"
 #include "cql3/statements/index_target.hh"
 #include "cql3/statements/ks_prop_defs.hh"
 #include "cql3/selection/raw_selector.hh"
@@ -118,13 +107,10 @@ struct uninitialized {
 }
 
 @context {
-    using collector_type = cql3::error_collector<ComponentType, ExceptionBaseType::TokenType, ExceptionBaseType>;
-    using listener_type = cql3::error_listener<ComponentType, ExceptionBaseType>;
-
+    using listener_type = cql3::error_listener<RecognizerType>;
     listener_type* listener;
 
     std::vector<::shared_ptr<cql3::column_identifier>> _bind_variables;
-    std::vector<std::unique_ptr<TokenType>> _missing_tokens;
 
     // Can't use static variable, since it needs to be defined out-of-line
     static const std::unordered_set<sstring>& _reserved_type_names() {
@@ -174,26 +160,15 @@ struct uninitialized {
 
     void displayRecognitionError(ANTLR_UINT8** token_names, ExceptionBaseType* ex)
     {
-        listener->syntax_error(*this, token_names, ex);
+        std::stringstream msg;
+        ex->displayRecognitionError(token_names, msg);
+        listener->syntax_error(*this, msg.str());
     }
 
     void add_recognition_error(const sstring& msg) {
         listener->syntax_error(*this, msg);
     }
 
-    bool is_eof_token(CommonTokenType token) const
-    {
-        return token == CommonTokenType::TOKEN_EOF;
-    }
-
-    std::string token_text(const TokenType* token)
-    {
-        if (!token) {
-            return "";
-        }
-        return token->getText();
-    }
-
     std::map<sstring, sstring> convert_property_map(shared_ptr<cql3::maps::literal> map) {
         if (!map || map->entries.empty()) {
             return std::map<sstring, sstring>{};
@@ -240,13 +215,6 @@ struct uninitialized {
         }
         operations.emplace_back(std::move(key), std::move(update));
     }
-
-    TokenType* getMissingSymbol(IntStreamType* istream, ExceptionBaseType* e,
-                                ANTLR_UINT32 expectedTokenType, BitsetListType* follow) {
-        auto token = BaseType::getMissingSymbol(istream, e, expectedTokenType, follow);
-        _missing_tokens.emplace_back(token);
-        return token;
-    }
 }
 
 @lexer::namespace{cql3_parser}
@@ -264,8 +232,7 @@ struct uninitialized {
 }
 
 @lexer::context {
-    using collector_type = cql3::error_collector<ComponentType, ExceptionBaseType::TokenType, ExceptionBaseType>;
-    using listener_type = cql3::error_listener<ComponentType, ExceptionBaseType>;
+    using listener_type = cql3::error_listener<RecognizerType>;
 
     listener_type* listener;
 
@@ -275,20 +242,9 @@ struct uninitialized {
 
     void displayRecognitionError(ANTLR_UINT8** token_names, ExceptionBaseType* ex)
     {
-        listener->syntax_error(*this, token_names, ex);
-    }
-
-    bool is_eof_token(CommonTokenType token) const
-    {
-        return token == CommonTokenType::TOKEN_EOF;
-    }
-
-    std::string token_text(const TokenType* token) const
-    {
-        if (!token) {
-            return "";
-        }
-        return std::to_string(int(*token));
+        std::stringstream msg;
+        ex->displayRecognitionError(token_names, msg);
+        listener->syntax_error(*this, msg.str());
     }
 }
 
@@ -318,7 +274,6 @@ cqlStatement returns [shared_ptr<parsed_statement> stmt]
     | st14=alterTableStatement         { $stmt = st14; }
 #if 0
     | st15=alterKeyspaceStatement      { $stmt = st15; }
-#endif
     | st16=grantStatement              { $stmt = st16; }
     | st17=revokeStatement             { $stmt = st17; }
     | st18=listPermissionsStatement    { $stmt = st18; }
@@ -326,14 +281,11 @@ cqlStatement returns [shared_ptr<parsed_statement> stmt]
     | st20=alterUserStatement          { $stmt = st20; }
     | st21=dropUserStatement           { $stmt = st21; }
     | st22=listUsersStatement          { $stmt = st22; }
-#if 0
     | st23=createTriggerStatement      { $stmt = st23; }
     | st24=dropTriggerStatement        { $stmt = st24; }
-#endif
     | st25=createTypeStatement         { $stmt = st25; }
     | st26=alterTypeStatement          { $stmt = st26; }
     | st27=dropTypeStatement           { $stmt = st27; }
-#if 0
     | st28=createFunctionStatement     { $stmt = st28; }
     | st29=dropFunctionStatement       { $stmt = st29; }
     | st30=createAggregateStatement    { $stmt = st30; }
@@ -743,6 +695,7 @@ cfamOrdering[shared_ptr<cql3::statements::create_table_statement::raw_statement>
     ;
 
 
+#if 0
 /**
  * CREATE TYPE foo (
  *    <name1> <type1>,
@@ -750,16 +703,17 @@ cfamOrdering[shared_ptr<cql3::statements::create_table_statement::raw_statement>
  *    ....
  * )
  */
-createTypeStatement returns [::shared_ptr<create_type_statement> expr]
-    @init { bool if_not_exists = false; }
-    : K_CREATE K_TYPE (K_IF K_NOT K_EXISTS { if_not_exists = true; } )?
-         tn=userTypeName { $expr = ::make_shared<create_type_statement>(tn, if_not_exists); }
+createTypeStatement returns [CreateTypeStatement expr]
+    @init { boolean ifNotExists = false; }
+    : K_CREATE K_TYPE (K_IF K_NOT K_EXISTS { ifNotExists = true; } )?
+         tn=userTypeName { $expr = new CreateTypeStatement(tn, ifNotExists); }
          '(' typeColumns[expr] ( ',' typeColumns[expr]? )* ')'
     ;
 
-typeColumns[::shared_ptr<create_type_statement> expr]
-    : k=ident v=comparatorType { $expr->add_definition(k, v); }
+typeColumns[CreateTypeStatement expr]
+    : k=ident v=comparatorType { $expr.addDefinition(k, v); }
     ;
+#endif
 
 
 /**
@@ -848,27 +802,26 @@ alterTableStatement returns [shared_ptr<alter_table_statement> expr]
     }
     ;
 
+#if 0
 /**
  * ALTER TYPE <name> ALTER <field> TYPE <newtype>;
  * ALTER TYPE <name> ADD <field> <newtype>;
  * ALTER TYPE <name> RENAME <field> TO <newtype> AND ...;
  */
-alterTypeStatement returns [::shared_ptr<alter_type_statement> expr]
+alterTypeStatement returns [AlterTypeStatement expr]
     : K_ALTER K_TYPE name=userTypeName
-          ( K_ALTER f=ident K_TYPE v=comparatorType { $expr = ::make_shared<alter_type_statement::add_or_alter>(name, false, f, v); }
-          | K_ADD   f=ident v=comparatorType        { $expr = ::make_shared<alter_type_statement::add_or_alter>(name, true, f, v); }
+          ( K_ALTER f=ident K_TYPE v=comparatorType { $expr = AlterTypeStatement.alter(name, f, v); }
+          | K_ADD   f=ident v=comparatorType        { $expr = AlterTypeStatement.addition(name, f, v); }
           | K_RENAME
-               { $expr = ::make_shared<alter_type_statement::renames>(name); }
-               renames[{ static_pointer_cast<alter_type_statement::renames>($expr) }]
+               { Map<ColumnIdentifier, ColumnIdentifier> renames = new HashMap<ColumnIdentifier, ColumnIdentifier>(); }
+                 id1=ident K_TO toId1=ident { renames.put(id1, toId1); }
+                 ( K_AND idn=ident K_TO toIdn=ident { renames.put(idn, toIdn); } )*
+               { $expr = AlterTypeStatement.renames(name, renames); }
           )
     ;
+#endif
 
 
-renames[::shared_ptr<alter_type_statement::renames> expr]
-    : fromId=ident K_TO toId=ident { $expr->add_rename(fromId, toId); }
-      ( K_AND renames[$expr] )?
-    ;
-
 /**
  * DROP KEYSPACE [IF EXISTS] <KSP>;
  */
@@ -885,15 +838,15 @@ dropTableStatement returns [::shared_ptr<drop_table_statement> stmt]
     : K_DROP K_COLUMNFAMILY (K_IF K_EXISTS { if_exists = true; } )? cf=columnFamilyName { $stmt = ::make_shared<drop_table_statement>(cf, if_exists); }
     ;
 
+#if 0
 /**
  * DROP TYPE <name>;
  */
-dropTypeStatement returns [::shared_ptr<drop_type_statement> stmt]
-    @init { bool if_exists = false; }
-    : K_DROP K_TYPE (K_IF K_EXISTS { if_exists = true; } )? name=userTypeName { $stmt = ::make_shared<drop_type_statement>(name, if_exists); }
+dropTypeStatement returns [DropTypeStatement stmt]
+    @init { boolean ifExists = false; }
+    : K_DROP K_TYPE (K_IF K_EXISTS { ifExists = true; } )? name=userTypeName { $stmt = new DropTypeStatement(name, ifExists); }
     ;
 
-#if 0
 /**
  * DROP INDEX [IF EXISTS] <INDEX_NAME>
  */
@@ -911,118 +864,120 @@ truncateStatement returns [::shared_ptr<truncate_statement> stmt]
     : K_TRUNCATE (K_COLUMNFAMILY)? cf=columnFamilyName { $stmt = ::make_shared<truncate_statement>(cf); }
     ;
 
+#if 0
 /**
  * GRANT <permission> ON <resource> TO <username>
  */
-grantStatement returns [::shared_ptr<grant_statement> stmt]
+grantStatement returns [GrantStatement stmt]
     : K_GRANT
           permissionOrAll
       K_ON
           resource
       K_TO
           username
-      { $stmt = ::make_shared<grant_statement>($permissionOrAll.perms, $resource.res, $username.text); } 
+      { $stmt = new GrantStatement($permissionOrAll.perms, $resource.res, $username.text); }
     ;
 
 /**
  * REVOKE <permission> ON <resource> FROM <username>
  */
-revokeStatement returns [::shared_ptr<revoke_statement> stmt]
+revokeStatement returns [RevokeStatement stmt]
     : K_REVOKE
           permissionOrAll
       K_ON
           resource
       K_FROM
           username
-      { $stmt = ::make_shared<revoke_statement>($permissionOrAll.perms, $resource.res, $username.text); } 
+      { $stmt = new RevokeStatement($permissionOrAll.perms, $resource.res, $username.text); }
     ;
 
-listPermissionsStatement returns [::shared_ptr<list_permissions_statement> stmt]
+listPermissionsStatement returns [ListPermissionsStatement stmt]
     @init {
-		std::experimental::optional<auth::data_resource> r;
-		std::experimental::optional<sstring> u;
-		bool recursive = true;
+        IResource resource = null;
+        String username = null;
+        boolean recursive = true;
     }
     : K_LIST
           permissionOrAll
-      ( K_ON resource { r = $resource.res; } )?
-      ( K_OF username { u = sstring($username.text); } )?
+      ( K_ON resource { resource = $resource.res; } )?
+      ( K_OF username { username = $username.text; } )?
       ( K_NORECURSIVE { recursive = false; } )?
-      { $stmt = ::make_shared<list_permissions_statement>($permissionOrAll.perms, std::move(r), std::move(u), recursive); } 
+      { $stmt = new ListPermissionsStatement($permissionOrAll.perms, resource, username, recursive); }
     ;
 
-permission returns [auth::permission perm]
+permission returns [Permission perm]
     : p=(K_CREATE | K_ALTER | K_DROP | K_SELECT | K_MODIFY | K_AUTHORIZE)
-    { $perm = auth::permissions::from_string($p.text); }
+    { $perm = Permission.valueOf($p.text.toUpperCase()); }
     ;
 
-permissionOrAll returns [auth::permission_set perms]
-    : K_ALL ( K_PERMISSIONS )?       { $perms = auth::permissions::ALL_DATA; }
-    | p=permission ( K_PERMISSION )? { $perms = auth::permission_set::from_mask(auth::permission_set::mask_for($p.perm)); }
+permissionOrAll returns [Set<Permission> perms]
+    : K_ALL ( K_PERMISSIONS )?       { $perms = Permission.ALL_DATA; }
+    | p=permission ( K_PERMISSION )? { $perms = EnumSet.of($p.perm); }
     ;
 
-resource returns [auth::data_resource res]
+resource returns [IResource res]
     : r=dataResource { $res = $r.res; }
     ;
 
-dataResource returns [auth::data_resource res]
-    : K_ALL K_KEYSPACES { $res = auth::data_resource(); }
-    | K_KEYSPACE ks = keyspaceName { $res = auth::data_resource($ks.id); }
+dataResource returns [DataResource res]
+    : K_ALL K_KEYSPACES { $res = DataResource.root(); }
+    | K_KEYSPACE ks = keyspaceName { $res = DataResource.keyspace($ks.id); }
     | ( K_COLUMNFAMILY )? cf = columnFamilyName
-      { $res = auth::data_resource($cf.name->get_keyspace(), $cf.name->get_column_family()); }
+      { $res = DataResource.columnFamily($cf.name.getKeyspace(), $cf.name.getColumnFamily()); }
     ;
 
 /**
  * CREATE USER [IF NOT EXISTS] <username> [WITH PASSWORD <password>] [SUPERUSER|NOSUPERUSER]
  */
-createUserStatement returns [::shared_ptr<create_user_statement> stmt]
+createUserStatement returns [CreateUserStatement stmt]
     @init {
-    	auto opts = ::make_shared<cql3::user_options>();
-        bool superuser = false;
-        bool ifNotExists = false;
+        UserOptions opts = new UserOptions();
+        boolean superuser = false;
+        boolean ifNotExists = false;
     }
     : K_CREATE K_USER (K_IF K_NOT K_EXISTS { ifNotExists = true; })? username
       ( K_WITH userOptions[opts] )?
       ( K_SUPERUSER { superuser = true; } | K_NOSUPERUSER { superuser = false; } )?
-      { $stmt = ::make_shared<create_user_statement>($username.text, std::move(opts), superuser, ifNotExists); }
+      { $stmt = new CreateUserStatement($username.text, opts, superuser, ifNotExists); }
     ;
 
 /**
  * ALTER USER <username> [WITH PASSWORD <password>] [SUPERUSER|NOSUPERUSER]
  */
-alterUserStatement returns [::shared_ptr<alter_user_statement> stmt]
+alterUserStatement returns [AlterUserStatement stmt]
     @init {
-    	auto opts = ::make_shared<cql3::user_options>();
-    	std::experimental::optional<bool> superuser;
+        UserOptions opts = new UserOptions();
+        Boolean superuser = null;
     }
     : K_ALTER K_USER username
       ( K_WITH userOptions[opts] )?
       ( K_SUPERUSER { superuser = true; } | K_NOSUPERUSER { superuser = false; } )?
-      { $stmt = ::make_shared<alter_user_statement>($username.text, std::move(opts), std::move(superuser)); }
+      { $stmt = new AlterUserStatement($username.text, opts, superuser); }
     ;
 
 /**
  * DROP USER [IF EXISTS] <username>
  */
-dropUserStatement returns [::shared_ptr<drop_user_statement> stmt]
-    @init { bool ifExists = false; }
-    : K_DROP K_USER (K_IF K_EXISTS { ifExists = true; })? username { $stmt = ::make_shared<drop_user_statement>($username.text, ifExists); }
+dropUserStatement returns [DropUserStatement stmt]
+    @init { boolean ifExists = false; }
+    : K_DROP K_USER (K_IF K_EXISTS { ifExists = true; })? username { $stmt = new DropUserStatement($username.text, ifExists); }
     ;
 
 /**
  * LIST USERS
  */
-listUsersStatement returns [::shared_ptr<list_users_statement> stmt]
-    : K_LIST K_USERS { $stmt = ::make_shared<list_users_statement>(); }
+listUsersStatement returns [ListUsersStatement stmt]
+    : K_LIST K_USERS { $stmt = new ListUsersStatement(); }
     ;
 
-userOptions[::shared_ptr<cql3::user_options> opts]
+userOptions[UserOptions opts]
     : userOption[opts]
     ;
 
-userOption[::shared_ptr<cql3::user_options> opts]
-    : k=K_PASSWORD v=STRING_LITERAL { opts->put($k.text, $v.text); }
+userOption[UserOptions opts]
+    : k=K_PASSWORD v=STRING_LITERAL { opts.put($k.text, $v.text); }
     ;
+#endif
 
 /** DEFINITIONS **/
 
@@ -1201,8 +1156,7 @@ columnOperation[operations_type& operations]
 
 columnOperationDifferentiator[operations_type& operations, ::shared_ptr<cql3::column_identifier::raw> key]
     : '=' normalColumnOperation[operations, key]
-    | '[' k=term ']' specializedColumnOperation[operations, key, k, false]
-    | '[' K_SCYLLA_TIMEUUID_LIST_INDEX '(' k=term ')' ']' specializedColumnOperation[operations, key, k, true]
+    | '[' k=term ']' specializedColumnOperation[operations, key, k]
     ;
 
 normalColumnOperation[operations_type& operations, ::shared_ptr<cql3::column_identifier::raw> key]
@@ -1244,12 +1198,11 @@ normalColumnOperation[operations_type& operations, ::shared_ptr<cql3::column_ide
 specializedColumnOperation[std::vector<std::pair<shared_ptr<cql3::column_identifier::raw>,
                                                  shared_ptr<cql3::operation::raw_update>>>& operations,
                            shared_ptr<cql3::column_identifier::raw> key,
-                           shared_ptr<cql3::term::raw> k,
-                           bool by_uuid]
+                           shared_ptr<cql3::term::raw> k]
 
     : '=' t=term
       {
-          add_raw_update(operations, key, make_shared<cql3::operation::set_element>(k, t, by_uuid));
+          add_raw_update(operations, key, make_shared<cql3::operation::set_element>(k, t));
       }
     ;
 
@@ -1429,10 +1382,12 @@ tuple_type returns [shared_ptr<cql3::cql3_type::raw> t]
       '>' { $t = cql3::cql3_type::raw::tuple(std::move(types)); }
     ;
 
+#if 0
 username
     : IDENT
     | STRING_LITERAL
     ;
+#endif
 
 // Basically the same as cident, but we need to exlude existing CQL3 types
 // (which for some reason are not reserved otherwise)
@@ -1611,8 +1566,6 @@ K_OR:          O R;
 K_REPLACE:     R E P L A C E;
 K_DETERMINISTIC: D E T E R M I N I S T I C;
 
-K_SCYLLA_TIMEUUID_LIST_INDEX: S C Y L L A '_' T I M E U U I D '_' L I S T '_' I N D E X;
-
 // Case-insensitive alpha characters
 fragment A: ('a'|'A');
 fragment B: ('b'|'B');
@@ -1658,17 +1611,20 @@ STRING_LITERAL
         setText(txt);
     }
     :
+// FIXME:
+#if 0
       /* pg-style string literal */
       (
-        '$' '$'
-        (
-          (c=~('$') { txt.push_back(c); })
-          |
-          ('$' (c=~('$') { txt.push_back('$'); txt.push_back(c); }))
+        '\$' '\$'
+        ( /* collect all input until '$$' is reached again */
+          {  (input.size() - input.index() > 1)
+               && !"$$".equals(input.substring(input.index(), input.index() + 1)) }?
+             => c=. { txt.appendCodePoint(c); }
         )*
-        '$' '$'
+        '\$' '\$'
       )
       |
+#endif
       /* conventional quoted string literal */
       (
         '\'' (c=~('\'') { txt.push_back(c);} | '\'' '\'' { txt.push_back('\''); })* '\''

cql3/abstract_marker.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/abstract_marker.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/assignment_testable.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2014 ScyllaDB
+ * Copyright 2014 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/attributes.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/attributes.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/cf_name.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/cf_name.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/column_condition.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/column_condition.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -737,7 +737,7 @@ public:
         /** A condition on a collection element. For example: "IF col['key'] = 'foo'" */
         static ::shared_ptr<raw> collection_condition(::shared_ptr<term::raw> value, ::shared_ptr<term::raw> collection_element,
                 const operator_type& op) {
-            return ::make_shared<raw>(std::move(value), std::vector<::shared_ptr<term::raw>>{}, ::shared_ptr<abstract_marker::in_raw>{}, std::move(collection_element), op);
+            return ::make_shared<raw>(std::move(value), std::vector<::shared_ptr<term::raw>>{}, ::shared_ptr<abstract_marker::in_raw>{}, std::move(collection_element), operator_type::IN);
         }
 
         /** An IN condition on a collection element. For example: "IF col['key'] IN ('foo', 'bar', ...)" */

cql3/column_identifier.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*
@@ -121,7 +121,3 @@ column_identifier::new_selector_factory(database& db, schema_ptr schema, std::ve
 }
 
 }
-
-bool cql3::column_identifier::text_comparator::operator()(const cql3::column_identifier& c1, const cql3::column_identifier& c2) const {
-    return c1.text() < c2.text();
-}

cql3/column_identifier.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -61,11 +61,6 @@ public:
 private:
     sstring _text;
 public:
-    // less comparator sorting by text
-    struct text_comparator {
-        bool operator()(const column_identifier& c1, const column_identifier& c2) const;
-    };
-
     column_identifier(sstring raw_text, bool keep_case);
 
     column_identifier(bytes bytes_, data_type type);

cql3/column_specification.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/constants.cc

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/constants.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/cql3_type.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 ScyllaDB
+ * Copyright (C) 2014 Cloudius Systems, Ltd.
  */
 
 /*
@@ -148,7 +148,7 @@ public:
         try {
             auto&& ks = db.find_keyspace(_name.get_keyspace());
             try {
-                auto&& type = ks.metadata()->user_types()->get_type(_name.get_user_type_name());
+                auto&& type = ks._user_types.get_type(_name.get_user_type_name());
                 if (!_frozen) {
                     throw exceptions::invalid_request_exception("Non-frozen User-Defined types are not supported, please use frozen<>");
                 }

cql3/cql3_type.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  *
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

cql3/cql_statement.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2014 ScyllaDB
+ * Copyright 2014 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -70,7 +70,7 @@ public:
      *
      * @param state the current client state
      */
-    virtual future<> check_access(const service::client_state& state) = 0;
+    virtual void check_access(const service::client_state& state) = 0;
 
     /**
      * Perform additional validation required by the statment.

cql3/error_collector.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -50,8 +50,8 @@ namespace cql3 {
 /**
  * <code>ErrorListener</code> that collect and enhance the errors send by the CQL lexer and parser.
  */
-template<typename RecognizerType, typename TokenType, typename ExceptionBaseType>
-class error_collector : public error_listener<RecognizerType, ExceptionBaseType> {
+template<typename Recognizer>
+class error_collector : public error_listener<Recognizer> {
     /**
      * The offset of the first token of the snippet.
      */
@@ -81,19 +81,25 @@ public:
      */
     error_collector(const sstring_view& query) : _query(query) {}
 
-    virtual void syntax_error(RecognizerType& recognizer, ANTLR_UINT8** token_names, ExceptionBaseType* ex) override {
-        auto hdr = get_error_header(ex);
-        auto msg = get_error_message(recognizer, ex, token_names);
-        std::stringstream result;
-        result << hdr << ' ' << msg;
+    virtual void syntax_error(Recognizer& recognizer, const std::vector<sstring>& token_names) override {
+        // FIXME: stub
+        syntax_error(recognizer, "Parsing failed, detailed description construction not implemented yet");
 #if 0
+        String hdr = recognizer.getErrorHeader(e);
+        String msg = recognizer.getErrorMessage(e, tokenNames);
+
+        StringBuilder builder = new StringBuilder().append(hdr)
+                .append(' ')
+                .append(msg);
+
         if (recognizer instanceof Parser)
             appendQuerySnippet((Parser) recognizer, builder);
+
+        errorMsgs.add(builder.toString());
 #endif
-        _error_msgs.emplace_back(result.str());
     }
 
-    virtual void syntax_error(RecognizerType& recognizer, const sstring& msg) override {
+    virtual void syntax_error(Recognizer& recognizer, const sstring& msg) override {
         _error_msgs.emplace_back(msg);
     }
 
@@ -108,60 +114,6 @@ public:
         }
     }
 
-private:
-    std::string get_error_header(ExceptionBaseType* ex) {
-        std::stringstream result;
-        result << "line " << ex->get_line() << ":" << ex->get_charPositionInLine();
-        return result.str();
-    }
-
-    std::string get_error_message(RecognizerType& recognizer, ExceptionBaseType* ex, ANTLR_UINT8** token_names)
-    {
-        using namespace antlr3;
-        std::stringstream msg;
-        switch (ex->getType()) {
-        case ExceptionType::UNWANTED_TOKEN_EXCEPTION: {
-            msg << "extraneous input " << get_token_error_display(recognizer, ex->get_token());
-            if (token_names != nullptr) {
-                std::string token_name;
-                if (recognizer.is_eof_token(ex->get_expecting())) {
-                    token_name = "EOF";
-                } else {
-                    token_name = reinterpret_cast<const char*>(token_names[ex->get_expecting()]);
-                }
-                msg << " expecting " << token_name;
-            }
-            break;
-        }
-        case ExceptionType::MISSING_TOKEN_EXCEPTION: {
-            std::string token_name;
-            if (token_names == nullptr) {
-                token_name = "(" + std::to_string(ex->get_expecting()) + ")";
-            } else {
-                if (recognizer.is_eof_token(ex->get_expecting())) {
-                    token_name = "EOF";
-                } else {
-                    token_name = reinterpret_cast<const char*>(token_names[ex->get_expecting()]);
-                }
-            }
-            msg << "missing " << token_name << " at " << get_token_error_display(recognizer, ex->get_token());
-            break;
-        }
-        case ExceptionType::NO_VIABLE_ALT_EXCEPTION: {
-            msg << "no viable alternative at input " << get_token_error_display(recognizer, ex->get_token());
-            break;
-        }
-        default:
-            ex->displayRecognitionError(token_names, msg);
-        }
-        return msg.str();
-    }
-
-    std::string get_token_error_display(RecognizerType& recognizer, const TokenType* token)
-    {
-        return "'" + recognizer.token_text(token) + "'";
-    }
-
 #if 0
 
     /**

cql3/error_listener.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -41,18 +41,17 @@
 
 #pragma once
 
-#include <seastar/core/sstring.hh>
-#include <antlr3.hpp>
+#include <vector>
+#include "core/sstring.hh"
 
 namespace cql3 {
 
 /**
  * Listener used to collect the syntax errors emitted by the Lexer and Parser.
  */
-template<typename RecognizerType, typename ExceptionBaseType>
+template<typename RecognizerType>
 class error_listener {
 public:
-
     /**
      * Invoked when a syntax error occurs.
      *
@@ -60,7 +59,7 @@ public:
      * @param tokenNames the token names
      * @param e the exception
      */
-    virtual void syntax_error(RecognizerType& recognizer, ANTLR_UINT8** token_names, ExceptionBaseType* ex) = 0;
+    virtual void syntax_error(RecognizerType& recognizer, const std::vector<sstring>& token_names) = 0;
 
     /**
      * Invoked when a syntax error with a specified message occurs.

cql3/functions/abstract_function.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2014 ScyllaDB
+ * Copyright 2014 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/functions/aggregate_fcts.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2014 ScyllaDB
+ * Copyright 2014 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*
@@ -58,10 +58,10 @@ public:
     virtual void reset() override {
         _count = 0;
     }
-    virtual opt_bytes compute(cql_serialization_format sf) override {
+    virtual opt_bytes compute(serialization_format sf) override {
         return long_type->decompose(_count);
     }
-    virtual void add_input(cql_serialization_format sf, const std::vector<opt_bytes>& values) override {
+    virtual void add_input(serialization_format sf, const std::vector<opt_bytes>& values) override {
         ++_count;
     }
 };
@@ -83,10 +83,10 @@ public:
     virtual void reset() override {
         _sum = {};
     }
-    virtual opt_bytes compute(cql_serialization_format sf) override {
+    virtual opt_bytes compute(serialization_format sf) override {
         return data_type_for<Type>()->decompose(_sum);
     }
-    virtual void add_input(cql_serialization_format sf, const std::vector<opt_bytes>& values) override {
+    virtual void add_input(serialization_format sf, const std::vector<opt_bytes>& values) override {
         if (!values[0]) {
             return;
         }
@@ -120,14 +120,14 @@ public:
         _sum = {};
         _count = 0;
     }
-    virtual opt_bytes compute(cql_serialization_format sf) override {
+    virtual opt_bytes compute(serialization_format sf) override {
         Type ret = 0;
         if (_count) {
             ret = _sum / _count;
         }
         return data_type_for<Type>()->decompose(ret);
     }
-    virtual void add_input(cql_serialization_format sf, const std::vector<opt_bytes>& values) override {
+    virtual void add_input(serialization_format sf, const std::vector<opt_bytes>& values) override {
         if (!values[0]) {
             return;
         }
@@ -159,13 +159,13 @@ public:
     virtual void reset() override {
         _max = {};
     }
-    virtual opt_bytes compute(cql_serialization_format sf) override {
+    virtual opt_bytes compute(serialization_format sf) override {
         if (!_max) {
             return {};
         }
         return data_type_for<Type>()->decompose(*_max);
     }
-    virtual void add_input(cql_serialization_format sf, const std::vector<opt_bytes>& values) override {
+    virtual void add_input(serialization_format sf, const std::vector<opt_bytes>& values) override {
         if (!values[0]) {
             return;
         }
@@ -206,13 +206,13 @@ public:
     virtual void reset() override {
         _min = {};
     }
-    virtual opt_bytes compute(cql_serialization_format sf) override {
+    virtual opt_bytes compute(serialization_format sf) override {
         if (!_min) {
             return {};
         }
         return data_type_for<Type>()->decompose(*_min);
     }
-    virtual void add_input(cql_serialization_format sf, const std::vector<opt_bytes>& values) override {
+    virtual void add_input(serialization_format sf, const std::vector<opt_bytes>& values) override {
         if (!values[0]) {
             return;
         }
@@ -255,10 +255,10 @@ public:
     virtual void reset() override {
         _count = 0;
     }
-    virtual opt_bytes compute(cql_serialization_format sf) override {
+    virtual opt_bytes compute(serialization_format sf) override {
         return long_type->decompose(_count);
     }
-    virtual void add_input(cql_serialization_format sf, const std::vector<opt_bytes>& values) override {
+    virtual void add_input(serialization_format sf, const std::vector<opt_bytes>& values) override {
         if (!values[0]) {
             return;
         }

cql3/functions/aggregate_function.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  *
- * Copyright (C) 2014 ScyllaDB
+ * Copyright 2014 Cloudius Systems
  */
 
 /*
@@ -77,7 +77,7 @@ public:
          * @param protocol_version native protocol version
          * @param values the values to add to the aggregate.
          */
-        virtual void add_input(cql_serialization_format sf, const std::vector<opt_bytes>& values) = 0;
+        virtual void add_input(serialization_format sf, const std::vector<opt_bytes>& values) = 0;
 
         /**
          * Computes and returns the aggregate current value.
@@ -85,7 +85,7 @@ public:
          * @param protocol_version native protocol version
          * @return the aggregate current value.
          */
-        virtual opt_bytes compute(cql_serialization_format sf) = 0;
+        virtual opt_bytes compute(serialization_format sf) = 0;
 
         /**
          * Reset this aggregate.

cql3/functions/bytes_conversion_fcts.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  *
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*
@@ -58,7 +58,7 @@ shared_ptr<function>
 make_to_blob_function(data_type from_type) {
     auto name = from_type->as_cql3_type()->to_string() + "asblob";
     return make_native_scalar_function<true>(name, bytes_type, { from_type },
-            [] (cql_serialization_format sf, const std::vector<bytes_opt>& parameters) {
+            [] (serialization_format sf, const std::vector<bytes_opt>& parameters) {
         return parameters[0];
     });
 }
@@ -68,7 +68,7 @@ shared_ptr<function>
 make_from_blob_function(data_type to_type) {
     sstring name = sstring("blobas") + to_type->as_cql3_type()->to_string();
     return make_native_scalar_function<true>(name, to_type, { bytes_type },
-            [name, to_type] (cql_serialization_format sf, const std::vector<bytes_opt>& parameters) -> bytes_opt {
+            [name, to_type] (serialization_format sf, const std::vector<bytes_opt>& parameters) -> bytes_opt {
         auto&& val = parameters[0];
         if (!val) {
             return val;
@@ -89,7 +89,7 @@ inline
 shared_ptr<function>
 make_varchar_as_blob_fct() {
     return make_native_scalar_function<true>("varcharasblob", bytes_type, { utf8_type },
-            [] (cql_serialization_format sf, const std::vector<bytes_opt>& parameters) -> bytes_opt {
+            [] (serialization_format sf, const std::vector<bytes_opt>& parameters) -> bytes_opt {
         return parameters[0];
     });
 }
@@ -98,7 +98,7 @@ inline
 shared_ptr<function>
 make_blob_as_varchar_fct() {
     return make_native_scalar_function<true>("blobasvarchar", utf8_type, { bytes_type },
-            [] (cql_serialization_format sf, const std::vector<bytes_opt>& parameters) -> bytes_opt {
+            [] (serialization_format sf, const std::vector<bytes_opt>& parameters) -> bytes_opt {
         return parameters[0];
     });
 }

cql3/functions/function.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2014 ScyllaDB
+ * Copyright 2014 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/functions/function_call.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  *
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*
@@ -61,11 +61,11 @@ public:
     virtual shared_ptr<terminal> bind(const query_options& options) override;
     virtual bytes_view_opt bind_and_get(const query_options& options) override;
 private:
-    static bytes_opt execute_internal(cql_serialization_format sf, scalar_function& fun, std::vector<bytes_opt> params);
+    static bytes_opt execute_internal(serialization_format sf, scalar_function& fun, std::vector<bytes_opt> params);
 public:
     virtual bool contains_bind_marker() const override;
 private:
-    static shared_ptr<terminal> make_terminal(shared_ptr<function> fun, bytes_opt result, cql_serialization_format sf);
+    static shared_ptr<terminal> make_terminal(shared_ptr<function> fun, bytes_opt result, serialization_format sf);
 public:
     class raw : public term::raw {
         function_name _name;

cql3/functions/function_name.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Copyright (C) 2014 ScyllaDB
+ * Copyright 2014 Cloudius Systems
  *
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  */
 
 /*

cql3/functions/functions.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 ScyllaDB
+ * Copyright (C) 2014 Cloudius Systems, Ltd.
  */
 
 /*
@@ -299,7 +299,7 @@ function_call::collect_marker_specification(shared_ptr<variable_specifications>
 
 shared_ptr<terminal>
 function_call::bind(const query_options& options) {
-    return make_terminal(_fun, to_bytes_opt(bind_and_get(options)), options.get_cql_serialization_format());
+    return make_terminal(_fun, to_bytes_opt(bind_and_get(options)), options.get_serialization_format());
 }
 
 bytes_view_opt
@@ -315,12 +315,12 @@ function_call::bind_and_get(const query_options& options) {
         }
         buffers.push_back(std::move(to_bytes_opt(val)));
     }
-    auto result = execute_internal(options.get_cql_serialization_format(), *_fun, std::move(buffers));
+    auto result = execute_internal(options.get_serialization_format(), *_fun, std::move(buffers));
     return options.make_temporary(result);
 }
 
 bytes_opt
-function_call::execute_internal(cql_serialization_format sf, scalar_function& fun, std::vector<bytes_opt> params) {
+function_call::execute_internal(serialization_format sf, scalar_function& fun, std::vector<bytes_opt> params) {
     bytes_opt result = fun.execute(sf, params);
     try {
         // Check the method didn't lied on it's declared return type
@@ -347,7 +347,7 @@ function_call::contains_bind_marker() const {
 }
 
 shared_ptr<terminal>
-function_call::make_terminal(shared_ptr<function> fun, bytes_opt result, cql_serialization_format sf)  {
+function_call::make_terminal(shared_ptr<function> fun, bytes_opt result, serialization_format sf)  {
     if (!dynamic_pointer_cast<const collection_type_impl>(fun->return_type())) {
         return ::make_shared<constants::value>(std::move(result));
     }
@@ -413,7 +413,7 @@ function_call::raw::prepare(database& db, const sstring& keyspace, ::shared_ptr<
     // If all parameters are terminal and the function is pure, we can
     // evaluate it now, otherwise we'd have to wait execution time
     if (all_terminal && scalar_fun->is_pure()) {
-        return make_terminal(scalar_fun, execute(*scalar_fun, parameters), query_options::DEFAULT.get_cql_serialization_format());
+        return make_terminal(scalar_fun, execute(*scalar_fun, parameters), query_options::DEFAULT.get_serialization_format());
     } else {
         return ::make_shared<function_call>(scalar_fun, parameters);
     }
@@ -429,7 +429,7 @@ function_call::raw::execute(scalar_function& fun, std::vector<shared_ptr<term>>
         buffers.push_back(std::move(param));
     }
 
-    return execute_internal(cql_serialization_format::internal(), fun, buffers);
+    return execute_internal(serialization_format::internal(), fun, buffers);
 }
 
 assignment_testable::test_result

cql3/functions/functions.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  *
- * Copyright (C) 2015 ScyllaDB
+ * Copyright 2015 Cloudius Systems
  */
 
 /*

cql3/functions/native_aggregate_function.hh

@@ -17,9 +17,9 @@
  */
 
 /*
- * Modified by ScyllaDB
+ * Modified by Cloudius Systems
  *
- * Copyright (C) 2014 ScyllaDB
+ * Copyright 2014 Cloudius Systems
  */
 
 /*